From a18655f7292da608ba4358a887b642be117a1176 Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Thu, 17 Mar 2022 23:17:11 +0200
Subject: [PATCH] Merge pull request #9785 from pytest-dev/release-7.1.1
Prepare release 7.1.1
(cherry picked from commit b9462ed7d0b665778c908ab311015a49ece4f20e)
---
changelog/9767.bugfix.rst | 1 -
doc/en/announce/index.rst | 1 +
doc/en/announce/release-7.1.1.rst | 18 ++++++++++++++++++
doc/en/changelog.rst | 9 +++++++++
doc/en/getting-started.rst | 2 +-
5 files changed, 29 insertions(+), 2 deletions(-)
delete mode 100644 changelog/9767.bugfix.rst
create mode 100644 doc/en/announce/release-7.1.1.rst
diff --git a/changelog/9767.bugfix.rst b/changelog/9767.bugfix.rst
deleted file mode 100644
index 7de316980..000000000
--- a/changelog/9767.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-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.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index e55dd33e8..0da8b4037 100644
--- 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
new file mode 100644
index 000000000..d271c4557
--- /dev/null
+++ 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
index 64a22cbc7..6ff85883e 100644
--- 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
index 73f6fc53b..b856803f1 100644
--- 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`: