Skip to content

Commit

Permalink
Merge pull request #10 from isuthermography/master
Browse files Browse the repository at this point in the history
Update build to properly support pip; update documentation to correspond
  • Loading branch information
sdh4 authored Jul 8, 2024
2 parents 19434f3 + 852eb14 commit a6d184f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ For basic information see: doc/source/about.rst
For installation instructions see: doc/source/installation.rst
For a quickstart guide see: doc/source/quickstart.rst

Basic installation is "pip install --no-deps ."

More detailed documentation is also available in doc/source/

To render the documentation use a command prompt, change to the
Expand Down
6 changes: 3 additions & 3 deletions doc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ into the same environment.


On Anaconda you will probably want at least the following packages:
numpy scipy matplotlib cython ipython pip opencv pint lxml setuptools pyreadline pyserial pyside2 pyvisa. If you considering installing SpatialNDE2, you will also want:
numpy scipy matplotlib cython ipython pip opencv pint lxml setuptools pyreadline pyserial pyside2 pyvisa git. If you considering installing SpatialNDE2, you will also want:
clhpp pyopencl hdf5 h5py netcdf4 cmake openscenegraph pyopengl glfw freeglut glew mesa eigen swig.

To create a new Anaconda environment with all these packages, run, for example:

::
conda create -n SNDE -c conda-forge python=3.9 numpy scipy matplotlib cython ipython pip opencv clhpp pyopencl pint hdf5 h5py lxml setuptools netcdf4 cmake openscenegraph pyopengl glfw freeglut glew mesa eigen swig pyreadline pyserial pyside2 hdf5 pyvisa
conda create -n SNDE -c conda-forge python=3.9 numpy scipy matplotlib cython ipython pip opencv clhpp pyopencl pint hdf5 h5py lxml setuptools netcdf4 cmake openscenegraph pyopengl glfw freeglut glew mesa eigen swig pyreadline pyserial pyside2 hdf5 pyvisa git

You can then activate the Anaconda environment with:

Expand All @@ -36,7 +36,7 @@ Installation of Dataguzzler-Python is accomplished by running

::

python setup.py install
pip install --no-deps .

from a suitable terminal, command prompt, or Anaconda prompt corresponding
to the desired installation enviroment. In
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools","numpy"]
build-backend = "setuptools.build_meta:__legacy__"

0 comments on commit a6d184f

Please sign in to comment.