summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernát Gábor <bgabor8@bloomberg.net>2020-03-25 10:47:35 +0000
committerGitHub <noreply@github.com>2020-03-25 10:47:35 +0000
commit1ea760270134617a3f76cd1e81af7e2cc045a62f (patch)
tree984330ae7119e1512ffa7842f3958c042d640838
parent549f7eef14446c3717d4a6d242b6229cc5a44c5f (diff)
parent803b226f2f568e50b29abfa4f9d42a52b5fb7c01 (diff)
downloadtox-git-1ea760270134617a3f76cd1e81af7e2cc045a62f.tar.gz
Merge pull request #1541 from tox-dev/release-3.14.6
release 3.14.6
-rw-r--r--docs/changelog.rst13
-rw-r--r--docs/changelog/1537.bugfix.rst2
-rw-r--r--docs/changelog/1539.bugfix.rst1
3 files changed, 13 insertions, 3 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1c23109e..777db796 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,19 @@ with advance notice in the **Deprecations** section of releases.
.. towncrier release notes start
+v3.14.6 (2020-03-25)
+--------------------
+
+Bugfixes
+^^^^^^^^
+
+- Exclude virtualenv depencency versions with known
+ regressions (20.0.[0-7]) - by :user:`webknjaz`.
+ `#1537 <https://github.com/tox-dev/tox/issues/1537>`_
+- Fix ``tox -h`` and ``tox --hi`` shows an error when run outside a directory with tox support files by :user:`nkpro2000sr`.
+ `#1539 <https://github.com/tox-dev/tox/issues/1539>`_
+
+
v3.14.5 (2020-02-16)
--------------------
diff --git a/docs/changelog/1537.bugfix.rst b/docs/changelog/1537.bugfix.rst
deleted file mode 100644
index 2c473545..00000000
--- a/docs/changelog/1537.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Exclude virtualenv depencency versions with known
-regressions (20.0.[0-7]) - by :user:`webknjaz`.
diff --git a/docs/changelog/1539.bugfix.rst b/docs/changelog/1539.bugfix.rst
deleted file mode 100644
index 51875f13..00000000
--- a/docs/changelog/1539.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``tox -h`` and ``tox --hi`` shows an error when run outside a directory with tox support files by :user:`nkpro2000sr`.