Skip to content

Commit

Permalink
gha: incorporate use of py313 environment
Browse files Browse the repository at this point in the history
  • Loading branch information
bjlittle committed Oct 30, 2024
1 parent a70c646 commit a4ecaf3
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
version: ["py312"]
version: ["py313"]
session: ["doctest", "linkcheck"]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
version: ["py312"]
version: ["py313"]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["3.12"]
version: ["3.13"]

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest"]
version: ["py311", "py312"]
version: ["py311", "py312", "py313"]
session: ["tests"]
marker: ["image", "not image"]
posargs: ["--xvfb-backend xvfb --durations=10"]
include:
- version: "py312"
- version: "py313"
coverage: "--cov-report= --cov=geovista"

steps:
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: "3.12"
python-version: "3.x"

- run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ["py311", "py312"]
version: ["py311", "py312", "py313"]
session: ["env"]

steps:
Expand Down
11 changes: 7 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ requires =
tox-run-command


[testenv:py{311,312}-lock]
[testenv:py{311,312,313}-lock]
allowlist_externals =
cp
changedir =
Expand Down Expand Up @@ -38,10 +38,11 @@ commands =
python lock2yaml.py {envname}


[testenv:py{311,312}-env]
[testenv:py{311,312,313}-env]
conda_spec =
py311: {toxinidir}{/}requirements{/}locks{/}py311-lock-linux-64.txt
py312: {toxinidir}{/}requirements{/}locks{/}py312-lock-linux-64.txt
py313: {toxinidir}{/}requirements{/}locks{/}py313-lock-linux-64.txt
description =
Create an environment only containing geovista dependencies.
platform =
Expand All @@ -50,13 +51,14 @@ skip_install =
true


[testenv:py{311,312}-tests]
[testenv:py{311,312,313}-tests]
allowlist_externals =
Xvfb
mkdir
conda_spec =
py311: {toxinidir}{/}requirements{/}locks{/}py311-lock-linux-64.txt
py312: {toxinidir}{/}requirements{/}locks{/}py312-lock-linux-64.txt
py313: {toxinidir}{/}requirements{/}locks{/}py313-lock-linux-64.txt
description =
Perform geovista unit/integration tests.
platform =
Expand All @@ -74,7 +76,7 @@ commands =
pytest {posargs} --fail_extra_image_cache --generated_image_dir {toxinidir}{/}test_images


[testenv:py{311,312}-{linkcheck,doctest}]
[testenv:py{311,312,313}-{linkcheck,doctest}]
allowlist_externals =
Xvfb
make
Expand All @@ -83,6 +85,7 @@ changedir =
conda_spec =
py311: {toxinidir}{/}requirements{/}locks{/}py311-lock-linux-64.txt
py312: {toxinidir}{/}requirements{/}locks{/}py312-lock-linux-64.txt
py313: {toxinidir}{/}requirements{/}locks{/}py313-lock-linux-64.txt
description =
Build, test and link-check the geovista documentation.
platform =
Expand Down

0 comments on commit a4ecaf3

Please sign in to comment.