From 4a0aea2debfdd0ed2584221128fed891d0bc727d Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 14 Nov 2017 22:03:34 -0200 Subject: [PATCH 1/3] Add missing entry to CHANGELOG for 3.2.4 --- CHANGELOG.rst | 2 ++ changelog/2836.bug | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 changelog/2836.bug diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f75e83bbe..026290208 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -28,6 +28,8 @@ Bug Fixes failed example in the docstring is < 9. (`#2882 `_) +- Match fixture paths against actual path segments in order to avoid matching folders which share a prefix. + (`#2836 `_) Improved Documentation ---------------------- diff --git a/changelog/2836.bug b/changelog/2836.bug deleted file mode 100644 index afa1961d7..000000000 --- a/changelog/2836.bug +++ /dev/null @@ -1 +0,0 @@ -Match fixture paths against actual path segments in order to avoid matching folders which share a prefix. From dd6c5344681809a7509e45acdf3e28d03b728144 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 14 Nov 2017 22:08:03 -0200 Subject: [PATCH 2/3] Remove py<1.5 restriction Fix #2926 --- changelog/2926.bugfix | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/2926.bugfix diff --git a/changelog/2926.bugfix b/changelog/2926.bugfix new file mode 100644 index 000000000..09644b276 --- /dev/null +++ b/changelog/2926.bugfix @@ -0,0 +1 @@ +Remove ``py<1.5`` restriction from ``pytest`` as this can cause version conflicts in some installations. diff --git a/setup.py b/setup.py index c279ddf2d..55607912b 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ def has_environment_marker_support(): def main(): - install_requires = ['py>=1.4.33,<1.5', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages + install_requires = ['py>=1.4.33', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages extras_require = {} if has_environment_marker_support(): extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict'] From a220a40350a8a81c0f0e1986aa184e4c33da29d6 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 15 Nov 2017 00:12:42 +0000 Subject: [PATCH 3/3] Preparing release version 3.2.5 --- CHANGELOG.rst | 11 +++++++++++ changelog/2926.bugfix | 1 - doc/en/announce/index.rst | 1 + doc/en/announce/release-3.2.5.rst | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) delete mode 100644 changelog/2926.bugfix create mode 100644 doc/en/announce/release-3.2.5.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 026290208..4146670f2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,17 @@ .. towncrier release notes start +Pytest 3.2.5 (2017-11-15) +========================= + +Bug Fixes +--------- + +- Remove ``py<1.5`` restriction from ``pytest`` as this can cause version + conflicts in some installations. (`#2926 + `_) + + Pytest 3.2.4 (2017-11-13) ========================= diff --git a/changelog/2926.bugfix b/changelog/2926.bugfix deleted file mode 100644 index 09644b276..000000000 --- a/changelog/2926.bugfix +++ /dev/null @@ -1 +0,0 @@ -Remove ``py<1.5`` restriction from ``pytest`` as this can cause version conflicts in some installations. diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst index 2e3b45805..d340f5d46 100644 --- a/doc/en/announce/index.rst +++ b/doc/en/announce/index.rst @@ -6,6 +6,7 @@ Release announcements :maxdepth: 2 + release-3.2.5 release-3.2.4 release-3.2.3 release-3.2.2 diff --git a/doc/en/announce/release-3.2.5.rst b/doc/en/announce/release-3.2.5.rst new file mode 100644 index 000000000..a520ce2b3 --- /dev/null +++ b/doc/en/announce/release-3.2.5.rst @@ -0,0 +1,18 @@ +pytest-3.2.5 +======================================= + +pytest 3.2.5 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 http://doc.pytest.org/en/latest/changelog.html. + +Thanks to all who contributed to this release, among them: + +* Bruno Oliveira + + +Happy testing, +The pytest Development Team