Drop Python 3.7 and add Python 3.12

pytest-dev · Oct 19, 2023 · b905823 · b905823
1 parent 2a71a0d
commit b905823
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,19 +31,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest, windows-latest]
-        include:
-          - python: "3.7"
-            tox_env: "py37"
-          - python: "3.8"
-            tox_env: "py38"
-          - python: "3.9"
-            tox_env: "py39"
-          - python: "3.10"
-            tox_env: "py310"
-          - python: "3.11"
-            tox_env: "py311"
 
     steps:
     - uses: actions/checkout@v3
@@ -67,4 +56,4 @@ jobs:
     - name: Test
       shell: bash
       run: |
-        tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz`
+        tox run -e py --installpkg `find dist/*.tar.gz`
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -7,6 +7,7 @@ build:
 
 sphinx:
   configuration: docs/conf.py
+  fail_on_warning: true
 
 python:
   install:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,8 @@ Releases
 3.12.0 (2023-10-19)
 -------------------
 
+* Added support for Python 3.12.
+* Dropped support for EOL Python 3.7.
 * ``mocker.resetall()`` now also resets mocks created by ``mocker.create_autospec`` (`#390`_).
 
 .. _#390: https://github.com/pytest-dev/pytest-mock/pull/390

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
     package_data={
         "pytest_mock": ["py.typed"],
     },
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     install_requires=["pytest>=5.0"],
     use_scm_version={"write_to": "src/pytest_mock/_version.py"},
     setup_requires=["setuptools_scm"],
@@ -30,11 +30,11 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "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 :: Only",
         "Topic :: Software Development :: Testing",
     ],

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.5.3
-envlist = py{37,38,39,310,311}, norewrite
+envlist = py{38,39,310,311,312}, norewrite
 
 [testenv]
 deps =