From 2aa5628b8621181e32cb5f55624caf51076f5792 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 11 Oct 2023 15:51:46 +0100 Subject: [PATCH 1/7] Add python 3.12 to tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7f79d2e77..1919b3595 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{38,39,310,311}-{test}{-oldestdeps,-numpy121} + py{38,39,310,311,312}-{test}{-oldestdeps,-numpy121} build_docs codestyle isolated_build = True From fb8ec0bd5bc397c969dc3d40b5d3785bb2ed3019 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 18 Oct 2023 09:41:28 +0100 Subject: [PATCH 2/7] Add Python 3.12 testing --- .github/workflows/ci_workflows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index 1b430ef4a..68a0fd9b4 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -18,16 +18,19 @@ jobs: - macos: py39-test - macos: py310-test - macos: py311-test + - macos: py312-test - linux: py38-test-oldestdeps - linux: py38-test - linux: py39-test - linux: py310-test - linux: py311-test - - linux: py311-test-devdeps + - linux: py312-test + - linux: py312-test-devdeps - windows: py38-test-oldestdeps - windows: py39-test - windows: py310-test - windows: py311-test + - windows: py312-test libraries: | apt: - libopenblas-dev From 2750c2c8cf06ec81b270ea3425304ff41c7e4ddd Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 18 Oct 2023 19:40:16 +0100 Subject: [PATCH 3/7] bump cython version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b52fd4487..fba79d77e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ requires = ["setuptools", "wheel", "extension-helpers", "oldest-supported-numpy", - "cython==3.0.2"] + "cython==3.0.4"] build-backend = 'setuptools.build_meta' [tool.setuptools_scm] From 02d3a04b016c9c03351ba5d422abf6ba916613c6 Mon Sep 17 00:00:00 2001 From: Thomas Robitaille Date: Thu, 19 Oct 2023 13:41:14 +0100 Subject: [PATCH 4/7] Use pip --pre on Python 3.12 to get aiohttp pre-release that is compatible with Python 3.12 --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index 1919b3595..c38c9c4fa 100644 --- a/tox.ini +++ b/tox.ini @@ -15,6 +15,7 @@ setenv = MPLBACKEND = Agg PYTEST_COMMAND = pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject --cov reproject --cov-config={toxinidir}/setup.cfg {toxinidir}/docs --remote-data devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + py312: PIP_PRE=1 changedir = .tmp/{envname} deps = @@ -33,6 +34,7 @@ deps = devdeps: git+https://github.com/astropy/asdf-astropy.git devdeps: git+https://github.com/spacetelescope/gwcs.git#egg=gwcs #devdeps: git+https://github.com/sunpy/sunpy.git#egg=sunpy + extras = test # Don't run the more complex tests on oldestdeps because it pulls in a nest From 9cf94293afcc72cbefdf992cfa1eda30aaed5f27 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 19 Oct 2023 14:36:44 +0100 Subject: [PATCH 5/7] Fix tox environment list --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index c38c9c4fa..25ab35d7e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{38,39,310,311,312}-{test}{-oldestdeps,-numpy121} + py{38,39,310,311,312}-{test}{,-oldestdeps,-numpy121} build_docs codestyle isolated_build = True From 90553522f4e8826ba9e2137971568f68960e5f5c Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 19 Oct 2023 14:37:10 +0100 Subject: [PATCH 6/7] Remove unused MANIFEST.in entries --- MANIFEST.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index ba172e5b3..c9c889b05 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,18 +1,14 @@ include README.rst include CHANGES.md -include LICENSE.md +include LICENSE include pyproject.toml -include setup.py include setup.cfg include pyproject.toml -recursive-include reproject *.pyx *.c *.pxd +recursive-include reproject *.pyx *.c recursive-include docs * -recursive-include licenses * -recursive-include cextern * -recursive-include scripts * prune build prune docs/_build From ae077d5047fd38b1daaa5535a59d404b708cd3c2 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 19 Oct 2023 16:29:41 +0100 Subject: [PATCH 7/7] Don't install sunpy for 3.12 tests --- setup.cfg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b78ad0f27..6dcd7b19f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,9 @@ test = shapely>=2.0.2 # 2.0.2 fixed a bug that causes changes in test results testall = shapely - sunpy[map]>=2.1;platform_machine!='i686' + # Once a release of reproject is done for Python 3.12, + # can remove python_version specifier here + sunpy[map]>=2.1;python_version<"3.12" and platform_machine!="i686" asdf gwcs pyvo