diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 5d3076f4..1d1e1968 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -171,7 +171,7 @@ jobs: with: fetch-depth: 0 path: "pulp_python" - ref: "3.24" + ref: "3.25" - name: "Run update" working-directory: "pulp_python" @@ -180,21 +180,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v6" - id: "create_pr_3_24" + id: "create_pr_3_25" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.24" - branch: "update-ci/3.24" - base: "3.24" + title: "Update CI files for branch 3.25" + branch: "update-ci/3.25" + base: "3.25" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_24.outputs.pull-request-number }}" - if: "steps.create_pr_3_24.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_25.outputs.pull-request-number }}" + if: "steps.create_pr_3_25.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/1040.bugfix b/CHANGES/1040.bugfix deleted file mode 100644 index e06ea350..00000000 --- a/CHANGES/1040.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed pull-through caching failing for packages with bad names. diff --git a/CHANGES/1071.bugfix b/CHANGES/1071.bugfix deleted file mode 100644 index db75c0ee..00000000 --- a/CHANGES/1071.bugfix +++ /dev/null @@ -1 +0,0 @@ -Changed migration 19 to reset package's metadata_sha256 to null. This field will be fixed in a later release. diff --git a/CHANGES/1083.bugfix b/CHANGES/1083.bugfix deleted file mode 100644 index ac48c67b..00000000 --- a/CHANGES/1083.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed pull-through PEP 658 metadata not being served correctly for certain tools. diff --git a/CHANGES/1087.bugfix b/CHANGES/1087.bugfix deleted file mode 100644 index 15fac616..00000000 --- a/CHANGES/1087.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed pull-through PEP 658 metadata not being saved correctly with the package. diff --git a/CHANGES/1096.feature b/CHANGES/1096.feature deleted file mode 100644 index 6e354255..00000000 --- a/CHANGES/1096.feature +++ /dev/null @@ -1 +0,0 @@ -Added the `contains` filter to `name` and `author` fields for the Content endpoint. diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index 8744bc78..b15c8ce8 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.25.0.dev" + version = "3.26.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index acae176b..992aac8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.25.0.dev" +version = "3.26.0.dev" description = "pulp-python plugin for the Pulp Project" readme = "README.md" authors = [ @@ -77,7 +77,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.25.0.dev" +current_version = "3.26.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 92d4e5f2..cc9f597e 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: '3.24' +latest_release_branch: '3.25' lint_requirements: true os_required_packages: [] parallel_test_workers: 8