Bump master to 4.11.0dev + CHANGES cleanup

No-Issue
ansible · Sep 19, 2024 · 23926a1 · 23926a1
1 parent 9a404b5
commit 23926a1
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 33 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -2,23 +2,8 @@
 # to be looked at by PR author and reviewer to keep or remove
 # called by .github/workflows/labeler.yml
 
-backport-4.2:
-- galaxy_ng/app/**/*
-
-backport-4.4:
-- galaxy_ng/app/**/*
-
-backport-4.5:
-- galaxy_ng/app/**/*
-
-backport-4.6:
-- galaxy_ng/app/**/*
-
-backport-4.7:
-- galaxy_ng/app/**/*
-
-backport-4.8:
+backport-4.9:
 - galaxy_ng/app/**/*
 
-backport-4.9:
+backport-4.10:
 - galaxy_ng/app/**/*
diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
@@ -16,10 +16,8 @@ jobs:
       matrix:
         branch:
           - 'master'
-          - 'stable-4.6'
-          - 'stable-4.7'
-          - 'stable-4.8'
           - 'stable-4.9'
+          - 'stable-4.10'
 
     steps:
       - uses: actions/checkout@v4

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,25 @@
+## 4.10.0 (2024-09-19) {: #4.10.0 }
+
+#### Bugfixes
+
+- Support SVG avatar image on namespaces
+  [#2836](https://github.com/ansible/galaxy_ng/issues/2836)
+- Fixed issue where group members were also showing up as users in the Namespace owners list.
+  [#3121](https://github.com/ansible/galaxy_ng/issues/3121)
+- Parameterize ansible-test importer resource requirements
+  [#3190](https://github.com/ansible/galaxy_ng/issues/3190)
+
+#### Improved Documentation
+
+- echo "add skeleton for galaxy_collection docs"
+  [#2420](https://github.com/ansible/galaxy_ng/issues/2420)
+
+#### Misc
+
+- [#2822](https://github.com/ansible/galaxy_ng/issues/2822), [#3036](https://github.com/ansible/galaxy_ng/issues/3036), [#3064](https://github.com/ansible/galaxy_ng/issues/3064), [#3358](https://github.com/ansible/galaxy_ng/issues/3358), [#18825](https://github.com/ansible/galaxy_ng/issues/18825)
+
+---
+
 =========
 Changelog
 =========

diff --git a/CHANGES/.TEMPLATE.md b/CHANGES/.TEMPLATE.md
@@ -0,0 +1,39 @@
+{# TOWNCRIER TEMPLATE #}
+{% for section, _ in sections.items() %}
+{%- set section_slug = "-" + section|replace(" ", "-")|replace("_", "-")|lower %}
+{%- if section %}
+
+### {{section}} {: #{{versiondata.version}}{{section_slug}} }
+{% else %}
+{%- set section_slug = "" %}
+{% endif %}
+{% if sections[section] %}
+{% for category, val in definitions.items() if category in sections[section]%}
+
+#### {{ definitions[category]['name'] }} {: #{{versiondata.version}}{{section_slug}}-{{category}} }
+
+{% if definitions[category]['showcontent'] %}
+{% for text, values in sections[section][category].items() %}
+- {{ text }}
+{% if values %}
+  {{ values|join(',\n  ') }}
+{% endif %}
+{% endfor %}
+{% else %}
+- {{ sections[section][category]['']|join(', ') }}
+{% endif %}
+{% if sections[section][category]|length == 0 %}
+
+No significant changes.
+{% else %}
+{% endif %}
+{% endfor %}
+{% else %}
+
+No significant changes.
+{% endif %}
+{% endfor %}
+
+---
+
+
diff --git a/CHANGES/18825.misc b/CHANGES/18825.misc
diff --git a/CHANGES/2420.doc b/CHANGES/2420.doc
diff --git a/CHANGES/2822.misc b/CHANGES/2822.misc
diff --git a/CHANGES/2836.bugfix b/CHANGES/2836.bugfix
diff --git a/CHANGES/3036.misc b/CHANGES/3036.misc
diff --git a/CHANGES/3064.misc b/CHANGES/3064.misc
diff --git a/CHANGES/3121.bugfix b/CHANGES/3121.bugfix
diff --git a/CHANGES/3190.bugfix b/CHANGES/3190.bugfix
diff --git a/CHANGES/3358.misc b/CHANGES/3358.misc
diff --git a/galaxy_ng/__init__.py b/galaxy_ng/__init__.py
@@ -3,6 +3,6 @@
 
 sys.modules.setdefault("automated_logging", automated_logging)
 
-__version__ = "4.10.0dev"
+__version__ = "4.11.0dev"
 
 default_app_config = "galaxy_ng.app.PulpGalaxyPluginAppConfig"
diff --git a/galaxy_ng/app/__init__.py b/galaxy_ng/app/__init__.py
@@ -10,7 +10,7 @@ class PulpGalaxyPluginAppConfig(PulpPluginAppConfig):
 
     name = "galaxy_ng.app"
     label = "galaxy"
-    version = "4.10.0dev"
+    version = "4.11.0dev"
     python_package_name = "galaxy-ng"
 
     def ready(self):

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.10.0dev
+current_version = 4.11.0dev
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+))?((?P<build>\d+))?

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 from setuptools.command.sdist import sdist as _SDistCommand
 
 package_name = os.environ.get("GALAXY_NG_ALTERNATE_NAME", "galaxy-ng")
-version = "4.10.0dev"
+version = "4.11.0dev"
 
 
 class PrepareStaticCommand(Command):