From 1d42d27aa66fb1d51a57b376884456a275ea329b Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 12 Jan 2024 15:11:00 +0000
Subject: [PATCH] doc and requirements tweeks, making tests run with new pip
image
---
.gitlab-ci.yml | 2 +-
configs/docker/build/requirements.txt | 4 ++--
docs/_source/installation.rst | 2 +-
.../coordinator/configs/config_EastAfrica_fc_live.json | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b048bba..56c3234 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,7 +83,7 @@ half_fat_tests:
when: manual
stage: half-fat
extends: .before_script
- image: lb584/ews_coordinator:latest
+ image: lb584/ews_coordinator_pip:latest
script:
- cd $CI_PROJECT_DIR/tests/integration/partial/
diff --git a/configs/docker/build/requirements.txt b/configs/docker/build/requirements.txt
index 4f65b81..dfea156 100644
--- a/configs/docker/build/requirements.txt
+++ b/configs/docker/build/requirements.txt
@@ -1,8 +1,8 @@
contextily==1.5.0
geopandas==0.14.1
-html-testRunner==1.2.1
-pip==23.3
python-docx==1.1.0
rioxarray==0.15.0
Rtree==1.1.0
scitools-iris==3.7.0
+html-testRunner==1.2.1
+coverage==7.4.0
\ No newline at end of file
diff --git a/docs/_source/installation.rst b/docs/_source/installation.rst
index 31e90b8..ec386db 100644
--- a/docs/_source/installation.rst
+++ b/docs/_source/installation.rst
@@ -180,7 +180,7 @@ when attached to the running docker container:
.. code-block:: bash
- cd /storage/app/EWS_prod/code/coordonator/tests/integration/
+ cd /storage/app/EWS_prod/code/coordinator/tests/integration/partial/
./run_tests.sh
If successful, you will see lots of system out passing by, with a message like "Ran 14 tests in 0:01:13 OK" at the end.
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
index 55e0276..3e98671 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
@@ -182,7 +182,7 @@
"PathTemplate" : "${WorkspacePath}ENVIRONMENT_2.0_${DateString}/processed/${RegionName}/${DiseaseName}/",
"SuccessFileTemplate" : "${WorkspacePath}ENVIRONMENT_2.0_${StartString}/STATUS_SUCCESS",
"FileListerFunction" : "list_onefile_operational",
- "FileNameTemplate" : "RIE_value.csv",
+ "FileNameTemplate" : "RIE_value.nc",
"FileNamePrepared" : "?"
},
"Epi" : [
--
GitLab