Merge pull request #403 from dstansby/py312

Python 3.12 testing
astropy · Oct 24, 2023 · 124a9cd · 124a9cd
2 parents a19c284 + ae077d5
commit 124a9cd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git 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

diff --git 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

diff --git 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]

diff --git 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

diff --git 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
@@ -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