diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index b9d9cfee..6f8453b5 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -202,7 +202,7 @@ jobs: with: fetch-depth: 0 path: "pulp_python" - ref: "3.19" + ref: "3.20" - name: "Run update" working-directory: "pulp_python" @@ -211,21 +211,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v6" - id: "create_pr_3_19" + id: "create_pr_3_20" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.19" - branch: "update-ci/3.19" - base: "3.19" + title: "Update CI files for branch 3.20" + branch: "update-ci/3.20" + base: "3.20" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_19.outputs.pull-request-number }}" - if: "steps.create_pr_3_19.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_20.outputs.pull-request-number }}" + if: "steps.create_pr_3_20.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/625.feature b/CHANGES/625.feature deleted file mode 100644 index 38928e60..00000000 --- a/CHANGES/625.feature +++ /dev/null @@ -1 +0,0 @@ -Added JSON-based Simple API (PEP 691). diff --git a/CHANGES/907.bugfix b/CHANGES/907.bugfix deleted file mode 100644 index 4e380f3e..00000000 --- a/CHANGES/907.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed publication error when package's dists contain differing versions of its name. diff --git a/CHANGES/972.feature b/CHANGES/972.feature deleted file mode 100644 index 4cdc5a7f..00000000 --- a/CHANGES/972.feature +++ /dev/null @@ -1 +0,0 @@ -Updated tasks to always return JSON-serializable value. diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index c3f44e8f..28156f1a 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.20.0.dev" + version = "3.21.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 476ab845..e5244146 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.20.0.dev" +version = "3.21.0.dev" description = "pulp-python plugin for the Pulp Project" readme = "README.md" authors = [ @@ -76,7 +76,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.20.0.dev" +current_version = "3.21.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 23e4e851..6ade258b 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.19' +latest_release_branch: '3.20' lint_requirements: true os_required_packages: [] parallel_test_workers: 8