Skip to content

Commit c72507c

Browse files
Merge branch 'main' into Improvement-remove-prune_dependency_tree
2 parents 5e02d9c + dd7beb3 commit c72507c

29 files changed

+352
-147
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ jobs:
3636
timeout-minutes: 30
3737
permissions:
3838
id-token: write
39+
contents: write
3940
steps:
4041
- uses: actions/checkout@v3
42+
4143
- name: Download Package
4244
uses: actions/download-artifact@v3
4345
with:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repos:
2121
exclude: _pytest/(debugging|hookspec).py
2222
language_version: python3
2323
- repo: https://github.com/PyCQA/autoflake
24-
rev: v2.2.0
24+
rev: v2.2.1
2525
hooks:
2626
- id: autoflake
2727
name: autoflake

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ Feng Ma
143143
Florian Bruhin
144144
Florian Dahlitz
145145
Floris Bruynooghe
146+
Fraser Stark
146147
Gabriel Landau
147148
Gabriel Reis
148149
Garvit Shubham
@@ -348,6 +349,7 @@ Simon Holesch
348349
Simon Kerr
349350
Skylar Downes
350351
Srinivas Reddy Thatiparthy
352+
Stefaan Lippens
351353
Stefan Farmbauer
352354
Stefan Scherfke
353355
Stefan Zimmermann
@@ -381,6 +383,7 @@ Tor Colvin
381383
Trevor Bekolay
382384
Tushar Sadhwani
383385
Tyler Goodlet
386+
Tyler Smart
384387
Tzu-ping Chung
385388
Vasily Kuznetsov
386389
Victor Maryama

RELEASING.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ Releasing
134134
Both automatic and manual processes described above follow the same steps from this point onward.
135135

136136
#. After all tests pass and the PR has been approved, trigger the ``deploy`` job
137-
in https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml.
137+
in https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml, using the ``release-MAJOR.MINOR.PATCH`` branch
138+
as source.
138139

139140
This job will require approval from ``pytest-dev/core``, after which it will publish to PyPI
140141
and tag the repository.

changelog/10465.deprecation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Test functions returning a value other than None will now issue a :class:`pytest.PytestWarning` instead of :class:`pytest.PytestRemovedIn8Warning`, meaning this will stay a warning instead of becoming an error in the future.

changelog/11151.breaking.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
Dropped support for Python 3.7, which `reached end-of-life on 2023-06-27
2-
<https://devguide.python.org/versions/>`__.
1+
Dropped support for Python 3.7, which `reached end-of-life on 2023-06-27 <https://devguide.python.org/versions/>`__.

changelog/11367.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/en/announce/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Release announcements
66
:maxdepth: 2
77

88

9+
release-7.4.2
910
release-7.4.1
1011
release-7.4.0
1112
release-7.3.2

doc/en/announce/release-7.4.2.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
pytest-7.4.2
2+
=======================================
3+
4+
pytest 7.4.2 has just been released to PyPI.
5+
6+
This is a bug-fix release, being a drop-in replacement. To upgrade::
7+
8+
pip install --upgrade pytest
9+
10+
The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
11+
12+
Thanks to all of the contributors to this release:
13+
14+
* Bruno Oliveira
15+
16+
17+
Happy testing,
18+
The pytest Development Team

doc/en/builtin.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
105105
captured = capsys.readouterr()
106106
assert captured.out == "hello\n"
107107
108-
doctest_namespace [session scope] -- .../_pytest/doctest.py:737
108+
doctest_namespace [session scope] -- .../_pytest/doctest.py:757
109109
Fixture that returns a :py:class:`dict` that will be injected into the
110110
namespace of doctests.
111111

0 commit comments

Comments
 (0)