astropy · Jun 7, 2023 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024 · Aug 13, 2024
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: ".github/workflows" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,6 +2,11 @@ name: Release
 
 on:
   pull_request:
+    # We also want this workflow triggered if the 'Build all wheels' label is added
+    # or present when PR is updated
+    types:
+      - synchronize
+      - labeled
   push:
     tags:
       - '*'
@@ -13,12 +18,12 @@ jobs:
     if: ((github.event_name == 'push' && startsWith(github.ref, 'refs/tags')) || contains(github.event.pull_request.labels.*.name, 'Build wheels'))
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - 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
@@ -42,7 +47,7 @@ jobs:
 
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@release/v1
+      uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc  # v1.12.4
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -17,34 +17,48 @@ 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-sphinxdev
+            toxenv: py311-test-sphinx72
+
+          - os: ubuntu-latest
+            python-version: "3.12"
+            toxenv: py312-test-v2deps-sphinx80
+
+          - os: windows-latest
+            python-version: "3.12"
+            toxenv: py312-test-sphinx81
+
+          - os: macos-latest
+            python-version: "3.13"
+            toxenv: py313-test-v2deps-sphinxdev
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38  # v5.4.0
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Tox

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 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/sphinx_astropy/conf/v1.py b/sphinx_astropy/conf/v1.py
@@ -15,6 +15,8 @@
 from os import path
 
 import astropy_sphinx_theme
+import sphinx
+from packaging.version import Version
 
 try:
     import astropy
@@ -33,7 +35,7 @@
 # specific version check, call check_sphinx_version("x.y.z.") from
 # your project's conf.py
 needs_sphinx = '3.0'
-
+SPHINX_LT_8_2 = Version(sphinx.__version__) < Version("8.2.dev")
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
@@ -217,10 +219,11 @@ def check_sphinx_version(expected_version):
 # AttributeError is checked here in case matplotlib is installed but
 # Sphinx isn't.  Note that this module is imported by the config file
 # generator, even if we're not building the docs.
+# We don't need to raise a warning or exception here as there are packages
+# that don't use the directive, and those who try to use it without mpl being
+# installed will get a nice "Unknown directive type" error at usage.
 except (ImportError, AttributeError):
-    warnings.warn(
-        "matplotlib's plot_directive could not be imported. " +
-        "Inline plots will not be included in the output")
+    pass
 
 # Don't show summaries of the members in each class along with the
 # class' docstring
@@ -237,14 +240,17 @@ def check_sphinx_version(expected_version):
 # Render inheritance diagrams in SVG
 graphviz_output_format = "svg"
 
-graphviz_dot_args = [
+graphviz_dot_args = (
     '-Nfontsize=10',
     '-Nfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Efontsize=10',
     '-Efontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Gfontsize=10',
     '-Gfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
-]
+)
+
+if SPHINX_LT_8_2:
+    graphviz_dot_args = list(graphviz_dot_args)
 
 # -- Options for HTML output -------------------------------------------------
 

diff --git a/sphinx_astropy/conf/v2.py b/sphinx_astropy/conf/v2.py
@@ -10,10 +10,12 @@
 # serve to show the default.
 
 import os
-import warnings
 from collections import ChainMap
 from os import path
 
+import sphinx
+from packaging.version import Version
+
 try:
     import astropy
 except ImportError:
@@ -29,6 +31,7 @@
 # The version check in Sphinx itself can only compare the major and
 # minor parts of the version number, not the micro.
 needs_sphinx = '4.2'
+SPHINX_LT_8_2 = Version(sphinx.__version__) < Version("8.2.dev")
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
@@ -208,10 +211,11 @@
 # AttributeError is checked here in case matplotlib is installed but
 # Sphinx isn't.  Note that this module is imported by the config file
 # generator, even if we're not building the docs.
+# We don't need to raise a warning or exception here as there are packages
+# that don't use the directive, and those who try to use it without mpl being
+# installed will get a nice "Unknown directive type" error at usage.
 except (ImportError, AttributeError):
-    warnings.warn(
-        "matplotlib's plot_directive could not be imported. " +
-        "Inline plots will not be included in the output")
+    pass
 
 # Don't show summaries of the members in each class along with the
 # class' docstring
@@ -228,14 +232,17 @@
 # Render inheritance diagrams in SVG
 graphviz_output_format = "svg"
 
-graphviz_dot_args = [
+graphviz_dot_args = (
     '-Nfontsize=10',
     '-Nfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Efontsize=10',
     '-Efontname=Helvetica Neue, Helvetica, Arial, sans-serif',
     '-Gfontsize=10',
     '-Gfontname=Helvetica Neue, Helvetica, Arial, sans-serif',
-]
+)
+
+if SPHINX_LT_8_2:
+    graphviz_dot_args = list(graphviz_dot_args)
 
 # For sphinx-copybutton
 copybutton_prompt_text = r">>> |\.\.\. |\$ |In \[\d*\]: | {2,5}\.\.\.: | {5,8}: "

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,-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,15 +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 =