From caca17972a31967ba8186a64f928d0ff04905f20 Mon Sep 17 00:00:00 2001 From: Daniel Scheffler Date: Thu, 21 Mar 2019 00:20:45 +0100 Subject: [PATCH 1/4] Updated minimal version of py_tools_ds. --- .gitlab-ci.yml | 4 ++-- requirements.txt | 2 +- setup.py | 2 +- tests/gitlab_CI_docker/context/environment_enpt.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92164cb..62e7851 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.13' # update sicor # - conda install -y -q -c conda-forge basemap @@ -71,7 +71,7 @@ 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' + - pip install 'py_tools_ds>=0.14.13' # 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 2626286..344f8b8 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.13 cerberus jsmin matplotlib diff --git a/setup.py b/setup.py index b5aa6c8..77e9c7e 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.13', '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 00aa1be..403d6de 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.13 - cerberus - jsmin - tqdm -- GitLab From 366cd084e0e80e086b5ed76bd63acdc89a96c9a1 Mon Sep 17 00:00:00 2001 From: Daniel Scheffler Date: Thu, 21 Mar 2019 15:40:42 +0100 Subject: [PATCH 2/4] Updated minimal version of py_tools_ds. --- .gitlab-ci.yml | 4 ++-- requirements.txt | 2 +- setup.py | 2 +- tests/gitlab_CI_docker/context/environment_enpt.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62e7851..2163f8e 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.13' + - pip install 'py_tools_ds>=0.14.14' # update sicor # - conda install -y -q -c conda-forge basemap @@ -71,7 +71,7 @@ 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.13' + - 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 344f8b8..34bae14 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ numpy pandas scipy geoarray>=0.8.9 -py_tools_ds>=0.14.13 +py_tools_ds>=0.14.14 cerberus jsmin matplotlib diff --git a/setup.py b/setup.py index 77e9c7e..f0f60bd 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.13', '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 403d6de..22e395f 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.13 + - py_tools_ds>=0.14.14 - cerberus - jsmin - tqdm -- GitLab From 7087e5061862441e03f104f68f4a7235dae1094b Mon Sep 17 00:00:00 2001 From: Daniel Scheffler Date: Fri, 22 Mar 2019 21:28:44 +0100 Subject: [PATCH 3/4] Fixed linting issue. --- tests/test_l1b_reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_l1b_reader.py b/tests/test_l1b_reader.py index e3603ab..328e9e0 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("") -- GitLab From a16bd29030d6574d53e4a21cb27b7dfe5688bcb0 Mon Sep 17 00:00:00 2001 From: Daniel Scheffler Date: Fri, 22 Mar 2019 21:31:30 +0100 Subject: [PATCH 4/4] Fixed test_enpt_install. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2163f8e..db2efc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,6 +71,7 @@ test_enpt_install: - conda install -y -c conda-forge 'icu=58.*' # fixes bug for conda-forge gdal build # install py_tools_ds + - conda install -y -c conda-forge pyresample - pip install 'py_tools_ds>=0.14.14' # install sicor -- GitLab