Drop support for Python 3.7

Author: domdfcoding

.github/workflows/python_ci.yml

@@ -22,20 +22,18 @@ jobs:
     runs-on: "windows-2022"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
+      USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "3.8", testenvs: "py38-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
           - {python-version: "3.9", testenvs: "py39-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: False}
           - {python-version: "3.10", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},build", experimental: False}
           - {python-version: "3.11", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
           - {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
           - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}", experimental: False}
           - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}", experimental: True}
 

.github/workflows/python_ci_linux.yml

@@ -23,20 +23,18 @@ jobs:
     runs-on: "ubuntu-22.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
+      USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.7", testenvs: "py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "3.8", testenvs: "py38-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
           - {python-version: "3.9", testenvs: "py39-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: False}
           - {python-version: "3.10", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},build", experimental: False}
           - {python-version: "3.11", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
           - {python-version: "3.12", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
           - {python-version: "3.13", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
-          - {python-version: "pypy-3.7", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
           - {python-version: "pypy-3.9", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}", experimental: True}
 

.github/workflows/python_ci_macos.yml

@@ -22,20 +22,18 @@ jobs:
     runs-on: "macos-${{ matrix.config.os-ver }}"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
+      USING_COVERAGE: '3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.7", os-ver: "15-intel", testenvs: "py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "3.8", os-ver: "14", testenvs: "py38-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
           - {python-version: "3.9", os-ver: "14", testenvs: "py39-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4},build", experimental: False}
           - {python-version: "3.10", os-ver: "14", testenvs: "py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1},build", experimental: False}
           - {python-version: "3.11", os-ver: "14", testenvs: "py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
           - {python-version: "3.12", os-ver: "14", testenvs: "py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
           - {python-version: "3.13", os-ver: "14", testenvs: "py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2},build", experimental: False}
-          - {python-version: "pypy-3.7", os-ver: "15-intel", testenvs: "pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3},build", experimental: False}
           - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1},build", experimental: False}
           - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}", experimental: True}
 

.pre-commit-config.yaml

@@ -66,7 +66,7 @@ repos:
    hooks:
     - id: pyupgrade
       args:
-       - --py37-plus
+       - --py38-plus
        - --keep-runtime-typing
 
  - repo: https://github.com/Lucas-C/pre-commit-hooks

repo_helper.yml

@@ -20,21 +20,6 @@ conda_channels:
  - conda-forge
 
 python_versions:
- 3.7:
-  matrix_exclude:
-   sphinx:
-    - 6.0
-    - 6.1
-    - 6.2
-    - 7.0
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-    - 8.0
-    - 8.1
-    - 8.2
-    - latest
  3.8:
   matrix_exclude:
    sphinx:
@@ -82,26 +67,6 @@ python_versions:
     - 5.3
     - 6.0
     - 6.1
- pypy37:
-  matrix_exclude:
-   sphinx:
-    - 3.4
-    - 3.5
-    - 4.0
-    - 4.1
-    - 4.2
-    - 6.0
-    - 6.1
-    - 6.2
-    - 7.0
-    - 7.1
-    - 7.2
-    - 7.3
-    - 7.4
-    - 8.0
-    - 8.1
-    - 8.2
-    - latest
  pypy38:
   matrix_exclude:
    sphinx:

tests/test_directive.py

@@ -22,10 +22,10 @@
 						['name[bar]>=3; python_version == "2.7"'],
 						id="string_specifier_marker",
 						),
-				pytest.param(["name@ http://foo.com"], ["name@ http://foo.com"], id="string_url"),
+				pytest.param(["name@ http://foo.com"], ["name @ http://foo.com"], id="string_url"),
 				pytest.param(
 						['name@ http://foo.com ; extra == "feature"'],
-						['name@ http://foo.com ; extra == "feature"'],
+						['name @ http://foo.com ; extra == "feature"'],
 						id="string_url_with_marker",
 						),
 				pytest.param(["foo-bar.quux_baz"], ["foo-bar.quux_baz"], id="name_with_other_characters"),
@@ -35,21 +35,21 @@
 				pytest.param(["name >=2, <3"], ["name<3,>=2"], id="name_with_multiple_versions_and_whitespace"),
 				pytest.param(["foobar [quux,bar]"], ["foobar[bar,quux]"], id="extras"),
 				pytest.param(["foo[]"], ["foo"], id="empty_extras"),
-				pytest.param(["foo @ http://example.com"], ["foo@ http://example.com"], id="url"),
+				pytest.param(["foo@ http://example.com"], ["foo @ http://example.com"], id="url"),
 				pytest.param(
-						["foo @ http://example.com ; os_name=='a'"],
-						['foo@ http://example.com ; os_name == "a"'],
+						["foo@ http://example.com ; os_name=='a'"],
+						['foo @ http://example.com ; os_name == "a"'],
 						id="url_and_marker",
 						),
-				pytest.param(["name @ file:///absolute/path"], ["name@ file:///absolute/path"], id="file_url"),
+				pytest.param(["name@ file:///absolute/path"], ["name @ file:///absolute/path"], id="file_url"),
 				pytest.param(
-						["name [fred, bar] @ http://foo.com ; python_version=='2.7'"],
-						['name[bar,fred]@ http://foo.com ; python_version == "2.7"'],
+						["name [fred, bar]@ http://foo.com ; python_version=='2.7'"],
+						['name[bar,fred] @ http://foo.com ; python_version == "2.7"'],
 						id="extras_and_url_and_marker",
 						),
 				pytest.param(
-						["foo @ https://example.com/name;v=1.1/?query=foo&bar=baz#blah ; python_version=='3.4'"],
-						['foo@ https://example.com/name;v=1.1/?query=foo&bar=baz#blah ; python_version == "3.4"'],
+						["foo@ https://example.com/name;v=1.1/?query=foo&bar=baz#blah ; python_version=='3.4'"],
+						['foo @ https://example.com/name;v=1.1/?query=foo&bar=baz#blah ; python_version == "3.4"'],
 						id="complex_url_and_marker",
 						),
 				pytest.param(
@@ -107,7 +107,7 @@ def test_validate_requirements_warning(requirements: List[str], valid_requiremen
 	# New packaging version
 	with pytest.raises(
 			ValueError,
-			match=r"Invalid requirement .*: Expected end or semicolon \(after version specifier\)",
+			match=r"Invalid requirement .*: Expected .*",
 			):
 		validate_requirements(requirements)
 
@@ -116,10 +116,10 @@ def test_validate_requirements_warning(requirements: List[str], valid_requiremen
 		"requirements",
 		[
 				pytest.param(["foo!"], id="invalid_name"),
-				pytest.param(["foo @ http://example.com; os_name=='a'"]),
-				# pytest.param(["name @ gopher:/foo/com"], id="invalid URL"),
-				# pytest.param(["name @ file:."], id="invalid file URL (1)"),  # No longer raises exception with latest packaging
-				# pytest.param(["name @ file:/."], id="invalud file URL (2)"),
+				pytest.param(["foo@ http://example.com; os_name=='a'"]),
+				# pytest.param(["name@ gopher:/foo/com"], id="invalid URL"),
+				# pytest.param(["name@ file:."], id="invalid file URL (1)"),  # No longer raises exception with latest packaging
+				# pytest.param(["name@ file:/."], id="invalud file URL (2)"),
 				pytest.param(["name; foobar=='x'"], id="invalid_marker"),
 				["pygame     ?=1.2.3"],
 				["six**1.2.3"],

tox.ini

@@ -22,14 +22,12 @@
 
 [tox]
 envlist =
-    py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     py38-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
     py39-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
     py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1}
     py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
-    pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
     pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
     mypy
@@ -44,14 +42,12 @@ requires =
 
 [envlists]
 test =
-    py37-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     py38-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
     py39-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
     py310-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1}
     py311-sphinx{3.4,3.5,4.0,4.1,4.2,4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     py312-sphinx{4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
     py313-sphinx{6.2,7.0,7.1,7.2,7.3,7.4,8.0,8.1,8.2}
-    pypy37-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3}
     pypy38-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1}
     pypy39-sphinx{4.3,4.4,4.5,5.0,5.1,5.2,5.3,6.0,6.1,6.2,7.0,7.1,7.2,7.3,7.4}
 qa = mypy, lint
@@ -184,7 +180,7 @@ inline-quotes = "
 multiline-quotes = """
 docstring-quotes = """
 count = True
-min_python_version = 3.7
+min_python_version = 3.8
 unused-arguments-ignore-abstract-functions = True
 unused-arguments-ignore-overload-functions = True
 unused-arguments-ignore-magic-methods = True