From 3b465b6f3acbafb6ac0fc54ae450971bc78e2036 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 29 Sep 2026 14:16:06 +0000 Subject: [PATCH] Bump minor version --- .github/workflows/update_ci.yml | 14 +++++++------- CHANGES/+file_url_sanitation.bugfix | 1 - CHANGES/+fix_pytest_long_running.bugfix | 3 --- CHANGES/+workload-identity.feature | 1 - CHANGES/1995.bugfix | 2 -- pulp_certguard/app/__init__.py | 2 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- pyproject.toml | 4 ++-- template_config.yml | 2 +- 10 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 CHANGES/+file_url_sanitation.bugfix delete mode 100644 CHANGES/+fix_pytest_long_running.bugfix delete mode 100644 CHANGES/+workload-identity.feature delete mode 100644 CHANGES/1995.bugfix diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 9bc122823e4..770f1f95fb7 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -145,7 +145,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.119" + ref: "3.120" - name: "Run update" working-directory: "pulpcore" @@ -154,21 +154,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_3_119" + id: "create_pr_3_120" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.119" - branch: "update-ci/3.119" - base: "3.119" + title: "Update CI files for branch 3.120" + branch: "update-ci/3.120" + base: "3.120" delete-branch: true - name: "Mark PR automerge" working-directory: "pulpcore" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_119.outputs.pull-request-number }}" - if: "steps.create_pr_3_119.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_120.outputs.pull-request-number }}" + if: "steps.create_pr_3_120.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+file_url_sanitation.bugfix b/CHANGES/+file_url_sanitation.bugfix deleted file mode 100644 index 43b2827dcb7..00000000000 --- a/CHANGES/+file_url_sanitation.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed file downloader path sanitation. CVE-2026-90959 diff --git a/CHANGES/+fix_pytest_long_running.bugfix b/CHANGES/+fix_pytest_long_running.bugfix deleted file mode 100644 index 0a8f0f32af2..00000000000 --- a/CHANGES/+fix_pytest_long_running.bugfix +++ /dev/null @@ -1,3 +0,0 @@ -Fixed the `long_running` pytest-mark, so that it correctly applies even when "nightly" -is selected. This includes fixing a window in the task-cleanup path, where a missing -worker's jobs were not getting cleaned up until a new task entered the system. diff --git a/CHANGES/+workload-identity.feature b/CHANGES/+workload-identity.feature deleted file mode 100644 index 44b88d45562..00000000000 --- a/CHANGES/+workload-identity.feature +++ /dev/null @@ -1 +0,0 @@ -Added workload identity authentication, so a CI job can authenticate with a short-lived OIDC token instead of a stored secret and receive per-request roles computed from the `WORKLOAD_IDENTITY` setting. diff --git a/CHANGES/1995.bugfix b/CHANGES/1995.bugfix deleted file mode 100644 index 25e41158073..00000000000 --- a/CHANGES/1995.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Improved the performance of the latest publication lookup when serving content -from a repository-backed distribution. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 82d71f57650..fac8ccb3685 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.120.0.dev" + version = "3.121.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index b23324aba29..28c5152dfc0 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.120.0.dev" + version = "3.121.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index bfa7b3b609c..4ae8e7e3aa9 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -238,7 +238,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.120.0.dev" + version = "3.121.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/pyproject.toml b/pyproject.toml index 3cd34453086..aa4e96acabb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulpcore" -version = "3.120.0.dev" +version = "3.121.0.dev" description = "Pulp Django Application and Related Modules" readme = "README.md" authors = [ @@ -208,7 +208,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.120.0.dev" +current_version = "3.121.0.dev" commit = false tag = false parse = "(?P\\d+)\\.(?P\\d+)\\.(?P0a)?(?P\\d+)(\\.(?P[a-z]+))?" diff --git a/template_config.yml b/template_config.yml index b7ea03f04b1..1c7861c7945 100644 --- a/template_config.yml +++ b/template_config.yml @@ -25,7 +25,7 @@ extra_files: - destination: "/etc/nginx/pulp/api_root_rewrite.conf" origin: "pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf" github_org: "pulp" -latest_release_branch: "3.119" +latest_release_branch: "3.120" lint_ignore: - "./pulpcore/app/protobuf/*" lint_requirements: true