From 35b90db233be2b1f072123148328956b59a5aba0 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 16 Sep 2024 17:55:48 +0200 Subject: [PATCH] DEV: Prepare new 3.3.2 version --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ NEWS.md | 18 +++++++++++++++++- debian/changelog | 6 ++++++ intelmq/lib/upgrades.py | 1 + intelmq/version.py | 2 +- 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5a7ac005..954a51188 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,39 @@ # CHANGELOG +3.3.2 (unreleased) +------------------ + +### Configuration + +### Core + +### Development + +### Data Format + +### Bots +#### Collectors + +#### Parsers + +#### Experts + +#### Outputs + +### Documentation + +### Packaging + +### Tests + +### Tools + +### Contrib + +### Known issues + + 3.3.1 (2024-09-03) ------------------ diff --git a/NEWS.md b/NEWS.md index 5e4d11609..6f79b6ea7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ @@ -10,6 +10,22 @@ This file lists all changes which have an affect on the administration of IntelM Please refer to the change log for a full list of changes. +3.3.2 Bugfix release (unreleased) +--------------------------------- + +### Requirements + +### Tools + +### Data Format + +### Configuration + +### Libraries + +### Postgres databases + + 3.3.1 Bugfix release (2024-09-03) --------------------------------- diff --git a/debian/changelog b/debian/changelog index cb29eaddd..dd2a37f36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +intelmq (3.3.2~alpha1-1) UNRELEASED; urgency=medium + + * Prepare 3.3.2 release + + -- Sebastian Wagner Mon, 16 Sep 2024 17:53:59 +0200 + intelmq (3.3.1-1) stable; urgency=medium * 3.3.1 Bugfix release diff --git a/intelmq/lib/upgrades.py b/intelmq/lib/upgrades.py index 067240a93..e93a33081 100644 --- a/intelmq/lib/upgrades.py +++ b/intelmq/lib/upgrades.py @@ -981,6 +981,7 @@ def v322_removed_feeds_and_bots(configuration, harmonization, dry_run, **kwargs) ((3, 2, 2), (v322_url_replacement, v322_removed_feeds_and_bots)), ((3, 3, 0), ()), ((3, 3, 1), ()), + ((3, 3, 2), ()), ]) ALWAYS = (harmonization,) diff --git a/intelmq/version.py b/intelmq/version.py index b86828f9c..ac8965d48 100644 --- a/intelmq/version.py +++ b/intelmq/version.py @@ -2,5 +2,5 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later -__version_info__ = (3, 3, 1,) +__version_info__ = (3, 3, 2, 'alpha1') __version__ = '.'.join(map(str, __version_info__))