diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92164cb14d1c5adfbf9ed6ac0eb0d40bb2111823..db2efc4c86094ebbe6f80a339ca1dc8c4431b04d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ test_enpt: - export PYTHONPATH=$PYTHONPATH:/root # /root <- here are the sicor tables # update py_tools_ds - - pip install 'py_tools_ds>=0.14.8' + - pip install 'py_tools_ds>=0.14.14' # update sicor # - conda install -y -q -c conda-forge basemap @@ -71,7 +71,8 @@ test_enpt_install: - conda install -y -c conda-forge 'icu=58.*' # fixes bug for conda-forge gdal build # install py_tools_ds - - pip install 'py_tools_ds>=0.14.8' + - conda install -y -c conda-forge pyresample + - pip install 'py_tools_ds>=0.14.14' # install sicor - conda install -y -q -c conda-forge pygrib h5py pytables pyfftw numba llvmlite scikit-learn diff --git a/requirements.txt b/requirements.txt index 26262868a1fb4904bb9bce579d8eaee2653bd507..34bae14158efdeb673a11fdd12d9f33051c6c2b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ numpy pandas scipy geoarray>=0.8.9 -py_tools_ds>=0.14.8 +py_tools_ds>=0.14.14 cerberus jsmin matplotlib diff --git a/setup.py b/setup.py index b5aa6c8e1a0e1333622d60d9fb0691bb3c289539..f0f60bde6487ca3a650cfc62c92795b5c44797e5 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ with open("enpt/version.py") as version_file: exec(version_file.read(), version) requirements = [ # put package requirements here - 'numpy', 'pandas', 'scipy', 'geoarray>=0.8.9', 'py_tools_ds>=0.14.8', 'cerberus', 'jsmin', 'matplotlib', 'tqdm', + 'numpy', 'pandas', 'scipy', 'geoarray>=0.8.9', 'py_tools_ds>=0.14.14', 'cerberus', 'jsmin', 'matplotlib', 'tqdm', 'utm', 'lxml', 'numpy-indexed' # 'sicor', # pip install git+https://gitext.gfz-potsdam.de/EnMAP/sicor.git ] diff --git a/tests/gitlab_CI_docker/context/environment_enpt.yml b/tests/gitlab_CI_docker/context/environment_enpt.yml index 00aa1bef807d9f1c9b8a48100da3bc04b6deea78..22e395f3777de211ad65cf36b15699cd62663cda 100644 --- a/tests/gitlab_CI_docker/context/environment_enpt.yml +++ b/tests/gitlab_CI_docker/context/environment_enpt.yml @@ -44,7 +44,7 @@ dependencies: - pip: - scipy - geoarray>=0.8.9 - - py_tools_ds>=0.14.8 + - py_tools_ds>=0.14.14 - cerberus - jsmin - tqdm diff --git a/tests/test_l1b_reader.py b/tests/test_l1b_reader.py index e3603ab783bbc14cd8ec7eb22578bc45e61d4ce7..328e9e0607b44f991a19ea8d980cde99c7c16236 100644 --- a/tests/test_l1b_reader.py +++ b/tests/test_l1b_reader.py @@ -122,7 +122,7 @@ class Test_L1B_Reader(unittest.TestCase): n_lines)) print("-----------------------------------------------------------------------------------------------") - if n_lines is "all": + if n_lines == "all": n_lines = None print("")