Skip to content

Commit

Permalink
Merge branch 'main' into renovate/numpy-2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
paddyroddy authored Jul 1, 2024
2 parents ac75983 + 1513e30 commit b2f139b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
- uses: paddyroddy/.github/actions/python/deployment@3135c318562994eafc62974821c6f80aa64b35da # v0
with:
pyproject-toml: ./pyproject.toml
python-version: "3.11"
python-version: "3.12"
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
project-directory: ./src/sleplet
pyproject-toml: ./pyproject.toml
python-version: "3.11"
python-version: "3.12"
template-directory: ./documentation
8 changes: 4 additions & 4 deletions .github/workflows/examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Set up python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.11"
python-version: "3.12"
cache: pip
cache-dependency-path: pyproject.toml

Expand All @@ -44,12 +44,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Set up python
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
with:
python-version: "3.11"
python-version: "3.12"
cache: pip
cache-dependency-path: pyproject.toml

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/paper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

- name: Build draft PDF
uses: openjournals/openjournals-draft-action@master
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
python-version:
- "3.10"
- "3.11"
- "3.12"
steps:
# yamllint disable-line rule:line-length
- uses: paddyroddy/.github/actions/python/tox@e59369bbd745ef1eae9b8327fba32a4f87ff13ca # v0
Expand Down Expand Up @@ -54,5 +55,6 @@ jobs:
run-macos-latest-3.10,\
run-ubuntu-latest-3.10,\
run-macos-latest-3.11,\
run-ubuntu-latest-3.11\
"
run-ubuntu-latest-3.11,\
run-macos-latest-3.12,\
run-ubuntu-latest-3.12"
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: Image Processing",
"Topic :: Scientific/Engineering :: Mathematics",
"Topic :: Scientific/Engineering :: Physics",
Expand Down Expand Up @@ -211,6 +212,7 @@ legacy_tox_ini = """
python =
3.10: py310
3.11: py311
3.12: py312
[gh-actions:env]
OS =
Expand All @@ -224,5 +226,5 @@ legacy_tox_ini = """
pytest-cov
[tox]
env_list = py{310,311}-{linux,macos}
env_list = py{310,311,312}-{linux,macos}
"""

0 comments on commit b2f139b

Please sign in to comment.