diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 4a496942..6a3e2db7 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -200,7 +200,7 @@ jobs: with: fetch-depth: 0 path: "pulp_python" - ref: "3.28" + ref: "3.29" - name: "Run update" working-directory: "pulp_python" @@ -209,21 +209,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_3_28" + id: "create_pr_3_29" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.28" - branch: "update-ci/3.28" - base: "3.28" + title: "Update CI files for branch 3.29" + branch: "update-ci/3.29" + base: "3.29" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_28.outputs.pull-request-number }}" - if: "steps.create_pr_3_28.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_29.outputs.pull-request-number }}" + if: "steps.create_pr_3_29.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+atomic-replication-support.bugfix b/CHANGES/+atomic-replication-support.bugfix deleted file mode 100644 index 6795fafd..00000000 --- a/CHANGES/+atomic-replication-support.bugfix +++ /dev/null @@ -1 +0,0 @@ -Support "atomic" replications in pulpcore 3.107 diff --git a/CHANGES/1166.feature b/CHANGES/1166.feature deleted file mode 100644 index 5909a2f3..00000000 --- a/CHANGES/1166.feature +++ /dev/null @@ -1 +0,0 @@ -Added repository-specific package blocklist. diff --git a/CHANGES/1188.bugfix b/CHANGES/1188.bugfix deleted file mode 100644 index 4d4e0a88..00000000 --- a/CHANGES/1188.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed "Worker has gone missing" errors during repair_metadata on large repositories (1000+ packages) by reducing peak memory consumption. diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index 9c430387..b0427056 100644 --- a/pulp_python/app/__init__.py +++ b/pulp_python/app/__init__.py @@ -10,7 +10,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig): name = "pulp_python.app" label = "python" - version = "3.29.0.dev" + version = "3.30.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index a96630c2..2fe313e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.29.0.dev" +version = "3.30.0.dev" description = "pulp-python plugin for the Pulp Project" readme = "README.md" authors = [ @@ -79,7 +79,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.29.0.dev" +current_version = "3.30.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 8a0a4482..2b0408f3 100644 --- a/template_config.yml +++ b/template_config.yml @@ -26,7 +26,7 @@ extra_files: [] flake8: true flake8_ignore: [] github_org: "pulp" -latest_release_branch: "3.28" +latest_release_branch: "3.29" lint_requirements: true os_required_packages: [] parallel_test_workers: 8