From 2da7219e65d15183e78aca4b0c0810bc56ffb5aa Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:30:51 -0800
Subject: [PATCH] Add testing for Py 3.13, Sphinx 8, drop Sphinx 4, py 3.7
 (#23)

---
 .github/workflows/workflow.yml | 31 ++++++++++++++-----------------
 setup.py                       |  9 ++++-----
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 19711bc..ee9302d 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -1,22 +1,17 @@
 name: CI
 on:
-  push:
-    branches:
-      - main
   pull_request:
     branches:
       - main
-  create:
-    tags:
-      - '*'
+  push:
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Black
       run: |
         pip install black
@@ -25,20 +20,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.10']
-        sphinx-version: ['4.*', '5.*', '6.*', '7.*']
-        include:
-          - python-version: '3.7'
-            sphinx-version: '3'
-          - python-version: '3.7'
-            sphinx-version: '2'
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy3.10']
+        sphinx-version: ['5.*', '6.*', '7.*', '8.*']
+        exclude:
+          - python-version: '3.8'
+            sphinx-version: '8.*'
+          - python-version: '3.9'
+            sphinx-version: '8.*'
+          - python-version: '3.13'
+            sphinx-version: '5.*'
     name: "Test Extension - Python(${{ matrix.python-version }}), Sphinx(${{ matrix.sphinx-version }})"
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -63,7 +60,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/setup.py b/setup.py
index fefb292..416e19f 100644
--- a/setup.py
+++ b/setup.py
@@ -28,8 +28,6 @@
     url="https://github.com/wpilibsuite/sphinxext-remoteliteralinclude",
     install_requires=[
         "sphinx>=4.3;python_version>='3.10'",
-        "jinja2<3;python_version<'3.8'",
-        "MarkupSafe<=2.0.1;python_version<'3.8'",
         "six",
     ],
     packages=["sphinxext"],
@@ -42,11 +40,12 @@
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",
         "Operating System :: OS Independent",
-        "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",
         "Programming Language :: Python",
         "Topic :: Documentation :: Sphinx",
         "Topic :: Documentation",
@@ -54,5 +53,5 @@
         "Topic :: Text Processing",
         "Topic :: Utilities",
     ],
-    python_requires=">=3.6",
+    python_requires=">=3.8",
 )