Merge pull request #7575 from nicoddemus/fix-changelog-entries-release-process

RELEASING.rst

@@ -69,9 +69,9 @@ Both automatic and manual processes described above follow the same steps from t
 
        git fetch --all --prune
        git checkout origin/master -b cherry-pick-release
-       git cherry-pick --no-commit -m1 origin/MAJOR.MINOR.x
+       git cherry-pick -x -m1 origin/MAJOR.MINOR.x
-       git checkout origin/master -- changelog
+
-       git commit  # no arguments
+#. Open a PR for ``cherry-pick-release`` and merge it once CI passes. No need to wait for approvals if there were no conflicts on the previous step.
 
 #. Send an email announcement with the contents from::
 

changelog/5584.breaking.rst

@@ -1,23 +0,0 @@
-**PytestDeprecationWarning are now errors by default.**
-
-Following our plan to remove deprecated features with as little disruption as
-possible, all warnings of type ``PytestDeprecationWarning`` now generate errors
-instead of warning messages.
-
-**The affected features will be effectively removed in pytest 6.1**, so please consult the
-`Deprecations and Removals <https://docs.pytest.org/en/latest/deprecations.html>`__
-section in the docs for directions on how to update existing code.
-
-In the pytest ``6.0.X`` series, it is possible to change the errors back into warnings as a
-stopgap measure by adding this to your ``pytest.ini`` file:
-
-.. code-block:: ini
-
-    [pytest]
-    filterwarnings =
-        ignore::pytest.PytestDeprecationWarning
-
-But this will stop working when pytest ``6.1`` is released.
-
-**If you have concerns** about the removal of a specific feature, please add a
-comment to `#5584 <https://github.com/pytest-dev/pytest/issues/5584>`__.

changelog/7389.trivial.rst

@@ -1 +0,0 @@
-Fixture scope ``package`` is no longer considered experimental.

changelog/7392.bugfix.rst

@@ -1 +0,0 @@
-Fix the reported location of tests skipped with ``@pytest.mark.skip`` when ``--runxfail`` is used.

changelog/7422.doc.rst

@@ -1 +0,0 @@
-Clarified when the ``usefixtures`` mark can apply fixtures to test.

changelog/7441.doc.rst

@@ -1 +0,0 @@
-Add a note about ``-q`` option used in getting started guide.

changelog/7464.feature.rst

@@ -1 +0,0 @@
-Added support for :envvar:`NO_COLOR` and :envvar:`FORCE_COLOR` environment variables to control colored output.

changelog/7467.improvement.rst

@@ -1 +0,0 @@
-``--log-file`` CLI option and ``log_file`` ini marker now create subdirectories if needed.

changelog/7472.breaking.rst

@@ -1 +0,0 @@
-The ``exec_()`` and ``is_true()`` methods of ``_pytest._code.Frame`` have been removed.

changelog/7489.improvement.rst

@@ -1 +0,0 @@
-The :func:`pytest.raises` function has a clearer error message when ``match`` equals the obtained string but is not a regex match. In this case it is suggested to escape the regex.

changelog/7491.bugfix.rst

@@ -1,2 +0,0 @@
-:fixture:`tmpdir` and :fixture:`tmp_path` no longer raise an error if the lock to check for
-stale temporary directories is not accessible.

changelog/7517.bugfix.rst

@@ -1 +0,0 @@
-Preserve line endings when captured via ``capfd``.

changelog/7534.bugfix.rst

@@ -1 +0,0 @@
-Restored the previous formatting of ``TracebackEntry.__str__`` which was changed by accident.