From bdde1b9699d1f9be6285675853c65a05341491a5 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Thu, 8 Jan 2026 17:05:20 +0000 Subject: [PATCH] Bump minor version --- .github/workflows/update_ci.yml | 31 +++++++++++++++++++++++++++++ CHANGES/+add-missing-migration.misc | 2 -- CHANGES/+distribution_create.bugfix | 1 - CHANGES/+import_export_fix.bugfix | 1 - CHANGES/+pulpcore_3_100.feature | 1 - CHANGES/+replicate-dist-data.bugfix | 1 - CHANGES/+sync_result.bugfix | 1 - CHANGES/2044.bugfix | 1 - CHANGES/2081.bugfix | 1 - CHANGES/2122.bugfix | 1 - pulp_container/app/__init__.py | 2 +- pyproject.toml | 4 ++-- template_config.yml | 3 ++- 13 files changed, 36 insertions(+), 14 deletions(-) delete mode 100644 CHANGES/+add-missing-migration.misc delete mode 100644 CHANGES/+distribution_create.bugfix delete mode 100644 CHANGES/+import_export_fix.bugfix delete mode 100644 CHANGES/+pulpcore_3_100.feature delete mode 100644 CHANGES/+replicate-dist-data.bugfix delete mode 100644 CHANGES/+sync_result.bugfix delete mode 100644 CHANGES/2044.bugfix delete mode 100644 CHANGES/2081.bugfix delete mode 100644 CHANGES/2122.bugfix diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index c7aea8627..e5d0fd1c9 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -260,4 +260,35 @@ jobs: env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true + - uses: "actions/checkout@v4" + with: + fetch-depth: 0 + path: "pulp_container" + ref: "2.27" + + - name: "Run update" + working-directory: "pulp_container" + run: | + ../plugin_template/scripts/update_ci.sh --release + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v6" + id: "create_pr_2_27" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_container" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 2.27" + branch: "update-ci/2.27" + base: "2.27" + delete-branch: true + - name: "Mark PR automerge" + working-directory: "pulp_container" + run: | + gh pr merge --rebase --auto "${{ steps.create_pr_2_27.outputs.pull-request-number }}" + if: "steps.create_pr_2_27.outputs.pull-request-number" + env: + GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" + continue-on-error: true ... diff --git a/CHANGES/+add-missing-migration.misc b/CHANGES/+add-missing-migration.misc deleted file mode 100644 index 0bb9638db..000000000 --- a/CHANGES/+add-missing-migration.misc +++ /dev/null @@ -1,2 +0,0 @@ -Added a migration with the `through_fields` for Manifest model, which was ignored by the pre-django-5 migration autotedectors. -Reference [here](https://code.djangoproject.com/ticket/36061). diff --git a/CHANGES/+distribution_create.bugfix b/CHANGES/+distribution_create.bugfix deleted file mode 100644 index 46a2e72b7..000000000 --- a/CHANGES/+distribution_create.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed a bug on distribution create that failed to serialize the full registry path in the task context. diff --git a/CHANGES/+import_export_fix.bugfix b/CHANGES/+import_export_fix.bugfix deleted file mode 100644 index 32b492b66..000000000 --- a/CHANGES/+import_export_fix.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed import/export code to work under django-import-export-4.x. diff --git a/CHANGES/+pulpcore_3_100.feature b/CHANGES/+pulpcore_3_100.feature deleted file mode 100644 index 0ae9a2ff3..000000000 --- a/CHANGES/+pulpcore_3_100.feature +++ /dev/null @@ -1 +0,0 @@ -Bump pulpcore upperbound to <3.115. diff --git a/CHANGES/+replicate-dist-data.bugfix b/CHANGES/+replicate-dist-data.bugfix deleted file mode 100644 index 8222a7707..000000000 --- a/CHANGES/+replicate-dist-data.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed a replicate issue failing to create the distributions when using pulpcore>=3.70 diff --git a/CHANGES/+sync_result.bugfix b/CHANGES/+sync_result.bugfix deleted file mode 100644 index 7015c5d3f..000000000 --- a/CHANGES/+sync_result.bugfix +++ /dev/null @@ -1 +0,0 @@ -Allow sync and build tasks to properly return the created repository_version (depends on pulpcore to support task results). diff --git a/CHANGES/2044.bugfix b/CHANGES/2044.bugfix deleted file mode 100644 index fbcf33281..000000000 --- a/CHANGES/2044.bugfix +++ /dev/null @@ -1 +0,0 @@ -Added a deployment check to produce a better error message when pulp_file missing from `ENABLED_PLUGINS`. diff --git a/CHANGES/2081.bugfix b/CHANGES/2081.bugfix deleted file mode 100644 index 8b1191975..000000000 --- a/CHANGES/2081.bugfix +++ /dev/null @@ -1 +0,0 @@ -Modified the sync upload API to buffer the image layers in chunks, reducing memory usage. diff --git a/CHANGES/2122.bugfix b/CHANGES/2122.bugfix deleted file mode 100644 index ab8ce4489..000000000 --- a/CHANGES/2122.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix an `AttributeError` issue that most commonly appears when running the `container-handle-image-data` management command. \ No newline at end of file diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py index 1ef9899df..eee24b2e6 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.27.0.dev" + version = "2.28.0.dev" python_package_name = "pulp-container" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index f25ab064f..c3a3712b5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-container" -version = "2.27.0.dev" +version = "2.28.0.dev" description = "Container plugin for the Pulp Project" readme = "README.md" authors = [ @@ -86,7 +86,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "2.27.0.dev" +current_version = "2.28.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 5a93c2b30..dc20d4927 100644 --- a/template_config.yml +++ b/template_config.yml @@ -24,7 +24,7 @@ extra_files: [] flake8: true flake8_ignore: [] github_org: pulp -latest_release_branch: '2.26' +latest_release_branch: '2.27' lint_requirements: true os_required_packages: [] parallel_test_workers: 8 @@ -118,3 +118,4 @@ test_performance: false test_reroute: true test_s3: true use_issue_template: true +