Support Python 3.9 and later

sphinx-doc · Aug 7, 2023 · 4ae6745 · 4ae6745
1 parent b8e48d8
commit 4ae6745
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 67 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,50 +1,39 @@
 name: Test
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev]
-      max-parallel: 1
+        python:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12-dev"
+          - "3.13-dev"
+      fail-fast: false
 
     steps:
-      - name: Print github context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo $GITHUB_CONTEXT
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
-      - name: pycache
-        uses: actions/cache@v2
-        id: pycache
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-
-      - name: Setup python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        if: "!endsWith(matrix.python-version, '-dev')"
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Setup python ${{ matrix.python-version }} (via deadsnakes)
-        uses: deadsnakes/[email protected]
-        if: "endsWith(matrix.python-version, '-dev')"
+      - uses: actions/checkout@v3
+      - name: Setup Python ${{ matrix.python }}
+        uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install tox and test related
+          python-version: ${{ matrix.python }}
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions
+          python -m pip install --upgrade tox
 
       - name: Run tox
         run: |
@@ -58,20 +47,16 @@ jobs:
         env: [flake8, mypy]
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
+      - uses: actions/checkout@v3
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3"
 
-      - name: Install tox and any other dependencies for test
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions
+          python -m pip install --upgrade tox
 
       - name: Run tox
         run: tox -e ${{ matrix.env }}
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.1.6 (unreleased)
 ==========================
 
+* Drop support for Python 3.5, 3.6, 3.7, and 3.8
+* Raise minimum required Sphinx version to 5.0
 
 Release 1.1.5 (2021-05-23)
 ==========================

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,7 @@ urls.Download = "https://pypi.org/project/sphinxcontrib-serializinghtml/"
 urls.Homepage = "https://www.sphinx-doc.org/"
 urls."Issue tracker" = "https://github.com/sphinx-doc/sphinx/issues"
 license.text = "BSD-2-Clause"
-requires-python = ">=3.5"
+requires-python = ">=3.9"
 
 # Classifiers list: https://pypi.org/classifiers/
 classifiers = [
@@ -28,22 +28,21 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Framework :: Sphinx",
     "Framework :: Sphinx :: Extension",
     "Topic :: Documentation",
     "Topic :: Documentation :: Sphinx",
     "Topic :: Text Processing",
     "Topic :: Utilities",
 ]
-dependencies = []
+dependencies = [
+    "Sphinx>=5",
+]
 dynamic = ["version"]
 
 [project.optional-dependencies]

diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,10 @@
 [tox]
+minversion = 2.4.0
 envlist =
-    py{36,37,38,39,310-dev},
+    py{39,310,311,312,313},
     flake8,
     mypy
-
-[gh-actions]
-python =
-    3.6: py36
-    3.7: py37
-    3.8: py38
-    3.9: py39
-    3.10: py310-dev
+isolated_build = True
 
 [testenv]
 usedevelop = true