Skip to content

Commit 3392ca3

Browse files
authored
Merge branch 'main' into jp-3864-bkg-reftype
2 parents 7584f7b + 06dc619 commit 3392ca3

Some content is hidden

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

76 files changed

+383
-106
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212

1313
jobs:
1414
build:
15-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@d83bb11581e517f1e786ae76f146781fdd21cd2f # v2.0.0
15+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish.yml@86823142467dd2afcd1bbac57d3a664cf468eb3b # v2.1.0
1616
with:
1717
upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }}
1818
targets: |

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2222
with:
23-
python-version: 3
23+
python-version: 3.12
2424
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
with:
2626
fetch-depth: 0

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
python-version: '3.12'
4242
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
4343
check:
44-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@d83bb11581e517f1e786ae76f146781fdd21cd2f # v2.0.0
44+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@86823142467dd2afcd1bbac57d3a664cf468eb3b # v2.1.0
4545
with:
4646
default_python: "3.12"
4747
envs: |
@@ -57,7 +57,7 @@ jobs:
5757
outputs:
5858
context: ${{ steps.context.outputs.context }}
5959
test:
60-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@d83bb11581e517f1e786ae76f146781fdd21cd2f # v2.0.0
60+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@86823142467dd2afcd1bbac57d3a664cf468eb3b # v2.1.0
6161
needs: [ crds_context ]
6262
with:
6363
setenv: |
@@ -78,5 +78,7 @@ jobs:
7878
- linux: py3-cov-xdist
7979
coverage: codecov
8080
pytest-results-summary: true
81+
python-version: '>3.12 <3.13.4'
8182
- macos: py3-xdist
8283
pytest-results-summary: true
84+
python-version: '>3.12 <3.13.4'

.github/workflows/ci_cron.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
context: ${{ steps.context.outputs.context }}
3535
test:
3636
if: (github.repository == 'spacetelescope/jwst' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run scheduled tests')))
37-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@d83bb11581e517f1e786ae76f146781fdd21cd2f # v2.0.0
37+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@86823142467dd2afcd1bbac57d3a664cf468eb3b # v2.1.0
3838
needs: [ crds_context ]
3939
with:
4040
setenv: |
@@ -49,4 +49,5 @@ jobs:
4949
- macos: py312-xdist
5050
- linux: py311-pyargs-xdist
5151
- linux: py3-pyargs-xdist
52+
python-version: '>3.12 <3.13.4'
5253

.github/workflows/tests_devdeps.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
context: ${{ steps.context.outputs.context }}
4444
test:
4545
if: (github.repository == 'spacetelescope/jwst' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run devdeps tests')))
46-
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@d83bb11581e517f1e786ae76f146781fdd21cd2f # v2.0.0
46+
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@86823142467dd2afcd1bbac57d3a664cf468eb3b # v2.1.0
4747
needs: [ crds_context ]
4848
with:
4949
setenv: |
@@ -57,9 +57,13 @@ jobs:
5757
envs: |
5858
- linux: py3-stdevdeps-xdist
5959
pytest-results-summary: true
60+
python-version: '>3.12 <3.13.4'
6061
- macos: py3-stdevdeps-xdist
6162
pytest-results-summary: true
63+
python-version: '>3.12 <3.13.4'
6264
- linux: py3-devdeps-xdist
6365
pytest-results-summary: true
66+
python-version: '>3.12 <3.13.4'
6467
- macos: py3-devdeps-xdist
6568
pytest-results-summary: true
69+
python-version: '>3.12 <3.13.4'

0 commit comments

Comments
 (0)