From 01f927dd97b520b5641eb81cc041a5c7b9045c2d Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 20 Sep 2023 13:20:03 +0200 Subject: [PATCH] Updated CHANGELOG for 3.26.1 --- CHANGELOG.rst | 14 ++++++++++++++ news/1770-feedstock-name | 23 ----------------------- news/1771-conda-uninstall | 23 ----------------------- 3 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 news/1770-feedstock-name delete mode 100644 news/1771-conda-uninstall diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f7c84eb38..97dd524af 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,20 @@ conda-smithy Change Log .. current developments +v3.26.1 +==================== + +**Fixed:** + +* Set ``FEEDSTOCK_NAME`` correctly on Windows in Azure Pipelines. (#1770) +* Always use ``conda`` to ``uninstall --force``. (#1771) + +**Authors:** + +* Jaime Rodríguez-Guerra + + + v3.26.0 ==================== diff --git a/news/1770-feedstock-name b/news/1770-feedstock-name deleted file mode 100644 index 8b9a139d2..000000000 --- a/news/1770-feedstock-name +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Set ``FEEDSTOCK_NAME`` correctly on Windows in Azure Pipelines. (#1770) - -**Security:** - -* diff --git a/news/1771-conda-uninstall b/news/1771-conda-uninstall deleted file mode 100644 index 0da8b92cf..000000000 --- a/news/1771-conda-uninstall +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Always use ``conda`` to ``uninstall --force``. (#1771) - -**Security:** - -*