Merge pull request #151 from MideTechnology/fix_sphinx_python12

Re-add Python 3.12, include setuptools, require sphinx>=5.02
MideTechnology · May 30, 2024 · f8df14d · f8df14d
2 parents c0f6b9a + e2600a6
commit f8df14d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         exclude:
           - os: ubuntu-latest
             python-version: '3.6'

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -9,7 +9,7 @@ version: 2
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.8"
+    python: "3.9"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -19,11 +19,11 @@ pytz==2021.3
 requests==2.26.0
 snowballstemmer==2.2.0
 soupsieve==2.3.1
-Sphinx==4.3.1
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.0
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
+Sphinx>=5.0.2
+sphinxcontrib-applehelp
+sphinxcontrib-devhelp
+sphinxcontrib-htmlhelp
+sphinxcontrib-jsmath
+sphinxcontrib-qthelp
+sphinxcontrib-serializinghtml
 urllib3==1.26.7
diff --git a/requirements.txt b/requirements.txt
@@ -4,5 +4,6 @@ pytest>=4.6
 pytest-xdist[psutil]
 mock
 pytest-cov
-sphinx==5.0.2
+sphinx>=5.0.2
 scipy;python_version<"3.10"
+setuptools
diff --git a/setup.py b/setup.py
@@ -27,12 +27,13 @@ def get_version(rel_path):
     'pytest-xdist[psutil]',
     'mock',
     'pytest-cov',
-    "sphinx==5.0.2",
+    "sphinx>=5.0.2",
     'scipy;python_version<"3.10"',
+    "setuptools"
     ]
 
 DOCS_REQUIRES = [
-    "sphinx==5.0.2",
+    "sphinx>=5.0.2",
     "pydata-sphinx-theme==0.7.2",
     "nbsphinx",
     ]