Skip to content

Commit 7611c34

Browse files
ehrenfeuehrenfeu
committed
Merge branch 'devel' into pathtools-tab-newline
2 parents ca0cc6c + 0ea34d9 commit 7611c34

49 files changed

Lines changed: 3516 additions & 616 deletions

Some content is hidden

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

‎.coveragerc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[run]
2+
source =
3+
src/imcflibs
4+
5+
omit =
6+
conftest.py
7+
tests/*
8+
# omit anything in a venv / venv2 directory
9+
./venv/*
10+
./venv2/*
11+
12+
[report]
13+
## NOTE: `exclude_also` is only supported for coverage 7.2 and newer, which
14+
## won't work when testing with Python2 (coverage 5.5 is the latest one
15+
## supporting Python2), hence we cannot use it:
16+
; exclude_also =
17+
; if _python_platform.python_implementation\(\) == \"Jython\":

‎.github/workflows/build.yml‎

Lines changed: 148 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,42 @@
1-
name: build
1+
name: 🚚🌍 Publish to 🔬☕ SciJava and 🎪 PyPI
22

33
on:
4+
workflow_dispatch:
5+
46
push:
57
branches:
68
- master
79
tags:
8-
- "*-[0-9]+.*"
10+
- "python-imcflibs-[0-9]+.*"
911
pull_request:
1012
branches:
1113
- master
1214

15+
1316
jobs:
14-
build:
17+
18+
publish-to-scijava:
19+
20+
name: 🔬☕ publish to SciJava
21+
1522
runs-on: ubuntu-latest
1623

1724
steps:
18-
- uses: actions/checkout@v2
19-
- name: Set up Java
25+
26+
- uses: actions/checkout@v4
27+
name: 📥 Checkout repo
28+
29+
- name: ☕ Set up Java
2030
uses: actions/setup-java@v3
2131
with:
2232
java-version: '8'
2333
distribution: 'zulu'
2434
cache: 'maven'
25-
- name: Set up CI environment
35+
36+
- name: 🪐 Set up CI environment
2637
run: .github/setup.sh
27-
- name: Execute the build
38+
39+
- name: 👷 Build and publish on 🔬☕ SciJava
2840
run: .github/build.sh
2941
env:
3042
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
@@ -33,3 +45,132 @@ jobs:
3345
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
3446
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
3547
SIGNING_ASC: ${{ secrets.SIGNING_ASC }}
48+
49+
50+
build-via-poetry:
51+
52+
name: 👷 build via 🎭 Poetry
53+
54+
runs-on: ubuntu-22.04
55+
56+
steps:
57+
- uses: actions/checkout@v4
58+
name: 📥 Checkout repo
59+
60+
- name: 🗃 Cache 📦 APT Packages
61+
uses: awalsh128/cache-apt-pkgs-action@v1.4.3
62+
with:
63+
packages: xmlstarlet
64+
version: 1.0
65+
66+
- name: 🕵 Inspect if this is a proper "scijava-scripts" release
67+
run: scripts/check-if-release.sh
68+
69+
- name: 🐍 Set up Python
70+
uses: actions/setup-python@v5
71+
with:
72+
python-version: "3.10"
73+
74+
- name: 🗃 Cache 🎭 Poetry install
75+
uses: actions/cache@v4
76+
with:
77+
path: ~/.local
78+
key: poetry-2.0.1-0
79+
80+
# The key configuration value here is `virtualenvs-in-project: true`: this
81+
# creates the venv as a `.venv` in your testing directory, which allows
82+
# the next step to easily cache it.
83+
- name: 🔩🔧 Install 🎭 Poetry
84+
uses: snok/install-poetry@v1
85+
with:
86+
version: 2.0.1
87+
virtualenvs-create: true
88+
virtualenvs-in-project: true
89+
90+
### No dependencies and project installation required, we're just packaging.
91+
# # Cache dependencies (i.e. all the stuff in your `pyproject.toml`).
92+
# - name: 🗃 Cache 🧾 Dependencies
93+
# id: cache-deps
94+
# uses: actions/cache@v4
95+
# with:
96+
# path: .venv
97+
# key: pydeps-${{ hashFiles('**/poetry.lock') }}
98+
99+
### No poetry-dynamic-versioning here, we're using the POM instead!
100+
# - name: 🎭 Install Poetry dynamic-versioning 🔌 plugin
101+
# run: poetry self add "poetry-dynamic-versioning[plugin]"
102+
103+
### No dependencies and project installation required, we're just packaging.
104+
# # Install dependencies. `--no-root` means "install all dependencies but
105+
# # not the project itself", which is what you want to avoid caching _your_
106+
# # code. The `if` statement ensures this only runs on a cache miss.
107+
# - name: 🎭 Install 🧾 Dependencies
108+
# run: scripts/run-poetry.sh install --no-interaction --no-root
109+
# if: steps.cache-deps.outputs.cache-hit != 'true'
110+
111+
# - name: 🎭 Install 🛖 project
112+
# run: scripts/run-poetry.sh install --no-interaction
113+
114+
- name: 🎭👷 Build 🧱 project
115+
run: scripts/run-poetry.sh build
116+
env:
117+
IGNORE_DEPS_PYTHON: true # required to build "py2.py3" wheels
118+
119+
- name: 📤 Upload build artifacts
120+
uses: actions/upload-artifact@v4
121+
with:
122+
name: release-dists
123+
path: dist/
124+
125+
126+
publish-to-pypi:
127+
128+
name: 🚚🌍 publish to 🎪 PyPI
129+
130+
runs-on: ubuntu-latest
131+
132+
needs:
133+
- build-via-poetry
134+
135+
permissions:
136+
id-token: write
137+
138+
environment:
139+
name: release
140+
141+
steps:
142+
- name: 📥 Retrieve release 📦 distributions
143+
uses: actions/download-artifact@v4
144+
with:
145+
name: release-dists
146+
path: dist/
147+
148+
- name: 🥁 Publish release distributions to 🎪 PyPI
149+
uses: pypa/gh-action-pypi-publish@release/v1
150+
with:
151+
packages-dir: dist/
152+
153+
154+
trigger-foreign-workflows:
155+
156+
name: 🚀 Dispatch foreign workflows
157+
158+
strategy:
159+
matrix:
160+
repo: ['imcf/imcf.github.io']
161+
162+
runs-on: ubuntu-latest
163+
164+
needs:
165+
- publish-to-pypi
166+
167+
steps:
168+
- name: 🏹 Fire event on `${{ matrix.repo }}`
169+
run: |
170+
curl -L \
171+
-X POST \
172+
-H "Accept: application/vnd.github+json" \
173+
-H "Authorization: Bearer ${{ secrets.DISPATCH_DEPLOY_PAGES }}" \
174+
-H "X-GitHub-Api-Version: 2022-11-28" \
175+
https://api.github.com/repos/${{ matrix.repo }}/dispatches \
176+
-d '{"event_type":"dispatch-event"}'

