Commit c91118d0 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Updated minimal versions of dependencies. Added requirements_pip.txt. Updated docker CI runner tag.

Former-commit-id: 6bb7c70c
Former-commit-id: ca3ef0eb
parent 9a36c528
py_tools_ds>=0.9.1 py_tools_ds>=0.9.3
geoarray>=0.6.12 geoarray>=0.6.16
arosics>0.6.2 arosics>0.6.6
git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git
matplotlib matplotlib
numpy numpy
......
scipy
ephem
pyorbital
dill
pytz
numba
spectral
geopandas
iso8601
pyinstrument
geoalchemy2
sqlalchemy
six
...@@ -14,14 +14,14 @@ with open('HISTORY.rst') as history_file: ...@@ -14,14 +14,14 @@ with open('HISTORY.rst') as history_file:
requirements = [ requirements = [
'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'ephem', 'pyorbital', 'dill', 'pytz', 'matplotlib', 'numpy', 'scikit-learn', 'scipy', 'gdal', 'pyproj', 'shapely', 'ephem', 'pyorbital', 'dill', 'pytz',
'pandas', 'numba', 'spectral>=0.16', 'geopandas', 'iso8601', 'pyinstrument', 'geoalchemy2', 'sqlalchemy', 'pandas', 'numba', 'spectral>=0.16', 'geopandas', 'iso8601', 'pyinstrument', 'geoalchemy2', 'sqlalchemy',
'psycopg2', 'py_tools_ds>=0.9.1', 'geoarray>=0.6.12', 'arosics>0.6.2', 'six' 'psycopg2', 'py_tools_ds>=0.9.3', 'geoarray>=0.6.16', 'arosics>0.6.6', 'six'
# spectral<0.16 has some problems with writing signed integer 8bit data # spectral<0.16 has some problems with writing signed integer 8bit data
# fmask # conda install -c conda-forge python-fmask # fmask # conda install -c conda-forge python-fmask
# 'pyhdf', # conda install --yes -c conda-forge pyhdf # 'pyhdf', # conda install --yes -c conda-forge pyhdf
# 'sicor', # pip install git+https://gitext.gfz-potsdam.de/hollstei/sicor.git # 'sicor', # pip install git+https://gitext.gfz-potsdam.de/hollstei/sicor.git
] ]
setup_requirements = [] # TODO(danschef): put setup requirements (distutils extensions, etc.) here setup_requirements = [] # TODO(danschef): put setup requirements (distutils extensions, etc.) here
test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'rednose'] test_requirements = requirements + ['coverage', 'nose', 'nose2', 'nose-htmloutput', 'rednose']
setup( setup(
name='gms_preprocessing', name='gms_preprocessing',
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
context_dir="./context" context_dir="./context"
dockerfile="gms_preprocessing_ci.docker" dockerfile="gms_preprocessing_ci.docker"
tag="gms_preprocessing_ci:0.8.4" tag="gms_preprocessing_ci:0.9.1"
gitlab_runner="gms_preprocessing_gitlab_CI_runner" gitlab_runner="gms_preprocessing_gitlab_CI_runner"
# get sicor project # TODO move this to setup.py as soon as package is public # get sicor project # TODO move this to setup.py as soon as package is public
......
...@@ -17,8 +17,8 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \ ...@@ -17,8 +17,8 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
pykrige glymur pygrib pyproj cachetools pyhdf ephem python-fmask scipy ; \ pykrige glymur pygrib pyproj cachetools pyhdf ephem python-fmask scipy ; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \ conda install --yes -c conda-forge 'icu=58.*' lxml ; \
pip install pandas geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse dill pytz \ pip install pandas geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse dill pytz \
spectral>0.16 psycopg2 pyorbital pyinstrument geoalchemy2 sqlalchemy py_tools_ds>=0.9.1 \ spectral>0.16 psycopg2 pyorbital pyinstrument geoalchemy2 sqlalchemy py_tools_ds>=0.9.3 \
geoarray>=0.6.12 arosics>=0.6.2 flake8 pycodestyle pylint pydocstyle nose nose2 nose-htmloutput \ geoarray>=0.6.16 arosics>=0.6.6 flake8 pycodestyle pylint pydocstyle nose nose2 nose-htmloutput \
coverage rednose six" # must include all the requirements needed to build the docs! coverage rednose six" # must include all the requirements needed to build the docs!
# copy some needed stuff to /root # copy some needed stuff to /root
......
Markdown is supported
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