Skip to content

Commit 9a6282c

Browse files
authored
More python control (#151)
* Add python paths in more jobs All the ones where we are running our local code. Also bumping the tag Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com> * Add python version to setup of linters Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com> --------- Signed-off-by: liamhuber <liamhuber@greyhavensolutions.com>
1 parent c405f0d commit 9a6282c

11 files changed

Lines changed: 48 additions & 27 deletions

File tree

.github/workflows/dependabot-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
ref: ${{ github.event.pull_request.head.ref }} # Check out the head of the actual branch, not the PR
2626
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
2727
token: ${{ secrets.DEPENDABOT_WORKFLOW_TOKEN }}
28-
- uses: pyiron/actions/update-env-files@actions-4.0.3
28+
- uses: pyiron/actions/update-env-files@actions-4.0.4
2929
- name: UpdateDependabotPR commit
3030
run: |
3131
git config --local user.email "pyiron@mpie.de"

.github/workflows/pr-labeled.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848

4949
tests-and-coverage:
5050
if: contains(github.event.pull_request.labels.*.name, 'run_coverage')
51-
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-4.0.3
51+
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-4.0.4
5252
secrets: inherit
5353

5454
code-ql:
5555
if: contains(github.event.pull_request.labels.*.name, 'run_CodeQL')
56-
uses: pyiron/actions/.github/workflows/codeql.yml@actions-4.0.3
56+
uses: pyiron/actions/.github/workflows/codeql.yml@actions-4.0.4
5757
secrets: inherit

.github/workflows/push-pull.yml

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ jobs:
202202
ref: ${{ github.event.pull_request.head.ref }} # Check out the head of the actual branch, not the PR
203203
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
204204
if: ${{ inputs.do-commit-updated-env }}
205-
- uses: pyiron/actions/write-docs-env@actions-4.0.3
205+
- uses: pyiron/actions/write-docs-env@actions-4.0.4
206206
with:
207207
env-files: ${{ inputs.docs-env-files }}
208208
if: ${{ inputs.do-commit-updated-env }}
209-
- uses: pyiron/actions/write-environment@actions-4.0.3
209+
- uses: pyiron/actions/write-environment@actions-4.0.4
210210
with:
211211
env-files: ${{ inputs.notebooks-env-files }}
212212
output-env-file: .binder/environment.yml
@@ -233,7 +233,11 @@ jobs:
233233
runs-on: ${{ inputs.runner }}
234234
steps:
235235
- uses: actions/checkout@v4
236-
- uses: pyiron/actions/build-docs@actions-4.0.3
236+
- uses: pyiron/actions/add-to-python-path@actions-4.0.4
237+
if: inputs.extra-python-paths != ''
238+
with:
239+
path-dirs: ${{ inputs.extra-python-paths }}
240+
- uses: pyiron/actions/build-docs@actions-4.0.4
237241
with:
238242
python-version: ${{ inputs.python-version }}
239243
env-files: ${{ inputs.docs-env-files }}
@@ -244,7 +248,11 @@ jobs:
244248
runs-on: ${{ inputs.runner }}
245249
steps:
246250
- uses: actions/checkout@v4
247-
- uses: pyiron/actions/build-notebooks@actions-4.0.3
251+
- uses: pyiron/actions/add-to-python-path@actions-4.0.4
252+
if: inputs.extra-python-paths != ''
253+
with:
254+
path-dirs: ${{ inputs.extra-python-paths }}
255+
- uses: pyiron/actions/build-notebooks@actions-4.0.4
248256
with:
249257
python-version: ${{ inputs.python-version }}
250258
env-files: ${{ inputs.notebooks-env-files }}
@@ -281,11 +289,11 @@ jobs:
281289

282290
steps:
283291
- uses: actions/checkout@v4
284-
- uses: pyiron/actions/add-to-python-path@actions-4.0.3
292+
- uses: pyiron/actions/add-to-python-path@actions-4.0.4
285293
if: inputs.extra-python-paths != ''
286294
with:
287295
path-dirs: ${{ inputs.extra-python-paths }}
288-
- uses: pyiron/actions/unit-tests@actions-4.0.3
296+
- uses: pyiron/actions/unit-tests@actions-4.0.4
289297
with:
290298
python-version: ${{ matrix.python-version }}
291299
env-files: ${{ inputs.tests-env-files }}
@@ -298,7 +306,7 @@ jobs:
298306
coverage:
299307
needs: commit-updated-env
300308
if: ${{ inputs.do-codecov || inputs.do-coveralls || inputs.do-codacy }}
301-
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-4.0.3
309+
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-4.0.4
302310
secrets: inherit
303311
with:
304312
tests-env-files: ${{ inputs.tests-env-files }}
@@ -318,7 +326,11 @@ jobs:
318326
runs-on: ${{ inputs.runner }}
319327
steps:
320328
- uses: actions/checkout@v4
321-
- uses: pyiron/actions/unit-tests@actions-4.0.3
329+
- uses: pyiron/actions/add-to-python-path@actions-4.0.4
330+
if: inputs.extra-python-paths != ''
331+
with:
332+
path-dirs: ${{ inputs.extra-python-paths }}
333+
- uses: pyiron/actions/unit-tests@actions-4.0.4
322334
with:
323335
python-version: ${{ inputs.python-version }}
324336
env-files: ${{ inputs.tests-env-files }}
@@ -333,11 +345,11 @@ jobs:
333345
runs-on: ${{ inputs.runner }}
334346
steps:
335347
- uses: actions/checkout@v4
336-
- uses: pyiron/actions/add-to-python-path@actions-4.0.3
348+
- uses: pyiron/actions/add-to-python-path@actions-4.0.4
337349
if: inputs.extra-python-paths != ''
338350
with:
339351
path-dirs: ${{ inputs.extra-python-paths }}
340-
- uses: pyiron/actions/unit-tests@actions-4.0.3
352+
- uses: pyiron/actions/unit-tests@actions-4.0.4
341353
with:
342354
python-version: ${{ inputs.alternate-tests-python-version }}
343355
env-files: ${{ inputs.alternate-tests-env-files }}
@@ -353,7 +365,7 @@ jobs:
353365
runs-on: ${{ inputs.runner }}
354366
steps:
355367
- uses: actions/checkout@v4
356-
- uses: pyiron/actions/pip-check@actions-4.0.3
368+
- uses: pyiron/actions/pip-check@actions-4.0.4
357369
with:
358370
python-version: ${{ inputs.python-version }}
359371

@@ -363,6 +375,9 @@ jobs:
363375
runs-on: ${{ inputs.runner }}
364376
steps:
365377
- uses: actions/checkout@v4
378+
- uses: actions/setup-python@v5
379+
with:
380+
python-version: ${{ inputs.python-version }}
366381
- uses: psf/black@stable
367382
with:
368383
options: "--check --diff"
@@ -373,6 +388,9 @@ jobs:
373388
runs-on: ${{ inputs.runner }}
374389
steps:
375390
- uses: actions/checkout@v4
391+
- uses: actions/setup-python@v5
392+
with:
393+
python-version: ${{ inputs.python-version }}
376394
- uses: astral-sh/ruff-action@v1
377395
with:
378396
args: check
@@ -383,6 +401,9 @@ jobs:
383401
runs-on: ${{ inputs.runner }}
384402
steps:
385403
- uses: actions/checkout@v4
404+
- uses: actions/setup-python@v5
405+
with:
406+
python-version: ${{ inputs.python-version }}
386407
- uses: astral-sh/ruff-action@v1
387408
with:
388409
args: check --select I --fix --diff

.github/workflows/pyproject-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ jobs:
8383
runs-on: ${{ inputs.runner }}
8484
steps:
8585
- uses: actions/checkout@v4
86-
- uses: pyiron/actions/cached-miniforge@actions-4.0.3
86+
- uses: pyiron/actions/cached-miniforge@actions-4.0.4
8787
with:
8888
python-version: ${{ inputs.python-version }}
8989
env-files: ${{ inputs.env-files }}
90-
- uses: pyiron/actions/update-pyproject-dependencies@actions-4.0.3
90+
- uses: pyiron/actions/update-pyproject-dependencies@actions-4.0.4
9191
with:
9292
input-toml: ${{ inputs.input-toml }}
9393
lower-bound-yaml: ${{ inputs.lower-bound-yaml }}

.github/workflows/tests-and-coverage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ jobs:
6969
runs-on: ${{ inputs.runner }}
7070
steps:
7171
- uses: actions/checkout@v4
72-
- uses: pyiron/actions/add-to-python-path@actions-4.0.3
72+
- uses: pyiron/actions/add-to-python-path@actions-4.0.4
7373
if: inputs.extra-python-paths != ''
7474
with:
7575
path-dirs: ${{ inputs.extra-python-paths }}
76-
- uses: pyiron/actions/unit-tests@actions-4.0.3
76+
- uses: pyiron/actions/unit-tests@actions-4.0.4
7777
with:
7878
python-version: ${{ inputs.python-version }}
7979
env-files: ${{ inputs.tests-env-files }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ on:
119119

120120
jobs:
121121
pyiron:
122-
uses: pyiron/actions/.github/workflows/push-pull.yml@actions-4.0.3
122+
uses: pyiron/actions/.github/workflows/push-pull.yml@actions-4.0.4
123123
secrets: inherit
124124
```
125125

build-docs/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ inputs:
2121
runs:
2222
using: 'composite'
2323
steps:
24-
- uses: pyiron/actions/cached-miniforge@actions-4.0.3
24+
- uses: pyiron/actions/cached-miniforge@actions-4.0.4
2525
with:
2626
python-version: ${{ inputs.python-version }}
2727
env-files: ${{ inputs.standard-docs-env-file }} ${{ inputs.env-files }}
28-
- uses: pyiron/actions/pyiron-config@actions-4.0.3
28+
- uses: pyiron/actions/pyiron-config@actions-4.0.4
2929
- name: Build sphinx documentation
3030
shell: bash -l {0}
3131
run: |

build-notebooks/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ inputs:
2828
runs:
2929
using: 'composite'
3030
steps:
31-
- uses: pyiron/actions/cached-miniforge@actions-4.0.3
31+
- uses: pyiron/actions/cached-miniforge@actions-4.0.4
3232
with:
3333
python-version: ${{ inputs.python-version }}
3434
env-files: ${{ inputs.standard-notebooks-env-file }} ${{ inputs.env-files }}
35-
- uses: pyiron/actions/pyiron-config@actions-4.0.3
35+
- uses: pyiron/actions/pyiron-config@actions-4.0.4
3636
- name: Build notebooks
3737
shell: bash -l {0}
3838
run: $GITHUB_ACTION_PATH/../.support/build_notebooks.sh ${{ inputs.notebooks-dir }} ${{ inputs.exclusion-file }} ${{ inputs.kernel }}

cached-miniforge/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ inputs:
6262
runs:
6363
using: "composite"
6464
steps:
65-
- uses: pyiron/actions/write-environment@actions-4.0.3
65+
- uses: pyiron/actions/write-environment@actions-4.0.4
6666
with:
6767
env-files: ${{ inputs.env-files }}
6868
- name: Calculate cache label info

pip-check/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ inputs:
1313
runs:
1414
using: 'composite'
1515
steps:
16-
- uses: pyiron/actions/cached-miniforge@actions-4.0.3
16+
- uses: pyiron/actions/cached-miniforge@actions-4.0.4
1717
with:
1818
python-version: ${{ inputs.python-version }}
1919
env-files: ${{ inputs.env-files }}

0 commit comments

Comments
 (0)