summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/changelog.rst19
-rw-r--r--docs/changelog/1184.feature.rst1
-rw-r--r--docs/changelog/1295.bugfix.rst1
-rw-r--r--docs/changelog/1306.bugfix.rst1
4 files changed, 19 insertions, 3 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 690389ab..d316e66c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,25 @@ with advance notice in the **Deprecations** section of releases.
.. towncrier release notes start
+v3.12.0 (2019-05-23)
+--------------------
+
+Bugfixes
+^^^^^^^^
+
+- When using ``--parallel`` with ``--result-json`` the test results are now included the same way as with serial runs - by :user:`fschulze`
+ `#1295 <https://github.com/tox-dev/tox/issues/1295>`_
+- Turns out the output of the ``py -0p`` is not stable yet and varies depending on various edge cases. Instead now we read the interpreter values directly from registry via `PEP-514 <https://www.python.org/dev/peps/pep-0514>`_ - by :user:`gaborbernat`.
+ `#1306 <https://github.com/tox-dev/tox/issues/1306>`_
+
+
+Features
+^^^^^^^^
+
+- Adding ``TOX_PARALLEL_NO_SPINNER`` environment variable to disable the spinner in parallel mode for the purposes of clean output when using CI tools - by :user:`zeroshift`
+ `#1184 <https://github.com/tox-dev/tox/issues/1184>`_
+
+
v3.11.1 (2019-05-16)
--------------------
diff --git a/docs/changelog/1184.feature.rst b/docs/changelog/1184.feature.rst
deleted file mode 100644
index 388f3f5a..00000000
--- a/docs/changelog/1184.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Adding ``TOX_PARALLEL_NO_SPINNER`` environment variable to disable the spinner in parallel mode for the purposes of clean output when using CI tools - by :user:`zeroshift`
diff --git a/docs/changelog/1295.bugfix.rst b/docs/changelog/1295.bugfix.rst
deleted file mode 100644
index c201f127..00000000
--- a/docs/changelog/1295.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-When using ``--parallel`` with ``--result-json`` the test results are now included the same way as with serial runs - by :user:`fschulze`
diff --git a/docs/changelog/1306.bugfix.rst b/docs/changelog/1306.bugfix.rst
deleted file mode 100644
index 469ca163..00000000
--- a/docs/changelog/1306.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Turns out the output of the ``py -0p`` is not stable yet and varies depending on various edge cases. Instead now we read the interpreter values directly from registry via `PEP-514 <https://www.python.org/dev/peps/pep-0514>`_ - by :user:`gaborbernat`.