Merge pull request #78 from pllim/bump-minver

bsipocz · web-flow · commit b2135a27e905 · 2025-02-03T15:19:09.000-08:00
MNT: Bump minversions, update CI matrix, modernize build setup
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -23,7 +23,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
-        python-version: "3.8"
+        python-version: "3.12"
 
     - name: Install build dependencies
       run: python -m pip install pip build "twine>=3.3" -U
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -17,30 +17,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-latest
-            python-version: 3.7
-            toxenv: py38-test-sphinx30
-          - os: ubuntu-latest
-            python-version: 3.8
-            toxenv: py38-test-sphinx35
           - os: ubuntu-latest
             python-version: 3.9
-            toxenv: py39-test-sphinx40
-          - os: ubuntu-latest
+            toxenv: py39-test-sphinx_oldest
+
+          - os: windows-latest
             python-version: "3.10"
-            toxenv: py310-test-sphinx50
+            toxenv: py310-test-sphinx53
+
+          - os: macos-latest
+            python-version: "3.10"
+            toxenv: py310-test-sphinx62
+
           - os: ubuntu-latest
             python-version: "3.11"
-            toxenv: py311-test-sphinx60
-          - os: ubuntu-latest
+            toxenv: py311-test-sphinx70
+
+          - os: windows-latest
             python-version: "3.11"
-            toxenv: py311-test-v2deps-sphinx70
+            toxenv: py311-test-v2deps-sphinx71
+
+          - os: macos-latest
+            python-version: "3.11"
+            toxenv: py311-test-sphinx72
+
           - os: ubuntu-latest
             python-version: "3.12"
-            toxenv: py312-test-sphinx80
+            toxenv: py312-test-v2deps-sphinx80
+
+          - os: windows-latest
+            python-version: "3.12"
+            toxenv: py312-test-sphinx81
+
           - os: macos-latest
-            python-version: "3.11"
-            toxenv: py311-test-sphinxdev
+            python-version: "3.13"
+            toxenv: py313-test-v2deps-sphinxdev
 
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changes in sphinx-astropy
 2.0 (unreleased)
 ----------------
 
+- Update minimum required version of Sphinx to 4.0.0
+  and Python to 3.9. [#78]
+
 1.9.1 (2023-06-07)
 ------------------
 
diff --git a/LICENSE.rst b/LICENSE.rst
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023, Astropy Developers
+Copyright (c) 2014-2025, Astropy Developers
 
 All rights reserved.
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,8 @@ include README.rst
 include CHANGES.rst
 include LICENSE.rst
 
+include setup.cfg
+include pyproject.toml
+
 exclude *.pyc *.o
 prune build
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,8 @@
 [build-system]
 requires = ["setuptools>=30.3.0",
-            "setuptools_scm",
+            "setuptools_scm>=8.0.0",
             "wheel"]
 build-backend = 'setuptools.build_meta'
+
+[tool.setuptools_scm]
+version_file = "sphinx_astropy/version.py"
diff --git a/setup.cfg b/setup.cfg
@@ -17,10 +17,10 @@ long_description_content_type = text/x-rst
 [options]
 zip_safe = False
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.9
 install_requires =
     packaging
-    sphinx>=3.0.0
+    sphinx>=4.0.0
     astropy-sphinx-theme
     numpydoc
     sphinx-automodapi
diff --git a/setup.py b/setup.py
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,7 @@
 [tox]
 envlist =
-    py{37,38,39,310,311}-test{-v2deps}{-sphinx30,-sphinx35,-sphinx40,-sphinx50,-sphinx60,-sphinx70,-sphinx80,-sphinxdev}
+    py{39,310,311,312,313}-test{-v2deps}-sphinx{_oldest,53,62,70,71,72,80,81,dev}
     codestyle
-requires =
-    setuptools >= 30.3.0
-    pip >= 19.3.1
-isolated_build = true
 
 [testenv]
 changedir = .tmp/{envname}
@@ -14,16 +10,14 @@ extras =
     tests
     v2deps: confv2
 deps =
-    sphinx30: sphinx==3.0.*
-    sphinx30: docutils==0.17.*
-    sphinx30: Jinja2==3.0.3
-    sphinx35: sphinx==3.5.*
-    sphinx35: Jinja2==3.0.3
-    sphinx40: sphinx==4.0.*
-    sphinx50: sphinx==5.0.*
-    sphinx60: sphinx==6.0.*
+    sphinx_oldest: sphinx==4.0.0
+    sphinx53: sphinx==5.3.*
+    sphinx62: sphinx==6.2.*
     sphinx70: sphinx==7.0.*
+    sphinx71: sphinx==7.1.*
+    sphinx72: sphinx==7.2.*
     sphinx80: sphinx==8.0.*
+    sphinx81: sphinx==8.1.*
     sphinxdev: git+https://github.com/sphinx-doc/sphinx#egg=sphinx
 
 commands =

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2014-2023, Astropy Developers`
	`1`	`+Copyright (c) 2014-2025, Astropy Developers`
`2`	`2`
`3`	`3`	`All rights reserved.`
`4`	`4`