From e5970ce3b6326b751daca1eab4daa5af09f4281a Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Wed, 26 Oct 2022 00:53:11 +0200 Subject: [PATCH 1/5] MNT: add Python 3.11 CI env --- .github/workflows/ci_workflows.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index b8010557..3f8beb81 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -14,6 +14,7 @@ jobs: apt: - '^libxcb.*-dev' - libxkbcommon-x11-dev + - libhdf5-dev envs: | # Code style diff --git a/tox.ini b/tox.ini index 4fbf72da..135d005c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{36,37,38,39,py310}-test +envlist = py{37,38,39,py310}-test requires = pip >= 18.0 setuptools >= 30.3.0 From 56b15eecf5afc221b00b8def7d53c064a2468af1 Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Wed, 26 Oct 2022 19:22:47 +0200 Subject: [PATCH 2/5] DNM: try reproject main and pywwt#340 in devdeps --- .github/workflows/ci_workflows.yml | 18 +++++++++++++----- tox.ini | 6 +++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 3f8beb81..ab2521cd 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -5,7 +5,17 @@ on: pull_request: jobs: + initial_checks: + # Mandatory checks before CI tests + uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 + with: + coverage: false + envs: | + # Code style + - linux: codestyle + tests: + needs: initial_checks uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 with: display: true @@ -17,14 +27,11 @@ jobs: - libhdf5-dev envs: | - # Code style - - linux: codestyle - # Standard tests - linux: py38-test - - linux: py39-test + - linux: py39-devdeps - linux: py310-test - - linux: py311-test + - linux: py311-devdeps - macos: py38-test - macos: py39-test @@ -37,6 +44,7 @@ jobs: - windows: py311-test publish: + needs: tests uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1 with: # setup headless X server as per pyvista/setup-headless-display-action@v1 diff --git a/tox.ini b/tox.ini index 135d005c..c443b887 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,py310}-test +envlist = py{37,38,39,310}-{test,devdeps} requires = pip >= 18.0 setuptools >= 30.3.0 @@ -11,6 +11,10 @@ changedir = test: .tmp/{envname} extras = test: test,qt +deps = + devdeps: git+https://github.com/astropy/astropy + devdeps: git+https://github.com/astropy/reproject + devdeps: git+https://github.com/dhomeier/pywwt@eb1bacf commands = test: pip freeze test: pytest --pyargs glue_wwt --cov glue_wwt {posargs} From e5b45fe53aaa0bca53a46af8ec8fa854721c54b6 Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Thu, 27 Oct 2022 14:21:00 +0200 Subject: [PATCH 3/5] MNT: use released pywwt; test 3.11 on macOS + Windows --- .github/workflows/ci_workflows.yml | 5 ++++- tox.ini | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index ab2521cd..b35666c7 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -25,6 +25,8 @@ jobs: - '^libxcb.*-dev' - libxkbcommon-x11-dev - libhdf5-dev + brew: + - hdf5 envs: | # Standard tests @@ -37,11 +39,12 @@ jobs: - macos: py39-test - macos: py310-test - macos: py311-test + - macos: py311-test-devdeps - windows: py38-test - windows: py39-test - windows: py310-test - - windows: py311-test + - windows: py311-test-devdeps publish: needs: tests diff --git a/tox.ini b/tox.ini index c443b887..f414744f 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,6 @@ extras = deps = devdeps: git+https://github.com/astropy/astropy devdeps: git+https://github.com/astropy/reproject - devdeps: git+https://github.com/dhomeier/pywwt@eb1bacf commands = test: pip freeze test: pytest --pyargs glue_wwt --cov glue_wwt {posargs} From 8ddd093484983b1ff17c93979a697e08d5d6c336 Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sat, 24 Feb 2024 15:24:27 +0100 Subject: [PATCH 4/5] TST: add glue-core to devdeps, py310 devdeps job --- .github/workflows/ci_workflows.yml | 7 +++---- tox.ini | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index b35666c7..a5bbb39d 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -31,14 +31,13 @@ jobs: envs: | # Standard tests - linux: py38-test - - linux: py39-devdeps - - linux: py310-test - - linux: py311-devdeps + - linux: py39-test + - linux: py310-test-devdeps + - linux: py311-test - macos: py38-test - macos: py39-test - macos: py310-test - - macos: py311-test - macos: py311-test-devdeps - windows: py38-test diff --git a/tox.ini b/tox.ini index f414744f..981e0a61 100644 --- a/tox.ini +++ b/tox.ini @@ -14,6 +14,7 @@ extras = deps = devdeps: git+https://github.com/astropy/astropy devdeps: git+https://github.com/astropy/reproject + devdeps: git+https://github.com/glue-viz/glue commands = test: pip freeze test: pytest --pyargs glue_wwt --cov glue_wwt {posargs} From 44eae90427969cf5cd0199f0bc3ce06d02ca9884 Mon Sep 17 00:00:00 2001 From: Derek Homeier Date: Sat, 24 Feb 2024 15:45:26 +0100 Subject: [PATCH 5/5] TST: add tests for Python 3.12 --- .github/workflows/ci_workflows.yml | 3 +++ tox.ini | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index a5bbb39d..66f1e13f 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -34,16 +34,19 @@ jobs: - linux: py39-test - linux: py310-test-devdeps - linux: py311-test + - linux: py312-test-devdeps - macos: py38-test - macos: py39-test - macos: py310-test - macos: py311-test-devdeps + - macos: py312-test - windows: py38-test - windows: py39-test - windows: py310-test - windows: py311-test-devdeps + - windows: py312-test publish: needs: tests diff --git a/tox.ini b/tox.ini index 981e0a61..a53517e9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,310}-{test,devdeps} +envlist = py{37,38,39,310,311,312}-{test,devdeps} requires = pip >= 18.0 setuptools >= 30.3.0