Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
OGSTools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ogs
OpenGeoSys Tools
OGSTools
Commits
a0ad6640
Commit
a0ad6640
authored
1 month ago
by
Tobias Meisel
Browse files
Options
Downloads
Patches
Plain Diff
Add the optional ogs dependency to tests
parent
dc417810
No related branches found
No related tags found
1 merge request
!267
Release 0.6.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+5
-5
5 additions, 5 deletions
.gitlab-ci.yml
Makefile
+1
-1
1 addition, 1 deletion
Makefile
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
5
−
5
View file @
a0ad6640
...
@@ -70,7 +70,7 @@ tests (arch - conda) [R]:
...
@@ -70,7 +70,7 @@ tests (arch - conda) [R]:
needs
:
[]
needs
:
[]
before_script
:
before_script
:
-
*conda-setup-activate
-
*conda-setup-activate
-
pip install -e ".[pinned,test]"
-
pip install -e ".[
ogs,
pinned,test]"
-
*pip-setup-extra-headless
-
*pip-setup-extra-headless
script
:
script
:
-
pytest
-
pytest
...
@@ -209,7 +209,7 @@ tests (win - pip) [R]:
...
@@ -209,7 +209,7 @@ tests (win - pip) [R]:
before_script
:
before_script
:
-
python -m venv .venv
-
python -m venv .venv
-
.venv\Scripts\Activate.ps1
-
.venv\Scripts\Activate.ps1
-
pip install -e ".[pinned,test]"
-
pip install -e ".[
ogs,
pinned,test]"
script
:
script
:
-
pytest
-
pytest
...
@@ -222,7 +222,7 @@ tests (mac - pip) [R]:
...
@@ -222,7 +222,7 @@ tests (mac - pip) [R]:
before_script
:
before_script
:
-
python() { python3.10 "$@"; }
# alias don't work in non-interactive shells
-
python() { python3.10 "$@"; }
# alias don't work in non-interactive shells
-
*pip-setup-activate
-
*pip-setup-activate
-
pip install -e ".[pinned,test]"
-
pip install -e ".[
ogs,
pinned,test]"
script
:
script
:
-
pytest
-
pytest
...
@@ -256,7 +256,7 @@ docs preview [M]:
...
@@ -256,7 +256,7 @@ docs preview [M]:
before_script
:
before_script
:
-
*pip-setup-activate
-
*pip-setup-activate
-
*pip-install-ogs-latest
-
*pip-install-ogs-latest
-
pip install -e .[docs]
-
pip install -e .[
ogs,
docs]
-
*pip-setup-extra-headless
-
*pip-setup-extra-headless
script
:
script
:
-
make docs SPHINXOPTS="--keep-going -n -j 4" | tee sphinx_output.log
-
make docs SPHINXOPTS="--keep-going -n -j 4" | tee sphinx_output.log
...
@@ -304,7 +304,7 @@ setup developer [R]:
...
@@ -304,7 +304,7 @@ setup developer [R]:
-
*pip-setup-activate
-
*pip-setup-activate
-
*pip-install-ogs-latest
-
*pip-install-ogs-latest
script
:
script
:
-
pip install -e .[pinned,dev,test,docs,feflow]
-
pip install -e .[
ogs,
pinned,dev,test,docs,feflow]
-
*pip-setup-extra-headless
-
*pip-setup-extra-headless
pages
:
pages
:
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
1
−
1
View file @
a0ad6640
...
@@ -53,7 +53,7 @@ pip_setup_headless: ## Install vtk-osmesa and gmsh without X11 dependencies
...
@@ -53,7 +53,7 @@ pip_setup_headless: ## Install vtk-osmesa and gmsh without X11 dependencies
setup_devcontainer
:
##
Internal usage [CI]
setup_devcontainer
:
##
Internal usage [CI]
rm
-rf
.venv-devcontainer
rm
-rf
.venv-devcontainer
python
-m
venv .venv-devcontainer
--upgrade-deps
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 uninstall gmsh vtk
-y
.venv-devcontainer/bin/pip
install
--extra-index-url
https://wheels.vtk.org vtk-osmesa
.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
.venv-devcontainer/bin/pip
install
-i
https://gmsh.info/python-packages-dev-nox gmsh
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment