From e2bf6c7c6a4999be1480e91989d6be20d437d213 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 12 Nov 2024 19:26:57 +0000 Subject: [PATCH] Bump minor version --- .bumpversion.cfg | 2 +- .github/template_gitref | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/5941.bugfix | 1 - CHANGES/5967.bugfix | 2 -- CHANGES/content-assert.bugfix | 1 - CHANGES/plugin_api/cache-key.feature | 2 -- pulp_certguard/app/__init__.py | 2 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- setup.py | 2 +- template_config.yml | 2 +- 12 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 CHANGES/5941.bugfix delete mode 100644 CHANGES/5967.bugfix delete mode 100644 CHANGES/content-assert.bugfix delete mode 100644 CHANGES/plugin_api/cache-key.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bb19753213..9f0ee60273 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.68.0.dev +current_version = 3.69.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 73f0df798b..3546645658 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-389-g444ab6c +unknown diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index a7b3b57854..8f7207a518 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -69,7 +69,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.67" + ref: "3.68" - name: "Run update" working-directory: "pulpcore" @@ -83,9 +83,9 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.67" - branch: "update-ci/3.67" - base: "3.67" + title: "Update CI files for branch 3.68" + branch: "update-ci/3.68" + base: "3.68" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/5941.bugfix b/CHANGES/5941.bugfix deleted file mode 100644 index 59b67b456e..0000000000 --- a/CHANGES/5941.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed incorrect count of waiting tasks in the queue for the `tasks_unblocked_queue` and `tasks_longest_unblocked_time` metrics. diff --git a/CHANGES/5967.bugfix b/CHANGES/5967.bugfix deleted file mode 100644 index ebc7f81bc8..0000000000 --- a/CHANGES/5967.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -On the content-app, added ClientConnectionError (aiohttp) as an exception that can trigger -a retry when streaming content from a Remote. diff --git a/CHANGES/content-assert.bugfix b/CHANGES/content-assert.bugfix deleted file mode 100644 index a562ce863f..0000000000 --- a/CHANGES/content-assert.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed an assertion on all content being added/removed in a repository version is of the same domain. diff --git a/CHANGES/plugin_api/cache-key.feature b/CHANGES/plugin_api/cache-key.feature deleted file mode 100644 index 6b92b9a960..0000000000 --- a/CHANGES/plugin_api/cache-key.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added `pulpcore.app.util.cache_key` to the plugin api. -Use this method to get the base-key when using the Pulp cache. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index fd2e774c83..b7dc5ef5f3 100644 --- a/pulp_certguard/app/__init__.py +++ b/pulp_certguard/app/__init__.py @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig): name = "pulp_certguard.app" label = "certguard" - version = "3.68.0.dev" + version = "3.69.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 7f4a63551f..d03685c1d2 100644 --- a/pulp_file/app/__init__.py +++ b/pulp_file/app/__init__.py @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig): name = "pulp_file.app" label = "file" - version = "3.68.0.dev" + version = "3.69.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 2d9f70ac61..a3f32540f4 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.68.0.dev" + version = "3.69.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index 87be108814..775b09879a 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.68.0.dev", + version="3.69.0.dev", description="Pulp Django Application and Related Modules", long_description=long_description, long_description_content_type="text/markdown", diff --git a/template_config.yml b/template_config.yml index 12e1ee23f9..d435334684 100644 --- a/template_config.yml +++ b/template_config.yml @@ -25,7 +25,7 @@ flake8: true flake8_ignore: - ./pulpcore/app/protobuf/* github_org: pulp -latest_release_branch: '3.67' +latest_release_branch: '3.68' lint_requirements: true os_required_packages: [] parallel_test_workers: 8