Commit 4a772d28 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Added missing requirement 'openpyxl'. Replaced deprecated 'source activate' by...


Added missing requirement 'openpyxl'. Replaced deprecated 'source activate' by 'conda activate'. Pinned scipy to 1.1.0 in test_gms_preprocessing CI job to make CI work for now. Updated version info and HISTORY.rst.
Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 0e0d716b
Pipeline #14492 failed with stage
in 1 minute and 23 seconds
......@@ -35,6 +35,7 @@ test_gms_preprocessing:
# - cd ../../
# make tests
- pip install -U sicor
- pip install 'scipy==1.1.0' # FIXME remove that as soon as the fix for https://gitext.gfz-potsdam.de/EnMAP/sicor/-/issues/63 is merged
# - python -c 'from sicor.tables import get_tables; get_tables(sensor="s2"); get_tables(sensor="l8"); get_tables(sensor="enmap", optional_downloads=("ch4",))'
- pip check
......@@ -57,7 +58,7 @@ test_gms_preprocessing_install:
- source /root/miniconda3/bin/activate
- conda update conda
- conda create -y -q -c conda-forge --name gms_test python=3
- source activate gms_test
- conda activate gms_test
# update conda and python
- conda update -n base -c conda-forge conda
......
......@@ -2,6 +2,14 @@
History
=======
0.18.6 (2020-10-13)
-------------------
* Added missing requirement 'openpyxl'.
* Replaced deprecated 'source activate' by 'conda activate'.
* Pinned scipy to 1.1.0 in test_gms_preprocessing CI job to make CI work for now.
0.18.5 (2020-09-25)
-------------------
......
......@@ -134,7 +134,7 @@ Using conda_, the recommended approach is:
# create virtual environment for gms_preprocessing, this is optional
conda create -c conda-forge --name gms_preprocessing python=3
source activate gms_preprocessing
conda activate gms_preprocessing
# install some dependencies that cause trouble when installed via pip
conda install -c conda-forge numpy gdal scikit-image pyproj geopandas ipython matplotlib cartopy scikit-learn=0.23.2 shapely pyhdf python-fmask holoviews
......
......@@ -24,5 +24,5 @@
# You should have received a copy of the GNU Lesser General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.18.5'
__versionalias__ = '20200925.01'
__version__ = '0.18.6'
__versionalias__ = '20201013.01'
......@@ -13,6 +13,7 @@ matplotlib
natsort
nested_dict
numpy
openpyxl # implicitly needed by pandas to write GMS job summaries as excel files
pandas
psycopg2
# pyhdf # not pip installable
......
scipy
ephem
pyorbital
cerberus
dill
pytz
spectral
ephem
geoalchemy2
geopandas
iso8601
pyinstrument
geoalchemy2
sqlalchemy
tqdm
jsmin
cerberus
natsort
nested_dict
timeout_decorator
redis
retools
redis-semaphore
openpyxl
psutil
pyinstrument
pyorbital
pyrsr>=0.3.1
natsort
pytz
redis
redis-semaphore
retools
scipy
spectral
sqlalchemy
timeout_decorator
tqdm
......@@ -54,6 +54,7 @@ requirements = [
'natsort',
'nested_dict',
'numpy',
'openpyxl', # implicitly needed by pandas to write GMS job summaries as excel files
'pandas',
'psutil',
'psycopg2',
......
......@@ -35,6 +35,7 @@ dependencies:
- iso8601
- natsort
- nested_dict
- openpyxl
- pandas
- psutil
- psycopg2
......
......@@ -8,7 +8,7 @@ ENV pycmd_tabledownload="from sicor.tables import get_tables; get_tables(sensor=
RUN /bin/bash -i -c "\
source /root/miniconda3/bin/activate; \
conda update -n base -c conda-forge conda;\
source activate ci_env; \
conda activate ci_env; \
conda env update -n ci_env -f /root/environment_gms_preprocessing.yml; \
python -c ${pycmd_tabledownload}"
......
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