Merge pull request #2609 from tox-dev/release-4.0.0

tox-dev · Dec 7, 2022 · 60d4e25 · 60d4e25
2 parents fc4d938 + c63ee4a
commit 60d4e25
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,19 @@ Release History
 
 .. towncrier release notes start
 
+v4.0.0 (2022-12-07)
+-------------------
+
+Bugfixes - 4.0.0
+~~~~~~~~~~~~~~~~
+- The temporary folder within the tox environment was named ``.temp`` instead of ``.tmp`` - by :user:`gaborbernat`. (:issue:`2608`)
+
+Improved Documentation - 4.0.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Enumerate breaking changes of tox 4 in the FAQ, and also list major new improvements - by :user:`gaborbernat`. (:issue:`2587`)
+- Document in the FAQ that tox 4 will raise a warning when finding conflicting environment names - by :user:`gaborbernat`. (:issue:`2602`)
+
+
 v4.0.0rc4 (2022-12-06)
 ----------------------
 

diff --git a/docs/changelog/2587.doc.rst b/docs/changelog/2587.doc.rst
diff --git a/docs/changelog/2602.doc.rst b/docs/changelog/2602.doc.rst
diff --git a/docs/changelog/2608.bugfix.rst b/docs/changelog/2608.bugfix.rst
diff --git a/tests/test_provision.py b/tests/test_provision.py
@@ -189,6 +189,5 @@ def test_provision_no_recreate_json(tox_project: ToxProjectCreator) -> None:
     assert msg in result.out
     with (project.path / "out.json").open() as file_handler:
         requires = json.load(file_handler)
-    # __version__ could be something like 4.0.0rc1.dev1+? so we still need to sanitize it to keep the base and add "a0"
-    version = f"{Version(__version__).base_version}a0"
+    version = Version(__version__).base_version
     assert requires == {"minversion": version, "requires": ["p", f"tox>={version}"]}