Commit 25b58964 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Added SICOR to setup.py requirements. Updated installation instructions. Revised test_enpt_install.


Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 14e88124
Pipeline #8122 canceled with stage
in 7 minutes and 51 seconds
......@@ -93,7 +93,7 @@ test_enpt_install:
- conda config --set channel_priority strict # otherwise gdal or libgdal may be installed from defaults channel
# install some dependencies that cause trouble when installed via pip
- conda install -y -c conda-forge numpy pandas lxml # scikit-image, matplotlib
- conda install -y -c conda-forge numpy pandas lxml
# install not pip-installable deps of py_tools_ds / geoarray / sensormapgeo
- conda install -y -c conda-forge gdal libgdal scikit-image pyproj geopandas matplotlib basemap shapely pyresample
......@@ -101,9 +101,8 @@ test_enpt_install:
# install not pip-installable deps of arosics
- conda install -y -c conda-forge pyfftw pykrige
# install sicor
# install not pip-installable deps of sicor
- conda install -y -q -c conda-forge glymur cachetools pyhdf h5py pytables llvmlite numba scikit-learn
- pip install -e git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git
# install enpt
- pip install -e .
......
......@@ -17,35 +17,23 @@ Using conda_, the recommended approach is:
conda create --name enpt python=3
source activate enpt
# clone the source code of enpt
git clone https://gitext.gfz-potsdam.de/EnMAP/GFZ_Tools_EnMAP_BOX/EnPT.git
cd EnPT
# avoid package incompatibilities
- conda config --set channel_priority strict
# install some enpt dependencies that may cause trouble when installed via pip
conda install -c conda-forge scipy
# install some dependencies that cause trouble when installed via pip
- conda install -c conda-forge numpy pandas lxml
# install not pip-installable deps of geoarray
conda install -c conda-forge numpy scikit-image matplotlib pandas gdal pyproj basemap shapely
# install not pip-installable deps of py_tools_ds / geoarray / sensormapgeo
- conda install -c conda-forge gdal libgdal scikit-image pyproj geopandas matplotlib basemap shapely pyresample
# install not pip-installable deps of sensormapgeo
conda install -c conda-forge pyresample
# install not pip-installable deps of arosics
- conda install -c conda-forge pyfftw pykrige
# install sicor
conda install -c conda-forge pygrib h5py pytables pyfftw numba llvmlite scikit-learn
rm -rf context/sicor
git clone https://gitext.gfz-potsdam.de/EnMAP/sicor.git ./context/sicor
cd ./context/sicor
make install
cd ../../
# install not pip-installable deps of sicor
- conda install -c conda-forge glymur cachetools pyhdf h5py pytables llvmlite numba scikit-learn
# install enpt
make install
cd ..
pwd
ls
pip install enpt
This is the preferred method to install EnPT, as it will always install the most recent stable release.
......
......@@ -45,8 +45,8 @@ with open("enpt/version.py", encoding='utf-8') as version_file:
requirements = [ # put package requirements here
'numpy', 'pandas', 'scipy', 'geoarray>=0.8.11', 'py_tools_ds>=0.14.23', 'arosics>=0.9.2', 'sensormapgeo>=0.2.1',
'cerberus', 'jsmin', 'matplotlib', 'tqdm', 'utm', 'lxml', 'numpy-indexed', 'mvgavg'
# 'sicor', # pip install git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git
'cerberus', 'jsmin', 'matplotlib', 'tqdm', 'utm', 'lxml', 'numpy-indexed', 'mvgavg',
'sicor @ git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git#egg=sicor'
]
setup_requirements = ['setuptools-git'] # needed for package_data version controlled by GIT
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment