Skip to content

Commit

Permalink
Merge pull request #7796 from bluetech/changelog-cleanups
Browse files Browse the repository at this point in the history
changelog: some consistency cleanups
  • Loading branch information
bluetech authored Sep 26, 2020
2 parents d3f47bf + d3c746e commit 0b327cc
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion changelog/1953.bugfix.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Fix error when overwriting a parametrized fixture, while also reusing the super fixture value.
Fixed error when overwriting a parametrized fixture, while also reusing the super fixture value.

.. code-block:: python
Expand Down
2 changes: 1 addition & 1 deletion changelog/5585.breaking.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
As per our policy, the following features have been deprecated in the 5.X series and are now
As per our policy, the following features which have been deprecated in the 5.X series are now
removed:

* The ``funcargnames`` read-only property of ``FixtureRequest``, ``Metafunc``, and ``Function`` classes. Use ``fixturenames`` attribute.
Expand Down
2 changes: 1 addition & 1 deletion changelog/6981.deprecation.rst
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Deprecate the ``pytest.collect`` module: all its names can be imported from ``pytest`` directly.
The ``pytest.collect`` module is deprecated: all its names can be imported from ``pytest`` directly.
12 changes: 6 additions & 6 deletions changelog/7097.deprecation.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The ``pytest._fillfuncargs`` function is now deprecated. This function was kept
for backward compatibility with an older plugin.

It's functionality is not meant to be used directly, but if you must replace
it, use `function._request._fillfixtures()` instead, though note this is not
a public API and may break in the future.
The ``pytest._fillfuncargs`` function is deprecated. This function was kept
for backward compatibility with an older plugin.

It's functionality is not meant to be used directly, but if you must replace
it, use `function._request._fillfixtures()` instead, though note this is not
a public API and may break in the future.
10 changes: 5 additions & 5 deletions changelog/7210.deprecation.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The special ``-k '-expr'`` syntax to ``-k`` is deprecated. Use ``-k 'not expr'``
instead.

The special ``-k 'expr:'`` syntax to ``-k`` is deprecated. Please open an issue
if you use this and want a replacement.
The special ``-k '-expr'`` syntax to ``-k`` is deprecated. Use ``-k 'not expr'``
instead.

The special ``-k 'expr:'`` syntax to ``-k`` is deprecated. Please open an issue
if you use this and want a replacement.
3 changes: 2 additions & 1 deletion changelog/7255.deprecation.rst
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
The :func:`pytest_warning_captured` hook has been deprecated in favor of :func:`pytest_warning_recorded`, and will be removed in a future version.
The :func:`pytest_warning_captured <_pytest.hookspec.pytest_warning_captured>` hook is deprecated in favor
of :func:`pytest_warning_recorded <_pytest.hookspec.pytest_warning_recorded>`, and will be removed in a future version.
2 changes: 1 addition & 1 deletion changelog/7628.bugfix.rst
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Fix test collection when a full path without a drive letter was passed to pytest on Windows (for example ``\projects\tests\test.py`` instead of ``c:\projects\tests\pytest.py``).
Fixed test collection when a full path without a drive letter was passed to pytest on Windows (for example ``\projects\tests\test.py`` instead of ``c:\projects\tests\pytest.py``).
6 changes: 3 additions & 3 deletions changelog/7671.trivial.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
When collecting tests, pytest finds test classes and functions by examining the
attributes of python objects (modules, classes and instances). To speed up this
process, pytest now ignores builtin attributes (like ``__class__``,
``__delattr__`` and ``__new__``) without consulting the ``python_classes`` and
``python_functions`` configuration options and without passing them to plugins
using the ``pytest_pycollect_makeitem`` hook.
``__delattr__`` and ``__new__``) without consulting the :confval:`python_classes` and
:confval:`python_functions` configuration options and without passing them to plugins
using the :func:`pytest_pycollect_makeitem <_pytest.hookspec.pytest_pycollect_makeitem>` hook.
2 changes: 1 addition & 1 deletion changelog/7742.bugfix.rst
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Fix INTERNALERROR when accessing locals / globals with faulty ``exec``.
Fixed INTERNALERROR when accessing locals / globals with faulty ``exec``.

0 comments on commit 0b327cc

Please sign in to comment.