summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernát Gábor <gaborjbernat@gmail.com>2019-03-29 12:09:29 +0000
committerGitHub <noreply@github.com>2019-03-29 12:09:29 +0000
commit14c0bee732621211611d082ac57cfafa721cbaf9 (patch)
tree20e619741436c454eb62c14f8ae0491a04531f87
parentb27228ea9008dffdf2863d7d9bf782918fdeb3d6 (diff)
parentb3e808eb7a3b38eb87366f36ddf882511a9a8fe5 (diff)
downloadtox-git-14c0bee732621211611d082ac57cfafa721cbaf9.tar.gz
Merge pull request #1226 from tox-dev/release-3.8.2
release 3.8.2
-rw-r--r--docs/changelog.rst15
-rw-r--r--docs/changelog/1218.bugfix.rst1
-rw-r--r--docs/changelog/1222.bugfix.rst2
-rw-r--r--docs/changelog/1223.bugfix.rst1
-rw-r--r--src/tox/util/stdlib.py2
5 files changed, 16 insertions, 5 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4b5d85f7..f4b68e8a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,21 @@ with advance notice in the **Deprecations** section of releases.
.. towncrier release notes start
+v3.8.2 (2019-03-29)
+-------------------
+
+Bugfixes
+^^^^^^^^
+
+- using -v and -e connected (as -ve) fails - by :user:`gaborbernat`
+ `#1218 <https://github.com/tox-dev/tox/issues/1218>`_
+- Changes to the plugin tester module (cmd no longer sets ``PYTHONPATH``), and ``action.popen`` no longer returns the
+ command identifier information from within the logs. No public facing changes.
+ `#1222 <https://github.com/tox-dev/tox/issues/1222>`_
+- Spinner fails in CI on ``UnicodeEncodeError`` - by :user:`gaborbernat`
+ `#1223 <https://github.com/tox-dev/tox/issues/1223>`_
+
+
v3.8.1 (2019-03-28)
-------------------
diff --git a/docs/changelog/1218.bugfix.rst b/docs/changelog/1218.bugfix.rst
deleted file mode 100644
index 60c842cb..00000000
--- a/docs/changelog/1218.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-using -v and -e connected (as -ve) fails - by :user:`gaborbernat`
diff --git a/docs/changelog/1222.bugfix.rst b/docs/changelog/1222.bugfix.rst
deleted file mode 100644
index 4b7723f7..00000000
--- a/docs/changelog/1222.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Changes to the plugin tester module (cmd no longer sets ``PYTHONPATH``), and ``action.popen`` no longer returns the
-command identifier information from within the logs. No public facing changes.
diff --git a/docs/changelog/1223.bugfix.rst b/docs/changelog/1223.bugfix.rst
deleted file mode 100644
index 4db5ddf1..00000000
--- a/docs/changelog/1223.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Spinner fails in CI on ``UnicodeDecodeError`` - by :user:`gaborbernat`
diff --git a/src/tox/util/stdlib.py b/src/tox/util/stdlib.py
index c00e9ce9..0b258594 100644
--- a/src/tox/util/stdlib.py
+++ b/src/tox/util/stdlib.py
@@ -18,7 +18,7 @@ def is_main_thread():
@contextmanager
def suppress_output():
"""suppress both stdout and stderr outputs"""
- if sys.version_info > (3, 4):
+ if sys.version_info >= (3, 5):
from contextlib import redirect_stdout, redirect_stderr
else: