diff --git a/README.md b/README.md index 285bcbc..5ceb1b9 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Dependencies are specified as `install_requires` in `setup.py`. Also needs `tens conda create -n eqip -c conda-forge -c cpape python=3.6 tensorflow-gpu=1.3 conda activate eqip conda install -c conda-forge -c cpape pip z5py -conda install -c conda-forge scikit-image numpy scipy +conda install -c conda-forge scikit-image numpy 'scipy>=1.1.0,<1.3.0' conda install -c conda-forge h5py requests urllib3 idna conda install -c conda-forge cython conda install -c conda-forge pymongo diff --git a/eqip/conda.py b/eqip/conda.py index 05ea375..3697288 100644 --- a/eqip/conda.py +++ b/eqip/conda.py @@ -23,7 +23,7 @@ -y \ python=3.6 conda activate %(name)s -pip install h5py scikit-image numpy scipy requests urllib3 +pip install h5py scikit-image numpy 'scipy>=1.1.0,<1.3.0' requests urllib3 conda install -c conda-forge -y z5py gxx_linux-64 cython tensorflow-gpu=1.3 pip install git+https://github.com/hanslovsky/eqip@%(eqip_revision)s ''' diff --git a/setup.py b/setup.py index 4570814..2116fdc 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ 'pip>=18.1', 'scikit-image>=0.14.1', 'numpy>=1.15.4', - 'scipy>=1.1.0', + 'scipy>=1.1.0, <1.3.0', 'malis-pre-release', 'gunpowder @ git+https://github.com/funkey/gunpowder@721718b6569b47a2f5d5d6633c76c85f779e25c7', 'daisy @ git+https://github.com/funkelab/daisy@41130e58582ae05d01d26261786de0cbafaa6482',