From eb305b4af07e8c6400b669d1b02e273d3705967d Mon Sep 17 00:00:00 2001 From: KB-perByte Date: Tue, 12 Apr 2022 11:59:59 +0530 Subject: [PATCH 1/2] prep minor release 2.6.0 --- CHANGELOG.rst | 24 +++++++------------ changelogs/changelog.yaml | 15 ++++++++++-- changelogs/fragments/0-ignore.yml | 3 --- .../fragments/consolidate_filter_plugin.yml | 3 --- changelogs/fragments/enable_upgrade_black.yml | 4 ---- changelogs/fragments/pre-commit-enable.yml | 4 ---- changelogs/fragments/pre-commit-skip.yml | 6 ----- 7 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 changelogs/fragments/0-ignore.yml delete mode 100644 changelogs/fragments/consolidate_filter_plugin.yml delete mode 100644 changelogs/fragments/enable_upgrade_black.yml delete mode 100644 changelogs/fragments/pre-commit-enable.yml delete mode 100644 changelogs/fragments/pre-commit-skip.yml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c2ee101..c36af83 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,15 @@ Ansible Utils Collection Release Notes .. contents:: Topics + +v2.6.0 +====== + +Minor Changes +------------- + +- 'consolidate' filter plugin added. + v2.5.2 ====== @@ -56,27 +65,12 @@ Documentation Changes v2.4.3 ====== -Release Summary ---------------- - -- Rereleased 2.4.2 with fix of network ee tests. - v2.4.2 ====== -Release Summary ---------------- - -- Rereleased 2.4.1 with valid requirement.txt. - v2.4.1 ====== -Release Summary ---------------- - -- Rereleased 2.4.0 with trivial changes. - v2.4.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 45f74bc..0733618 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -175,8 +175,8 @@ releases: release_summary: - Rereleased 2.4.2 with fix of network ee tests. fragments: - - 2.4.3.yaml - - fix_network_ee.yaml + - 2.4.3.yaml + - fix_network_ee.yaml release_date: '2021-12-07' 2.5.0: changes: @@ -241,3 +241,14 @@ releases: fragments: - bugfix_ipaddr_filter.yaml release_date: '2022-03-04' + 2.6.0: + changes: + minor_changes: + - '''consolidate'' filter plugin added.' + fragments: + - 0-ignore.yml + - consolidate_filter_plugin.yml + - enable_upgrade_black.yml + - pre-commit-enable.yml + - pre-commit-skip.yml + release_date: '2022-04-12' diff --git a/changelogs/fragments/0-ignore.yml b/changelogs/fragments/0-ignore.yml deleted file mode 100644 index ec804d2..0000000 --- a/changelogs/fragments/0-ignore.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -trivial: - - Copy ignore.txt. diff --git a/changelogs/fragments/consolidate_filter_plugin.yml b/changelogs/fragments/consolidate_filter_plugin.yml deleted file mode 100644 index 66e016c..0000000 --- a/changelogs/fragments/consolidate_filter_plugin.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -minor_changes: - - "'consolidate' filter plugin added." diff --git a/changelogs/fragments/enable_upgrade_black.yml b/changelogs/fragments/enable_upgrade_black.yml deleted file mode 100644 index fe6fc5f..0000000 --- a/changelogs/fragments/enable_upgrade_black.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -trivial: - - Enable black via pre-commit.ci - - Update black version to latest diff --git a/changelogs/fragments/pre-commit-enable.yml b/changelogs/fragments/pre-commit-enable.yml deleted file mode 100644 index d2a37f2..0000000 --- a/changelogs/fragments/pre-commit-enable.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -trivial: - - Enable pre-commit.ci end-of-file-fixer - - Enable pre-commit-ci trailing-whitespace diff --git a/changelogs/fragments/pre-commit-skip.yml b/changelogs/fragments/pre-commit-skip.yml deleted file mode 100644 index efe85b1..0000000 --- a/changelogs/fragments/pre-commit-skip.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -trivial: - - Exempt update-docs from pre-commit.ci - - Disable black temporarily until it can be upgraded - - Disable end-of-file-fixer - - Disable trailing-whitespace From e8817b7b45a083f56fc0af0fc557788742e297e2 Mon Sep 17 00:00:00 2001 From: KB-perByte Date: Tue, 12 Apr 2022 12:03:54 +0530 Subject: [PATCH 2/2] release prep --- CHANGELOG.rst | 15 +++++++++++++++ changelogs/changelog.yaml | 9 +++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c36af83..aafc988 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -65,12 +65,27 @@ Documentation Changes v2.4.3 ====== +Release Summary +--------------- + +Rereleased 2.4.2 with fix of network ee tests. + v2.4.2 ====== +Release Summary +--------------- + +Rereleased 2.4.1 with valid requirement.txt. + v2.4.1 ====== +Release Summary +--------------- + +Rereleased 2.4.0 with trivial changes. + v2.4.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 0733618..1eb13ae 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -155,16 +155,14 @@ releases: release_date: '2021-08-28' 2.4.1: changes: - release_summary: - - Rereleased 2.4.0 with trivial changes. + release_summary: Rereleased 2.4.0 with trivial changes. fragments: - 2.4.1.yaml - fix_network_ee.yaml release_date: '2021-09-24' 2.4.2: changes: - release_summary: - - Rereleased 2.4.1 with valid requirement.txt. + release_summary: Rereleased 2.4.1 with valid requirement.txt. fragments: - 2.4.2.yaml - add_ignore_2.13.yaml @@ -172,8 +170,7 @@ releases: release_date: '2021-10-07' 2.4.3: changes: - release_summary: - - Rereleased 2.4.2 with fix of network ee tests. + release_summary: Rereleased 2.4.2 with fix of network ee tests. fragments: - 2.4.3.yaml - fix_network_ee.yaml