From 0cea6ff4c81e5e6405ba86d0d9f03204f0427605 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Mon, 6 May 2024 13:16:27 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/template_gitref | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/+docs-ci.misc | 1 - CHANGES/1288.feature | 3 --- CHANGES/1537.removal | 1 - CHANGES/1561.bugfix | 1 - CHANGES/1573.bugfix | 1 - CHANGES/1575.bugfix | 1 - CHANGES/1577.bugfix | 1 - CHANGES/1605.bugfix | 2 -- docs/conf.py | 4 ++-- pulp_container/app/__init__.py | 2 +- setup.py | 2 +- template_config.yml | 4 ++-- 15 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 CHANGES/+docs-ci.misc delete mode 100644 CHANGES/1288.feature delete mode 100644 CHANGES/1537.removal delete mode 100644 CHANGES/1561.bugfix delete mode 100644 CHANGES/1573.bugfix delete mode 100644 CHANGES/1575.bugfix delete mode 100644 CHANGES/1577.bugfix delete mode 100644 CHANGES/1605.bugfix diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 69c616099..ad8097fe8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.20.0.dev +current_version = 2.21.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/template_gitref b/.github/template_gitref index 2f00223c7..73af4150d 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-328-g59a6718 +2021.08.26-329-g63d3740 diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 4a2d299e6..59ee50ca7 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,7 +74,7 @@ jobs: with: fetch-depth: 0 path: "pulp_container" - ref: "2.19" + ref: "2.20" - name: "Run update" working-directory: "pulp_container" @@ -88,10 +88,10 @@ jobs: path: "pulp_container" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 2.19" + title: "Update CI files for branch 2.20" body: "" - branch: "update-ci/2.19" - base: "2.19" + branch: "update-ci/2.20" + base: "2.20" commit-message: | Update CI files diff --git a/CHANGES/+docs-ci.misc b/CHANGES/+docs-ci.misc deleted file mode 100644 index 91a157185..000000000 --- a/CHANGES/+docs-ci.misc +++ /dev/null @@ -1 +0,0 @@ -Added the Unified Docs CI build-check on PRs. diff --git a/CHANGES/1288.feature b/CHANGES/1288.feature deleted file mode 100644 index c92347bf7..000000000 --- a/CHANGES/1288.feature +++ /dev/null @@ -1,3 +0,0 @@ -Updated the Manifest model to no longer rely on artifacts, storing all manifest data internally -within the database. This change dissociates the manifest from external files on the storage -backend. diff --git a/CHANGES/1537.removal b/CHANGES/1537.removal deleted file mode 100644 index 8b5118ed8..000000000 --- a/CHANGES/1537.removal +++ /dev/null @@ -1 +0,0 @@ -Removed the deprecated `ADDITIONAL_OCI_ARTIFACT_TYPES` setting. diff --git a/CHANGES/1561.bugfix b/CHANGES/1561.bugfix deleted file mode 100644 index f27cc207e..000000000 --- a/CHANGES/1561.bugfix +++ /dev/null @@ -1 +0,0 @@ -Resolved circular import errors raised when using pulp-container as a library. diff --git a/CHANGES/1573.bugfix b/CHANGES/1573.bugfix deleted file mode 100644 index 5fda354f0..000000000 --- a/CHANGES/1573.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed hande-image-data command to skip content that has labels/annotations already populated. diff --git a/CHANGES/1575.bugfix b/CHANGES/1575.bugfix deleted file mode 100644 index 15e1bc985..000000000 --- a/CHANGES/1575.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed handle-image-data command to update all entries in one run. diff --git a/CHANGES/1577.bugfix b/CHANGES/1577.bugfix deleted file mode 100644 index effd11439..000000000 --- a/CHANGES/1577.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed a bug that disallowed users from leveraging the remote authentication. diff --git a/CHANGES/1605.bugfix b/CHANGES/1605.bugfix deleted file mode 100644 index 564466c4f..000000000 --- a/CHANGES/1605.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed a bug that caused the registry to not accept requests from anonymous users when token -authentication was disabled. diff --git a/docs/conf.py b/docs/conf.py index 0a6b49f43..9ad504199 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,9 +73,9 @@ # built documents. # # The short X.Y version. -version = "2.20.0.dev" +version = "2.21.0.dev" # The full version, including alpha/beta/rc tags. -release = "2.20.0.dev" +release = "2.21.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py index 16ee11ba4..669f62a21 100644 --- a/pulp_container/app/__init__.py +++ b/pulp_container/app/__init__.py @@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig): name = "pulp_container.app" label = "container" - version = "2.20.0.dev" + version = "2.21.0.dev" python_package_name = "pulp-container" def ready(self): diff --git a/setup.py b/setup.py index 271966368..cf10cce67 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-container", - version="2.20.0.dev", + version="2.21.0.dev", description="Container plugin for the Pulp Project", long_description=long_description, license="GPLv2+", diff --git a/template_config.yml b/template_config.yml index 5c0f104cc..c7a1a979e 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@2021.08.26-326-ge5addc7 +# generated with plugin_template@2021.08.26-329-g63d3740 api_root: /pulp/ black: true @@ -29,7 +29,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: true -latest_release_branch: '2.19' +latest_release_branch: '2.20' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8