Skip to content

Commit fcde66b

Browse files
authored
Merge pull request #393 from pytest-dev/release-3.12.0
Release 3.12.0
2 parents 2a71a0d + 69adc6f commit fcde66b

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,16 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
34+
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
3535
os: [ubuntu-latest, windows-latest]
36+
tox_env: ["py"]
3637
include:
37-
- python: "3.7"
38-
tox_env: "py37"
39-
- python: "3.8"
40-
tox_env: "py38"
41-
- python: "3.9"
42-
tox_env: "py39"
43-
- python: "3.10"
44-
tox_env: "py310"
45-
- python: "3.11"
46-
tox_env: "py311"
38+
- python: "3.12"
39+
os: ubuntu-latest
40+
tox_env: "norewrite"
41+
- python: "3.12"
42+
os: windows-latest
43+
tox_env: "norewrite"
4744

4845
steps:
4946
- uses: actions/checkout@v3

.readthedocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ build:
77

88
sphinx:
99
configuration: docs/conf.py
10+
fail_on_warning: true
1011

1112
python:
1213
install:

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Releases
44
3.12.0 (2023-10-19)
55
-------------------
66

7+
* Added support for Python 3.12.
8+
* Dropped support for EOL Python 3.7.
79
* ``mocker.resetall()`` now also resets mocks created by ``mocker.create_autospec`` (`#390`_).
810

911
.. _#390: https://github.com/pytest-dev/pytest-mock/pull/390

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package_data={
1111
"pytest_mock": ["py.typed"],
1212
},
13-
python_requires=">=3.7",
13+
python_requires=">=3.8",
1414
install_requires=["pytest>=5.0"],
1515
use_scm_version={"write_to": "src/pytest_mock/_version.py"},
1616
setup_requires=["setuptools_scm"],
@@ -30,11 +30,11 @@
3030
"License :: OSI Approved :: MIT License",
3131
"Operating System :: OS Independent",
3232
"Programming Language :: Python :: 3",
33-
"Programming Language :: Python :: 3.7",
3433
"Programming Language :: Python :: 3.8",
3534
"Programming Language :: Python :: 3.9",
3635
"Programming Language :: Python :: 3.10",
3736
"Programming Language :: Python :: 3.11",
37+
"Programming Language :: Python :: 3.12",
3838
"Programming Language :: Python :: 3 :: Only",
3939
"Topic :: Software Development :: Testing",
4040
],

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[tox]
22
minversion = 3.5.3
3-
envlist = py{37,38,39,310,311}, norewrite
3+
envlist = py{38,39,310,311,312}, norewrite
44

55
[testenv]
66
deps =
77
coverage
88
mock
99
pytest-asyncio
1010
commands =
11-
coverage run --append --source={envsitepackagesdir}/pytest_mock -m pytest tests
11+
coverage run --append --source={envsitepackagesdir}/pytest_mock -m pytest tests --color=yes
1212

1313
[testenv:norewrite]
1414
commands =
15-
pytest tests --assert=plain
15+
pytest tests --assert=plain --color=yes
1616

1717
[pytest]
1818
addopts = -r a

0 commit comments

Comments
 (0)