summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/changelog.rst18
-rw-r--r--docs/changelog/2463.feature.rst1
-rw-r--r--docs/changelog/2474.bugfix.rst1
-rw-r--r--docs/changelog/2478.bugfix.rst1
4 files changed, 18 insertions, 3 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 30b30e77..a333e0dc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,24 @@ with advance notice in the **Deprecations** section of releases.
.. towncrier release notes start
+v3.26.0 (2022-09-07)
+--------------------
+
+Bugfixes
+^^^^^^^^
+
+- Fix fallback to ``python`` environment when ``isolated_build = true`` is set -- by :user:`Unrud`
+ `#2474 <https://github.com/tox-dev/tox/issues/2474>`_
+- Fixed ``SetuptoolsDeprecationWarning`` about using ``--global-option`` -- by :user:`adamchainz`
+ `#2478 <https://github.com/tox-dev/tox/issues/2478>`_
+
+
+Features
+^^^^^^^^
+
+- Use ``tomllib`` on Python 3.11 or later and ``tomli`` instead of ``toml`` library on lower versions - by :user:`hroncok`.
+ `#2463 <https://github.com/tox-dev/tox/issues/2463>`_
+
v3.25.1 (2022-06-29)
--------------------
diff --git a/docs/changelog/2463.feature.rst b/docs/changelog/2463.feature.rst
deleted file mode 100644
index 69552075..00000000
--- a/docs/changelog/2463.feature.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use ``tomllib`` on Python 3.11 or later and ``tomli`` instead of ``toml`` library on lower versions - by :user:`hroncok`.
diff --git a/docs/changelog/2474.bugfix.rst b/docs/changelog/2474.bugfix.rst
deleted file mode 100644
index 038bd96b..00000000
--- a/docs/changelog/2474.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix fallback to ``python`` environment when ``isolated_build = true`` is set -- by :user:`Unrud`
diff --git a/docs/changelog/2478.bugfix.rst b/docs/changelog/2478.bugfix.rst
deleted file mode 100644
index f426a23c..00000000
--- a/docs/changelog/2478.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed ``SetuptoolsDeprecationWarning`` about using ``--global-option`` -- by :user:`adamchainz`