Drop support for Python 3.6

domdfcoding · domdfcoding · commit 705ed8fc9a6b · 2025-05-22T14:18:45.000+01:00
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -22,21 +22,19 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
+      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'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
           - {python-version: "3.11", testenvs: "py311,build", experimental: False}
           - {python-version: "3.12", testenvs: "py312,build", experimental: False}
-          - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False}
+          - {python-version: "3.13", testenvs: "py313,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
           - {python-version: "pypy-3.9-v7.3.15", testenvs: "pypy39,build", experimental: True}
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: "ubuntu-22.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9'
+      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'
 
     strategy:
       fail-fast: False
@@ -35,7 +35,7 @@ jobs:
           - {python-version: "3.10", testenvs: "py310,build", experimental: False}
           - {python-version: "3.11", testenvs: "py311,build", experimental: False}
           - {python-version: "3.12", testenvs: "py312,build", experimental: False}
-          - {python-version: "3.13", testenvs: "py313-dev,build", experimental: True}
+          - {python-version: "3.13", testenvs: "py313,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
           - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False}
           - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True}
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -22,20 +22,19 @@ jobs:
     runs-on: "macos-${{ matrix.config.os-ver }}"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,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.7,3.8,3.9,3.10,3.11,3.12,3.13,pypy-3.7,pypy-3.8,pypy-3.9'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", os-ver: "13", testenvs: "py36,build", experimental: False}
           - {python-version: "3.7", os-ver: "13", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", os-ver: "14", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", os-ver: "14", testenvs: "py39,build", experimental: False}
           - {python-version: "3.10", os-ver: "14", testenvs: "py310,build", experimental: False}
           - {python-version: "3.11", os-ver: "14", testenvs: "py311,build", experimental: False}
           - {python-version: "3.12", os-ver: "14", testenvs: "py312,build", experimental: False}
-          - {python-version: "3.13", os-ver: "14", testenvs: "py313-dev,build", experimental: True}
+          - {python-version: "3.13", os-ver: "14", testenvs: "py313,build", experimental: False}
           - {python-version: "pypy-3.7", os-ver: "13", testenvs: "pypy37,build", experimental: False}
           - {python-version: "pypy-3.8", os-ver: "14", testenvs: "pypy38,build", experimental: False}
           - {python-version: "pypy-3.9", os-ver: "14", testenvs: "pypy39,build", experimental: True}
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -38,11 +38,11 @@ Automated tests
 -------------------
 
 Tests are run with ``tox`` and ``pytest``.
-To run tests for a specific Python version, such as Python 3.6:
+To run tests for a specific Python version, such as Python 3.10:
 
 .. code-block:: bash
 
-	$ tox -e py36
+	$ tox -e py310
 
 
 To run tests for all Python versions, simply run:
diff --git a/doc-source/contributing.rst b/doc-source/contributing.rst
@@ -38,11 +38,11 @@ Automated tests
 -------------------
 
 Tests are run with ``tox`` and ``pytest``.
-To run tests for a specific Python version, such as Python 3.6:
+To run tests for a specific Python version, such as Python 3.10:
 
 .. prompt:: bash
 
-	tox -e py36
+	tox -e py310
 
 
 To run tests for all Python versions, simply run:
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,7 +36,7 @@ base-classifiers = [
     "Topic :: Utilities",
     "Typing :: Typed",
 ]
-python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",]
+python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",]
 python-implementations = [ "CPython", "PyPy",]
 platforms = [ "Windows", "macOS", "Linux",]
 license-key = "MIT"
diff --git a/repo_helper.yml b/repo_helper.yml
@@ -13,15 +13,13 @@ enable_conda: False
 use_whey: True
 
 python_versions:
-  - 3.6
   - 3.7
   - 3.8
   - 3.9
   - '3.10'
   - '3.11'
   - '3.12'
-  - 3.13-dev
-  - pypy36
+  - '3.13'
   - pypy37
   - pypy38
   - pypy39
diff --git a/tox.ini b/tox.ini
@@ -23,15 +23,13 @@
 
 [tox]
 envlist =
-    py36
     py37
     py38
     py39
     py310
     py311
     py312
-    py313-dev
-    pypy36
+    py313
     pypy37
     pypy38
     pypy39
@@ -46,19 +44,7 @@ requires =
     virtualenv!=20.16.0
 
 [envlists]
-test =
-    py36
-    py37
-    py38
-    py39
-    py310
-    py311
-    py312
-    py313-dev
-    pypy36
-    pypy37
-    pypy38
-    pypy39
+test = py37, py38, py39, py310, py311, py312, py313, pypy37, pypy38, pypy39
 qa = mypy, lint
 cov = py38, coverage
 
@@ -77,7 +63,7 @@ setenv =
     PYTHONDEVMODE=1
     PIP_DISABLE_PIP_VERSION_CHECK=1
 
-[testenv:py313-dev]
+[testenv:py313]
 download = True
 setenv =
     PYTHONDEVMODE=1
@@ -210,7 +196,7 @@ inline-quotes = "
 multiline-quotes = """
 docstring-quotes = """
 count = True
-min_python_version = 3.6.1
+min_python_version = 3.7
 unused-arguments-ignore-abstract-functions = True
 unused-arguments-ignore-overload-functions = True
 unused-arguments-ignore-magic-methods = True

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ base-classifiers = [`
`36`	`36`	`"Topic :: Utilities",`
`37`	`37`	`"Typing :: Typed",`
`38`	`38`	`]`
`39`		`-python-versions = [ "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12",]`
	`39`	`+python-versions = [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13",]`
`40`	`40`	`python-implementations = [ "CPython", "PyPy",]`
`41`	`41`	`platforms = [ "Windows", "macOS", "Linux",]`
`42`	`42`	`license-key = "MIT"`