From bbcec9c46509c417ef58e4849847b4aa43f4591e Mon Sep 17 00:00:00 2001
From: pytest bot <pytestbot@gmail.com>
Date: Wed, 24 Jul 2024 21:30:07 +0000
Subject: [PATCH] Prepare release version 8.3.2

---
 changelog/12652.bugfix.rst          |  3 ---
 doc/en/announce/index.rst           |  1 +
 doc/en/announce/release-8.3.2.rst   | 19 +++++++++++++++++++
 doc/en/changelog.rst                | 11 +++++++++++
 doc/en/example/parametrize.rst      |  6 +++---
 doc/en/example/pythoncollection.rst |  4 ++--
 doc/en/getting-started.rst          |  2 +-
 doc/en/how-to/fixtures.rst          |  2 +-
 8 files changed, 38 insertions(+), 10 deletions(-)
 delete mode 100644 changelog/12652.bugfix.rst
 create mode 100644 doc/en/announce/release-8.3.2.rst

diff --git a/changelog/12652.bugfix.rst b/changelog/12652.bugfix.rst
deleted file mode 100644
index da7644df06d..00000000000
--- a/changelog/12652.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Resolve regression `conda` environments where no longer being automatically detected.
-
--- by :user:`RonnyPfannschmidt`
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 429cb8249a1..09311a1a1ab 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-8.3.2
    release-8.3.1
    release-8.3.0
    release-8.2.2
diff --git a/doc/en/announce/release-8.3.2.rst b/doc/en/announce/release-8.3.2.rst
new file mode 100644
index 00000000000..1e4a071692c
--- /dev/null
+++ b/doc/en/announce/release-8.3.2.rst
@@ -0,0 +1,19 @@
+pytest-8.3.2
+=======================================
+
+pytest 8.3.2 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
+* Ronny Pfannschmidt
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
index 083d30abf86..3178f82044d 100644
--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
@@ -31,6 +31,17 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 8.3.2 (2024-07-24)
+=========================
+
+Bug fixes
+---------
+
+- `#12652 <https://github.com/pytest-dev/pytest/issues/12652>`_: Resolve regression `conda` environments where no longer being automatically detected.
+
+  -- by :user:`RonnyPfannschmidt`
+
+
 pytest 8.3.1 (2024-07-20)
 =========================
 
diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst
index b5679ff6305..3e449b2eaa2 100644
--- a/doc/en/example/parametrize.rst
+++ b/doc/en/example/parametrize.rst
@@ -162,7 +162,7 @@ objects, they are still using the default pytest representation:
     rootdir: /home/sweet/project
     collected 8 items
 
-    <Dir parametrize.rst-202>
+    <Dir parametrize.rst-203>
       <Module test_time.py>
         <Function test_timedistance_v0[a0-b0-expected0]>
         <Function test_timedistance_v0[a1-b1-expected1]>
@@ -239,7 +239,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia
     rootdir: /home/sweet/project
     collected 4 items
 
-    <Dir parametrize.rst-202>
+    <Dir parametrize.rst-203>
       <Module test_scenarios.py>
         <Class TestSampleWithScenarios>
           <Function test_demo1[basic]>
@@ -318,7 +318,7 @@ Let's first see how it looks like at collection time:
     rootdir: /home/sweet/project
     collected 2 items
 
-    <Dir parametrize.rst-202>
+    <Dir parametrize.rst-203>
       <Module test_backends.py>
         <Function test_db_initialized[d1]>
         <Function test_db_initialized[d2]>
diff --git a/doc/en/example/pythoncollection.rst b/doc/en/example/pythoncollection.rst
index 9705ccf94f8..5bd03035c14 100644
--- a/doc/en/example/pythoncollection.rst
+++ b/doc/en/example/pythoncollection.rst
@@ -152,7 +152,7 @@ The test collection would look like this:
     configfile: pytest.ini
     collected 2 items
 
-    <Dir pythoncollection.rst-203>
+    <Dir pythoncollection.rst-204>
       <Module check_myapp.py>
         <Class CheckMyApp>
           <Function simple_check>
@@ -215,7 +215,7 @@ You can always peek at the collection tree without running tests like this:
     configfile: pytest.ini
     collected 3 items
 
-    <Dir pythoncollection.rst-203>
+    <Dir pythoncollection.rst-204>
       <Dir CWD>
         <Module pythoncollection.py>
           <Function test_function>
diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst
index b519656a182..050fd2d80ec 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 8.3.1
+    pytest 8.3.2
 
 .. _`simpletest`:
 
diff --git a/doc/en/how-to/fixtures.rst b/doc/en/how-to/fixtures.rst
index 5c66c348eca..f4d59ff93c0 100644
--- a/doc/en/how-to/fixtures.rst
+++ b/doc/en/how-to/fixtures.rst
@@ -1418,7 +1418,7 @@ Running the above tests results in the following test IDs being used:
    rootdir: /home/sweet/project
    collected 12 items
 
-   <Dir fixtures.rst-222>
+   <Dir fixtures.rst-223>
      <Module test_anothersmtp.py>
        <Function test_showhelo[smtp.gmail.com]>
        <Function test_showhelo[mail.python.org]>