Skip to content

Commit 4b3fb12

Browse files
committed
Merge branch 'develop' into 'master'
Develop into master See merge request iek-3/shared-code/fine!333
2 parents f0c6455 + b3a9c7a commit 4b3fb12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1937
-236
lines changed

.gitlab-ci.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ test-notebooks-docker-noupdate:
171171
script:
172172
- python -m pytest --nbval-lax --nbval-current-env --durations=20 examples/
173173

174-
test-formatting:
174+
test-codestyle:
175175
stage: test
176-
image: pyfound/black:latest_release
176+
image: registry.gitlab.com/pipeline-components/ruff:latest
177177
script:
178-
# Dry-run black auto-formatter. If the code needs reformatting this test
179-
# will fail.
180-
- black --version
181-
- black --check fine
182-
- black --check test
178+
# Run ruff check. If the code needs reformatting this test will fail.
179+
- ruff version
180+
- ruff check --output-format=gitlab fine
181+
- ruff check --output-format=gitlab test
182+
# - ruff check --output-format=gitlab examples
183183
rules:
184184
# Switch from branch pipeline to merge pipeline once a merge request has
185185
# been created on the branch.
@@ -215,7 +215,7 @@ build-tag:
215215
rules:
216216
- if: $CI_PIPELINE_SOURCE == "schedule"
217217
when: never
218-
- if: $CI_COMMIT_TAG
218+
- if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG
219219

220220
# Push develop build to local jugit registry
221221
build-dev:
@@ -228,3 +228,16 @@ build-dev:
228228
- docker push jugit-registry.fz-juelich.de/iek-3/shared-code/fine/fine-dev:latest
229229
rules:
230230
- if: $CI_COMMIT_BRANCH == "develop"
231+
232+
pypi-upload:
233+
stage: build
234+
script:
235+
- micromamba install -c conda-forge -n base -y python=3.10
236+
- python -m pip install --upgrade build
237+
- python -m pip install --upgrade twine
238+
- python -m build
239+
- python -m twine upload -u __token__ -p $PYPI_TOKEN dist/*
240+
rules:
241+
- if: $CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG
242+
when: manual
243+

0 commit comments

Comments
 (0)