summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst30
-rw-r--r--changelog/2579.bugfix1
-rw-r--r--changelog/2591.bugfix1
-rw-r--r--changelog/2626.doc1
-rw-r--r--changelog/2644.bugfix1
-rw-r--r--changelog/2666.bugfix3
-rw-r--r--doc/en/announce/index.rst1
-rw-r--r--doc/en/announce/release-3.2.1.rst22
-rw-r--r--doc/en/example/simple.rst6
9 files changed, 56 insertions, 10 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3d959be79..0cf7c1a17 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,36 @@
.. towncrier release notes start
+Pytest 3.2.1 (2017-08-08)
+=========================
+
+Bug Fixes
+---------
+
+- Fixed small terminal glitch when collecting a single test item. (`#2579
+ <https://github.com/pytest-dev/pytest/issues/2579>`_)
+
+- Correctly consider ``/`` as the file separator to automatically mark plugin
+ files for rewrite on Windows. (`#2591 <https://github.com/pytest-
+ dev/pytest/issues/2591>`_)
+
+- Properly escape test names when setting ``PYTEST_CURRENT_TEST`` environment
+ variable. (`#2644 <https://github.com/pytest-dev/pytest/issues/2644>`_)
+
+- Fix error on Windows and Python 3.6+ when ``sys.stdout`` has been replaced
+ with a stream-like object which does not implement the full ``io`` module
+ buffer protocol. In particular this affects ``pytest-xdist`` users on the
+ aforementioned platform. (`#2666 <https://github.com/pytest-
+ dev/pytest/issues/2666>`_)
+
+
+Improved Documentation
+----------------------
+
+- Explicitly document which pytest features work with ``unittest``. (`#2626
+ <https://github.com/pytest-dev/pytest/issues/2626>`_)
+
+
Pytest 3.2.0 (2017-07-30)
=========================
diff --git a/changelog/2579.bugfix b/changelog/2579.bugfix
deleted file mode 100644
index bb046b3c8..000000000
--- a/changelog/2579.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed small terminal glitch when collecting a single test item.
diff --git a/changelog/2591.bugfix b/changelog/2591.bugfix
deleted file mode 100644
index 31a269bdb..000000000
--- a/changelog/2591.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Correctly consider ``/`` as the file separator to automatically mark plugin files for rewrite on Windows.
diff --git a/changelog/2626.doc b/changelog/2626.doc
deleted file mode 100644
index d244ca12c..000000000
--- a/changelog/2626.doc
+++ /dev/null
@@ -1 +0,0 @@
-Explicitly document which pytest features work with ``unittest``.
diff --git a/changelog/2644.bugfix b/changelog/2644.bugfix
deleted file mode 100644
index f70e7ec1b..000000000
--- a/changelog/2644.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Properly escape test names when setting ``PYTEST_CURRENT_TEST`` environment variable.
diff --git a/changelog/2666.bugfix b/changelog/2666.bugfix
deleted file mode 100644
index 12369b399..000000000
--- a/changelog/2666.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix error on Windows and Python 3.6+ when ``sys.stdout`` has been replaced with
-a stream-like object which does not implement the full ``io`` module buffer protocol. In particular this
-affects ``pytest-xdist`` users on the aforementioned platform.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 8a2f15d8d..b6df7deec 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
:maxdepth: 2
+ release-3.2.1
release-3.2.0
release-3.1.3
release-3.1.2
diff --git a/doc/en/announce/release-3.2.1.rst b/doc/en/announce/release-3.2.1.rst
new file mode 100644
index 000000000..899ffcd4b
--- /dev/null
+++ b/doc/en/announce/release-3.2.1.rst
@@ -0,0 +1,22 @@
+pytest-3.2.1
+=======================================
+
+pytest 3.2.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 http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Alex Gaynor
+* Bruno Oliveira
+* Florian Bruhin
+* Ronny Pfannschmidt
+* Srinivas Reddy Thatiparthy
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst
index be3f8d2e8..176063a1a 100644
--- a/doc/en/example/simple.rst
+++ b/doc/en/example/simple.rst
@@ -382,9 +382,9 @@ Now we can profile which test functions execute the slowest::
test_some_are_slow.py ...
======= slowest 3 test durations ========
- 0.20s call test_some_are_slow.py::test_funcslow2
- 0.10s call test_some_are_slow.py::test_funcslow1
- 0.00s setup test_some_are_slow.py::test_funcfast
+ 0.30s call test_some_are_slow.py::test_funcslow2
+ 0.20s call test_some_are_slow.py::test_funcslow1
+ 0.10s call test_some_are_slow.py::test_funcfast
======= 3 passed in 0.12 seconds ========
incremental testing - test steps