Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
dumux-repositories
dumux
Commits
8762aad7
Commit
8762aad7
authored
2 years ago
by
Mathis Kelm
Browse files
Options
Downloads
Patches
Plain Diff
[ci] Simplify testing of python bindings after dune 2.9
parent
dece5cff
No related branches found
No related tags found
1 merge request
!3425
Cleanup python setup for dune 2.9 and newer
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci/default.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci/default.yml
bin/testing/ci-setup-python-env.sh
+0
-14
0 additions, 14 deletions
bin/testing/ci-setup-python-env.sh
with
2 additions
and
16 deletions
.gitlab-ci/default.yml
+
2
−
2
View file @
8762aad7
...
...
@@ -68,7 +68,7 @@ pylint-flake8 (python):
fi
-
|
if [ -d build-cmake/python/dumux ] ; then
source
bin/testing/ci-setup-python-env.sh
source
/dune/modules/dune-common/build-cmake/dune-env/bin/activate
pylint --rcfile=.pylintrc build-cmake/python/dumux
flake8 build-cmake/python/dumux
fi
...
...
@@ -250,7 +250,7 @@ test python:
rm -r /dune/modules/dune-common/build-cmake/dune-env
mv build-cmake/dune-env /dune/modules/dune-common/build-cmake/dune-env
fi
source
bin/testing/ci-setup-python-env.sh
source
/dune/modules/dune-common/build-cmake/dune-env/bin/activate
pushd build-cmake
DUNE_LOG_LEVEL=DEBUG ctest --output-on-failure -L python
DUNE_LOG_LEVEL=DEBUG ctest --output-on-failure -L python
...
...
This diff is collapsed.
Click to expand it.
bin/testing/ci-setup-python-env.sh
deleted
100755 → 0
+
0
−
14
View file @
dece5cff
#!/bin/bash
if
[
-d
"/dune/modules/dune-common/build-cmake/dune-env"
]
;
then
# Use internal venv of DUNE
echo
"Activating the Python virtual environment of dune-common"
source
/dune/modules/dune-common/build-cmake/dune-env/bin/activate
else
if
[
-L
/dune/bin/setup-python
]
&&
[
-e
/dune/bin/setup-python
]
;
then
dunecontrol bexec
"echo -n :
\$
(pwd)/python >>
$(
pwd
)
/pythonpath.txt"
export
PYTHONPATH
=
$PYTHONPATH
$(
cat
pythonpath.txt
)
rm
pythonpath.txt
setup-python
--opts
=
$DUNE_OPTS_FILE
install
fi
fi
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