From a0ad664039356a6f248b432b42f48f294f4ad86a Mon Sep 17 00:00:00 2001
From: Tobias Meisel <tobias.meisel@ufz.de>
Date: Tue, 18 Mar 2025 16:26:31 +0100
Subject: [PATCH] Add the optional ogs dependency to tests
---
.gitlab-ci.yml | 10 +++++-----
Makefile | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d78fefd7..e98e95043 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,7 +70,7 @@ tests (arch - conda) [R]:
needs: []
before_script:
- *conda-setup-activate
- - pip install -e ".[pinned,test]"
+ - pip install -e ".[ogs,pinned,test]"
- *pip-setup-extra-headless
script:
- pytest
@@ -209,7 +209,7 @@ tests (win - pip) [R]:
before_script:
- python -m venv .venv
- .venv\Scripts\Activate.ps1
- - pip install -e ".[pinned,test]"
+ - pip install -e ".[ogs,pinned,test]"
script:
- pytest
@@ -222,7 +222,7 @@ tests (mac - pip) [R]:
before_script:
- python() { python3.10 "$@"; } # alias don't work in non-interactive shells
- *pip-setup-activate
- - pip install -e ".[pinned,test]"
+ - pip install -e ".[ogs,pinned,test]"
script:
- pytest
@@ -256,7 +256,7 @@ docs preview [M]:
before_script:
- *pip-setup-activate
- *pip-install-ogs-latest
- - pip install -e .[docs]
+ - pip install -e .[ogs,docs]
- *pip-setup-extra-headless
script:
- make docs SPHINXOPTS="--keep-going -n -j 4" | tee sphinx_output.log
@@ -304,7 +304,7 @@ setup developer [R]:
- *pip-setup-activate
- *pip-install-ogs-latest
script:
- - pip install -e .[pinned,dev,test,docs,feflow]
+ - pip install -e .[ogs,pinned,dev,test,docs,feflow]
- *pip-setup-extra-headless
pages:
diff --git a/Makefile b/Makefile
index 9a135281d..8a40d6134 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ pip_setup_headless: ## Install vtk-osmesa and gmsh without X11 dependencies
setup_devcontainer: ## Internal usage [CI]
rm -rf .venv-devcontainer
python -m venv .venv-devcontainer --upgrade-deps
- .venv-devcontainer/bin/pip install -e .[dev,test,docs,feflow,pinned]
+ .venv-devcontainer/bin/pip install -e .[ogs,dev,test,docs,feflow,pinned]
.venv-devcontainer/bin/pip uninstall gmsh vtk -y
.venv-devcontainer/bin/pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
.venv-devcontainer/bin/pip install -i https://gmsh.info/python-packages-dev-nox gmsh
--
GitLab