From 833f1b313d73392d8904ff0d11138fd93f6cf3c6 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Mon, 4 Apr 2022 13:28:42 +0200 Subject: [PATCH] Release 4.3.4 (#1193) * setup.cfg: remove '.travis/VERSION' reference removed in #1129, it's stopping `make dev/bumpversion-patch` from working * Release 4.3.4 No-Issue * update AAH-840 CHANGES text --- CHANGES.rst | 13 +++++++++++++ CHANGES/1349.bugfix | 1 - CHANGES/840.bugfix | 1 - galaxy_ng/__init__.py | 2 +- galaxy_ng/app/__init__.py | 2 +- setup.cfg | 6 +----- setup.py | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 CHANGES/1349.bugfix delete mode 100644 CHANGES/840.bugfix diff --git a/CHANGES.rst b/CHANGES.rst index 0c3cdaf14c..18363fad0b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -13,6 +13,19 @@ Changelog .. towncrier release notes start +4.3.4 (2022-04-01) +Bugfixes +-------- + +- Update to pulp_ansible 0.7.4 to backport AAH-840 bugfix, which did not resolve the issue for 4.3. + `AAH-840 `_ +- Combine the copy and remove tasks + `AAH-1349 `_ + + +---- + + 4.3.3 (2021-09-16) ================== diff --git a/CHANGES/1349.bugfix b/CHANGES/1349.bugfix deleted file mode 100644 index 9fe976d000..0000000000 --- a/CHANGES/1349.bugfix +++ /dev/null @@ -1 +0,0 @@ -Combine the copy and remove tasks diff --git a/CHANGES/840.bugfix b/CHANGES/840.bugfix deleted file mode 100644 index f3e51535d8..0000000000 --- a/CHANGES/840.bugfix +++ /dev/null @@ -1 +0,0 @@ -Consume proxy authentication fix in pulp_ansible 0.7.4 \ No newline at end of file diff --git a/galaxy_ng/__init__.py b/galaxy_ng/__init__.py index 66c7b393d4..54205efbc1 100644 --- a/galaxy_ng/__init__.py +++ b/galaxy_ng/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.3.3" +__version__ = "4.3.4" default_app_config = "galaxy_ng.app.PulpGalaxyPluginAppConfig" diff --git a/galaxy_ng/app/__init__.py b/galaxy_ng/app/__init__.py index 9608d402e6..a33762da4c 100644 --- a/galaxy_ng/app/__init__.py +++ b/galaxy_ng/app/__init__.py @@ -8,7 +8,7 @@ class PulpGalaxyPluginAppConfig(PulpPluginAppConfig): name = "galaxy_ng.app" label = "galaxy" - version = "4.3.3" + version = "4.3.4" def ready(self): super().ready() diff --git a/setup.cfg b/setup.cfg index 6d334b526c..0f5a5685bf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.3.3 +current_version = 4.3.4 commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+))?((?P\d+))? @@ -31,7 +31,3 @@ replace = version = "{new_version}" [bumpversion:file:./galaxy_ng/__init__.py] search = __version__ = "{current_version}" replace = __version__ = "{new_version}" - -[bumpversion:file:.travis/VERSION] -search = {current_version} -replace = {new_version} diff --git a/setup.py b/setup.py index f838b95302..479a927816 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools.command.sdist import sdist as _SDistCommand package_name = os.environ.get("GALAXY_NG_ALTERNATE_NAME", "galaxy-ng") -version = "4.3.3" +version = "4.3.4" class PrepareStaticCommand(Command):