Merge branch 'main' of github.com:ESMValGroup/ESMValCore into pyproje…

…ct-toml
ESMValGroup · Oct 15, 2024 · 8b37c2d · 8b37c2d
2 parents b0ff2d0 + a3557ec
commit 8b37c2d
Show file tree

Hide file tree

Showing 8 changed files with 406 additions and 315 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,14 +21,18 @@ commands:
               circleci step halt
             fi
   test_and_report:
+    parameters:
+      args:
+        type: string
+        default: ""
     steps:
       - run:
           name: Run tests
           command: |
             mkdir -p test-reports
             . /opt/conda/etc/profile.d/conda.sh
             conda activate esmvaltool
-            pytest -n 4 --junitxml=test-reports/report.xml
+            pytest -n 4 --junitxml=test-reports/report.xml << parameters.args >>
             esmvaltool version
       - store_test_results:
           path: test-reports/report.xml
@@ -127,8 +131,9 @@ jobs:
             . /opt/conda/etc/profile.d/conda.sh
             mkdir /logs
             conda activate esmvaltool
-            pip install .[test] |& tee -a /logs/install.txt
-      - test_and_report
+            pip install .[test] > /logs/install.txt 2>&1
+      - test_and_report:
+          args: --cov
       - save_cache:
           key: test-{{ .Branch }}-{{ checksum "cache_key.txt" }}
           paths: