From 852eb14aadd4a7f514a364c86bcd2ad3d77e862b Mon Sep 17 00:00:00 2001 From: Steve Holland Date: Mon, 8 Jul 2024 13:43:52 -0500 Subject: [PATCH] Update build to properly support pip; update documentation to correspond --- README.md | 2 ++ doc/source/installation.rst | 6 +++--- pyproject.toml | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 pyproject.toml diff --git a/README.md b/README.md index 13bbdf1..dd1d290 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/doc/source/installation.rst b/doc/source/installation.rst index a1254ad..81a3ef5 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -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: @@ -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 diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..3e5acf5 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools","numpy"] +build-backend = "setuptools.build_meta:__legacy__"