Merge pull request #1040 from tox-dev/release-3.5.0

release 3.5.0

7 files changed, 28 insertions, 12 deletions

diff --git a/changelog.rst b/changelog.rst
new file mode 100644
index 00000000..7b03e5a5
--- /dev/null
+++ b/changelog.rst
@@ -0,0 +1,28 @@
+3.5.0 (2018-10-08)
+------------------
+
+Bugfixes
+^^^^^^^^
+
+- intermittent failures with ``--parallel--safe-build``, instead of mangling with the file paths now uses a lock to make the package build operation thread safe and is now on by default (``--parallel--safe-build`` is now deprecated) - by :user:`gaborbernat` (`#1026 <https://github.com/tox-dev/tox/issues/1026>`_)
+
+
+Features
+^^^^^^^^
+
+- Added ``temp_dir`` folder configuration (defaults to ``{toxworkdir}/.tmp``) that contains tox
+  temporary files. Package builds now create a hard link (if possible, otherwise copy - notably in
+  case of Windows Python 2.7) to the built file, and feed that file downstream (e.g. for pip to
+  install it). The hard link is removed at the end of the run (what it points though is kept
+  inside ``distdir``). This ensures that a tox session operates on the same package it built, even
+  if a parallel tox run builds another version. Note ``distdir`` will contain only the last built
+  package in such cases. - by :user:`gaborbernat` (`#1026 <https://github.com/tox-dev/tox/issues/1026>`_)
+
+
+Documentation
+^^^^^^^^^^^^^
+
+- document tox environment recreate rules (:ref:`recreate`) - by :user:`gaborbernat` (`#93 <https://github.com/tox-dev/tox/issues/93>`_)
+- document inside the ``--help`` how to disable colorized output via the ``PY_COLORS`` operating system environment variable - by :user:`gaborbernat` (`#163 <https://github.com/tox-dev/tox/issues/163>`_)
+- document all global tox flags and a more concise format to express default and type - by :user:`gaborbernat` (`#683 <https://github.com/tox-dev/tox/issues/683>`_)
+- document command line interface under the config section `cli <https://tox.readthedocs.io/en/latest/config.html?highlight=cli#cli>`_ - by :user:`gaborbernat` (`#829 <https://github.com/tox-dev/tox/issues/829>`_)
diff --git a/docs/changelog/1026.bugfix.rst b/docs/changelog/1026.bugfix.rst
deleted file mode 100644
index aa168e26..00000000
--- a/docs/changelog/1026.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-intermittent failures with ``--parallel--safe-build``, instead of mangling with the file paths now uses a lock to make the package build operation thread safe and is now on by default (``--parallel--safe-build`` is now deprecated) - by :user:`gaborbernat`
diff --git a/docs/changelog/1026.feature.rst b/docs/changelog/1026.feature.rst
deleted file mode 100644
index bad094ee..00000000
--- a/docs/changelog/1026.feature.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Added ``temp_dir`` folder configuration (defaults to ``{toxworkdir}/.tmp``) that contains tox
-temporary files. Package builds now create a hard link (if possible, otherwise copy - notably in
-case of Windows Python 2.7) to the built file, and feed that file downstream (e.g. for pip to
-install it). The hard link is removed at the end of the run (what it points though is kept
-inside ``distdir``). This ensures that a tox session operates on the same package it built, even
-if a parallel tox run builds another version. Note ``distdir`` will contain only the last built
-package in such cases. - by :user:`gaborbernat`
diff --git a/docs/changelog/163.doc.rst b/docs/changelog/163.doc.rst
deleted file mode 100644
index d49eb582..00000000
--- a/docs/changelog/163.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-document inside the ``--help`` how to disable colorized output via the ``PY_COLORS`` operating system environment variable - by :user:`gaborbernat`
diff --git a/docs/changelog/683.doc.rst b/docs/changelog/683.doc.rst
deleted file mode 100644
index e47ba8b1..00000000
--- a/docs/changelog/683.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-document all global tox flags and a more concise format to express default and type - by :user:`gaborbernat`
diff --git a/docs/changelog/829.doc.rst b/docs/changelog/829.doc.rst
deleted file mode 100644
index 0243fb58..00000000
--- a/docs/changelog/829.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-document command line interface under the config section `cli <https://tox.readthedocs.io/en/latest/config.html?highlight=cli#cli>`_ - by :user:`gaborbernat`
diff --git a/docs/changelog/93.doc.rst b/docs/changelog/93.doc.rst
deleted file mode 100644
index 2a6a8e8d..00000000
--- a/docs/changelog/93.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-document tox environment recreate rules (:ref:`recreate`) - by :user:`gaborbernat`