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
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
Max Bittens
ogstools
Commits
e3824146
Verified
Commit
e3824146
authored
1 year ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[project,ci] Moved pip extra index to from env (global) var to pip install.
parent
bf9e87fa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-3
2 additions, 3 deletions
.gitlab-ci.yml
Makefile
+1
-1
1 addition, 1 deletion
Makefile
with
3 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
3
View file @
e3824146
...
...
@@ -5,7 +5,6 @@ stages:
variables
:
POETRY_CACHE_DIR
:
"
$CI_PROJECT_DIR/.cache"
DOCKER_IMAGE
:
registry.opengeosys.org/ogs/tools/ogstools/ci-python-3.9
PIP_EXTRA_INDEX_URL
:
https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple
workflow
:
rules
:
...
...
@@ -50,7 +49,7 @@ tests feflow:
image
:
registry.opengeosys.org/ogs/tools/feflow-python-docker:8.0.1
script
:
-
python -m venv .venv --upgrade-deps
-
.venv/bin/pip install -e .[dev,test,docs,feflow]
-
.venv/bin/pip install
--extra-index-url https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple
-e .[dev,test,docs,feflow]
-
make setup_headless
-
source .venv/bin/activate
-
make coverage
...
...
@@ -67,7 +66,7 @@ tests win:
before_script
:
-
python -m venv .venv
-
.venv\Scripts\Activate.ps1
-
pip install -e ".[dev,test]"
-
pip install
--extra-index-url https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple
-e ".[dev,test]"
script
:
-
tox -p
# Bug: -e docs only works on Windows when called from docs/-dir.
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
1
−
1
View file @
e3824146
...
...
@@ -5,7 +5,7 @@ help: ## Show this help
setup
:
##
Setup a virtual environment and install all development dependencies
python
-m
venv .venv
--upgrade-deps
.venv/bin/pip
install
-e
.[dev,test,docs]
.venv/bin/pip
install
--extra-index-url
https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple
-e
.[dev,test,docs]
.venv/bin/pre-commit
install
@
echo
@
echo
ATTENTION: You need to activate the virtual environment
in
every shell with:
...
...
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