‎.github/workflows/dispatch-deploy-pages.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: 🚀 Dispatch foreign workflows
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
8+
trigger-event:
9+
10+
strategy:
11+
matrix:
12+
repo: ['imcf/imcf.github.io']
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: 🏹 Fire event on `${{ matrix.repo }}`
18+
run: |
19+
curl -L \
20+
-X POST \
21+
-H "Accept: application/vnd.github+json" \
22+
-H "Authorization: Bearer ${{ secrets.DISPATCH_DEPLOY_PAGES }}" \
23+
-H "X-GitHub-Api-Version: 2022-11-28" \
24+
https://api.github.com/repos/${{ matrix.repo }}/dispatches \
25+
-d '{"event_type":"dispatch-event"}'

‎.github/workflows/pytest-poetry.yml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
## action file inspired by https://jacobian.org/til/github-actions-poetry/
2+
3+
name: 🧪 pytest (via 🎭 Poetry)
4+
5+
on:
6+
push:
7+
branches:
8+
- master
9+
tags:
10+
- run-pytest*
11+
- py3-pytest*
12+
- "*-[0-9]+.*"
13+
pull_request:
14+
branches:
15+
- master
16+
- devel
17+
18+
jobs:
19+
pytest-poetry:
20+
# runs-on: ubuntu-latest
21+
runs-on: ubuntu-22.04
22+
23+
steps:
24+
25+
- uses: actions/checkout@v4
26+
name: 📥 Checkout repo
27+
28+
- name: 🗃 Cache 📦 APT Packages
29+
uses: awalsh128/cache-apt-pkgs-action@v1.4.3
30+
with:
31+
packages: xmlstarlet
32+
version: 1.0
33+
34+
# If you wanted to use multiple Python versions, you'd have specify a
35+
# matrix in the job and reference the matrix python version here.
36+
- name: 🐍 Set up Python
37+
uses: actions/setup-python@v5.4.0
38+
with:
39+
python-version: "3.10"
40+
41+
# Cache the installation of Poetry itself, e.g. the next step. This
42+
# prevents the workflow from installing Poetry every time, which can be
43+
# slow. Note the use of the Poetry version number in the cache key, and
44+
# the "-0" suffix: this allows you to invalidate the cache manually
45+
# if/when you want to upgrade Poetry, or if something goes wrong (could be
46+
# done mildly cleaner by using an environment variable).
47+
- name: 🗃 Cache 🎭 Poetry install
48+
uses: actions/cache@v4
49+
with:
50+
path: ~/.local
51+
key: poetry-1.8.2-0
52+
53+
# Install Poetry. You could do this manually, or there are several actions
54+
# that do this. `snok/install-poetry` seems to be minimal yet complete,
55+
# and really just calls out to Poetry's default install script, which
56+
# feels correct. I pin the Poetry version here because Poetry does
57+
# occasionally change APIs between versions and I don't want my actions to
58+
# break if it does.
59+
#
60+
# The key configuration value here is `virtualenvs-in-project: true`: this
61+
# creates the venv as a `.venv` in your testing directory, which allows
62+
# the next step to easily cache it.
63+
- name: 🔩🔧 Install 🎭 Poetry
64+
uses: snok/install-poetry@v1
65+
with:
66+
version: 1.8.2
67+
virtualenvs-create: true
68+
virtualenvs-in-project: true
69+
70+
# Cache your dependencies (i.e. all the stuff in your `pyproject.toml`).
71+
# Note the cache key: if you're using multiple Python versions, or
72+
# multiple OSes, you'd need to include them in the cache key. I'm not, so
73+
# it can be simple and just depend on the poetry.lock.
74+
- name: 🗃 Cache 🧾 Dependencies
75+
id: cache-deps
76+
uses: actions/cache@v4
77+
with:
78+
path: .venv
79+
key: pydeps-${{ hashFiles('**/poetry.lock') }}
80+
81+
### No poetry-dynamic-versioning here, we're using the POM instead!
82+
# - name: 🎭 Install Poetry dynamic-versioning 🔌 plugin
83+
# run: poetry self add "poetry-dynamic-versioning[plugin]"
84+
85+
# Install dependencies. `--no-root` means "install all dependencies but
86+
# not the project itself", which is what you want to avoid caching _your_
87+
# code. The `if` statement ensures this only runs on a cache miss.
88+
- name: 🎭 Install 🧾 Dependencies
89+
run: scripts/run-poetry.sh install --no-interaction --no-root --verbose
90+
if: steps.cache-deps.outputs.cache-hit != 'true'
91+
92+
# Now install _your_ project. This isn't necessary for many types of
93+
# projects -- particularly things like Django apps don't need this. But
94+
# it's a good idea since it fully-exercises the pyproject.toml and makes
95+
# that if you add things like console-scripts at some point that they'll
96+
# be installed and working.
97+
- name: 🎭 Install 🛖 project
98+
run: scripts/run-poetry.sh install --no-interaction --verbose
99+
100+
# And finally run the tests.
101+
- name: 🧪🎭 Run Tests
102+
run: scripts/run-poetry.sh run pytest --color=yes --cov --cov-report=xml -vv
103+
104+
- name: 📤 Upload 📊 coverage reports to ☂ Codecov
105+
uses: codecov/codecov-action@v5
106+
with:
107+
token: ${{ secrets.CODECOV_TOKEN }}

0 commit comments

Comments
 (0)