From 619aeba1189d79833f30a188fd2a932f98235e63 Mon Sep 17 00:00:00 2001
From: leufen1 <l.leufen@fz-juelich.de>
Date: Thu, 8 Oct 2020 14:31:23 +0200
Subject: [PATCH] fixed error if requirements are as out-commented
---
.gitlab-ci.yml | 12 ++++++------
README.md | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4cc60c87..b7785ecf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ tests (from scratch):
script:
- zypper --non-interactive install binutils libproj-devel gdal-devel
- zypper --non-interactive install proj geos-devel
- - cat requirements.txt | xargs -L 1 pip install
+ - cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
- chmod +x ./CI/run_pytest.sh
- ./CI/run_pytest.sh
after_script:
@@ -72,7 +72,7 @@ tests (on GPU):
- chmod +x ./CI/update_badge.sh
- ./CI/update_badge.sh > /dev/null
script:
- - cat requirements_gpu.txt | xargs -L 1 pip install
+ - cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
- chmod +x ./CI/run_pytest.sh
- ./CI/run_pytest.sh
after_script:
@@ -96,7 +96,7 @@ tests:
- chmod +x ./CI/update_badge.sh
- ./CI/update_badge.sh > /dev/null
script:
- - cat requirements.txt | xargs -L 1 pip install
+ - cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
- chmod +x ./CI/run_pytest.sh
- ./CI/run_pytest.sh
after_script:
@@ -120,7 +120,7 @@ coverage:
- chmod +x ./CI/update_badge.sh
- ./CI/update_badge.sh > /dev/null
script:
- - cat requirements.txt | xargs -L 1 pip install
+ - cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
- chmod +x ./CI/run_pytest_coverage.sh
- ./CI/run_pytest_coverage.sh
after_script:
@@ -142,8 +142,8 @@ sphinx docs:
- chmod +x ./CI/update_badge.sh
- ./CI/update_badge.sh > /dev/null
script:
- - cat requirements.txt | xargs -L 1 pip install
- - cat docs/requirements_docs.txt | xargs -L 1 pip install
+ - cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
+ - cat docs/requirements_docs.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install
- chmod +x ./CI/create_documentation.sh
- ./CI/create_documentation.sh
after_script:
diff --git a/README.md b/README.md
index 636e673a..40954c78 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,8 @@ HPC systems, see [here](#special-instructions-for-installation-on-jülich-hpc-sy
preferably in a virtual environment. You can use `pip install -r requirements.txt` to install all requirements at
once. Note, we recently updated the version of Cartopy and there seems to be an ongoing
[issue](https://github.com/SciTools/cartopy/issues/1552) when installing numpy and Cartopy at the same time. If you
- run into trouble, you could use ` cat requirements.txt | xargs -L 1 pip install` instead.
+ run into trouble, you could use `cat requirements.txt | cut -f1 -d"#" | sed '/^\s*$/d' | xargs -L 1 pip install`
+ instead.
* Installation of **MLAir**:
* Either clone MLAir from the [gitlab repository](https://gitlab.version.fz-juelich.de/toar/mlair.git)
and use it without installation (beside the requirements)
--
GitLab