Merge pull request #9786 from bluetech/cherry-pick-release

Merge pull request #9785 from pytest-dev/release-7.1.1
pytest-dev · Mar 19, 2022 · eb22339 · eb22339
2 parents 6312664 + a18655f
commit eb22339
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/changelog/9767.bugfix.rst b/changelog/9767.bugfix.rst
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-7.1.1
    release-7.1.0
    release-7.0.1
    release-7.0.0

diff --git a/doc/en/announce/release-7.1.1.rst b/doc/en/announce/release-7.1.1.rst
@@ -0,0 +1,18 @@
+pytest-7.1.1
+=======================================
+
+pytest 7.1.1 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+
+The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
+
+Thanks to all of the contributors to this release:
+
+* Ran Benita
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
@@ -28,6 +28,15 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 7.1.1 (2022-03-17)
+=========================
+
+Bug Fixes
+---------
+
+- `#9767 <https://github.com/pytest-dev/pytest/issues/9767>`_: Fixed a regression in pytest 7.1.0 where some conftest.py files outside of the source tree (e.g. in the `site-packages` directory) were not picked up.
+
+
 pytest 7.1.0 (2022-03-13)
 =========================
 

diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst
@@ -22,7 +22,7 @@ Install ``pytest``
 .. code-block:: bash
 
     $ pytest --version
-    pytest 7.1.0
+    pytest 7.1.1
 
 .. _`simpletest`: