diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index c8897100f9a..454055afd74 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -107,7 +107,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.112" + ref: "3.113" - name: "Run update" working-directory: "pulpcore" @@ -116,21 +116,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_3_112" + id: "create_pr_3_113" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.112" - branch: "update-ci/3.112" - base: "3.112" + title: "Update CI files for branch 3.113" + branch: "update-ci/3.113" + base: "3.113" delete-branch: true - name: "Mark PR automerge" working-directory: "pulpcore" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_112.outputs.pull-request-number }}" - if: "steps.create_pr_3_112.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_113.outputs.pull-request-number }}" + if: "steps.create_pr_3_113.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+fix-role-race-condition.bugfix b/CHANGES/+fix-role-race-condition.bugfix deleted file mode 100644 index d1520423f24..00000000000 --- a/CHANGES/+fix-role-race-condition.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed `adjust_roles` to use `update_or_create` instead of `get_or_create` when populating locked roles, so that a pre-existing role with `locked=False` is updated rather than causing a duplicate key error. diff --git a/CHANGES/7558.bugfix b/CHANGES/7558.bugfix deleted file mode 100644 index 6b8310128e0..00000000000 --- a/CHANGES/7558.bugfix +++ /dev/null @@ -1 +0,0 @@ -Optimized `QueryExistingArtifacts` by reducing database queries. diff --git a/CHANGES/7614.bugfix b/CHANGES/7614.bugfix deleted file mode 100644 index 76c6a968f15..00000000000 --- a/CHANGES/7614.bugfix +++ /dev/null @@ -1,5 +0,0 @@ -Replication now reuses existing distributions matched by base_path when a name -lookup misses (e.g. upstream rename), preventing base_path uniqueness conflicts -and preserving content continuity. Stale distributions are also cleaned up -before new distributions are created as an additional safeguard. Improved error -reporting in finalize_replication to include details about which subtasks failed. diff --git a/CHANGES/7617.feature b/CHANGES/7617.feature deleted file mode 100644 index 887235a1229..00000000000 --- a/CHANGES/7617.feature +++ /dev/null @@ -1 +0,0 @@ -Added support for passing ``q_select`` as a parameter to the replicate action, allowing users to selectively sync a subset of upstream distributions without modifying the stored upstream-pulp configuration. diff --git a/CHANGES/7677.bugfix b/CHANGES/7677.bugfix deleted file mode 100644 index ecedf6c8d6d..00000000000 --- a/CHANGES/7677.bugfix +++ /dev/null @@ -1 +0,0 @@ -Allow nested downloader_config to be passed json stringified. diff --git a/CHANGES/plugin_api/+expose-cancel-task.feature b/CHANGES/plugin_api/+expose-cancel-task.feature deleted file mode 100644 index f29830ae04d..00000000000 --- a/CHANGES/plugin_api/+expose-cancel-task.feature +++ /dev/null @@ -1 +0,0 @@ -Exposed ``cancel_task`` and ``cancel_task_group`` from ``pulpcore.plugin.tasking`` so plugins can import them. diff --git a/CHANGES/plugin_api/+expose-stable-ordering-filter.feature b/CHANGES/plugin_api/+expose-stable-ordering-filter.feature deleted file mode 100644 index 40e47528480..00000000000 --- a/CHANGES/plugin_api/+expose-stable-ordering-filter.feature +++ /dev/null @@ -1 +0,0 @@ -Exposed ``StableOrderingFilter`` in the plugin API so pulp plugins can import it from ``pulpcore.plugin``. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index e8bd8adc0a5..652547af8da 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.113.0.dev" + version = "3.114.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 84656e3b2f2..3c8fba83dcf 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.113.0.dev" + version = "3.114.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index bed2a3a8c0b..69cbc13a121 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -237,7 +237,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.113.0.dev" + version = "3.114.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/pyproject.toml b/pyproject.toml index 615c7c9e6d3..efcd69f2da9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulpcore" -version = "3.113.0.dev" +version = "3.114.0.dev" description = "Pulp Django Application and Related Modules" readme = "README.md" authors = [ @@ -207,7 +207,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.113.0.dev" +current_version = "3.114.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 59214543f28..6f8fae1569c 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.112" +latest_release_branch: "3.113" lint_ignore: - "./pulpcore/app/protobuf/*" lint_requirements: true