Removed support for Python 3.7

readthedocs · Sep 24, 2023 · 4d1bec0 · 4d1bec0
1 parent cf8abe5
commit 4d1bec0
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         # Keep this in sync with tox.ini
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

diff --git a/autoapi/mappers/base.py b/autoapi/mappers/base.py
@@ -8,16 +8,10 @@
 import sphinx
 import sphinx.util
 from sphinx.util.console import colorize
+from sphinx.util.display import status_iterator
 from sphinx.util.osutil import ensuredir
 import sphinx.util.logging
 
-try:
-    from sphinx.util.display import status_iterator
-except ImportError:
-    # This method was moved into sphinx.util.display in Sphinx 6.1.0. Before
-    # that it resided in sphinx.util.
-    from sphinx.util import status_iterator
-
 from ..settings import API_ROOT, TEMPLATE_DIR
 
 LOGGER = sphinx.util.logging.getLogger(__name__)

diff --git a/autoapi/mappers/python/mapper.py b/autoapi/mappers/python/mapper.py
@@ -8,16 +8,10 @@
 from sphinx.errors import ExtensionError
 import sphinx.util
 from sphinx.util.console import colorize
+from sphinx.util.display import status_iterator
 import sphinx.util.docstrings
 import sphinx.util.logging
 
-try:
-    from sphinx.util.display import status_iterator
-except ImportError:
-    # This method was moved into sphinx.util.display in Sphinx 6.1.0. Before
-    # that it resided in sphinx.util.
-    from sphinx.util import status_iterator
-
 from ..base import SphinxMapperBase
 from .parser import Parser
 from .objects import (

diff --git a/docs/changes/+47c37f4d.removal b/docs/changes/+47c37f4d.removal
@@ -0,0 +1 @@
+Removed support for Python 3.7
diff --git a/docs/changes/391.bugfix b/docs/changes/391.bugfix
@@ -0,0 +1 @@
+Replaced usage of deprecated sphinx.util.status_iterator
diff --git a/setup.cfg b/setup.cfg
@@ -21,7 +21,6 @@ classifiers =
     Natural Language :: English
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
@@ -32,14 +31,14 @@ project_urls =
 [options]
 packages = find:
 include_package_data = True
-python_requires = >=3.7
+python_requires = >=3.8
 install_requires =
     anyascii
     astroid>=2.7;python_version<"3.12"
     astroid>=3.0.0a1;python_version>="3.12"
     Jinja2
     PyYAML
-    sphinx>=5.2.0
+    sphinx>=6.1.0
 
 [options.extras_require]
 docs =

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 isolated_build = true
 envlist =
     # Keep this in sync with .github/workflows/main.yml
-    py{37,38,39,310,311,312}
+    py{38,39,310,311,312}
     formatting
     typecheck
     lint
@@ -11,7 +11,6 @@ envlist =
 
 [gh-actions]
 python =
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310