diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 94654cbb..5d3076f4 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.23" + ref: "3.24" - 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_23" + id: "create_pr_3_24" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.23" - branch: "update-ci/3.23" - base: "3.23" + title: "Update CI files for branch 3.24" + branch: "update-ci/3.24" + base: "3.24" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_23.outputs.pull-request-number }}" - if: "steps.create_pr_3_23.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_24.outputs.pull-request-number }}" + if: "steps.create_pr_3_24.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/1054.feature b/CHANGES/1054.feature deleted file mode 100644 index 143a07b7..00000000 --- a/CHANGES/1054.feature +++ /dev/null @@ -1 +0,0 @@ -Added data-requires-python to Simple HTML API. diff --git a/CHANGES/1067.bugfix b/CHANGES/1067.bugfix deleted file mode 100644 index aba16d9d..00000000 --- a/CHANGES/1067.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed migration error in 0019_create_missing_metadata_artifacts. diff --git a/CHANGES/997.feature b/CHANGES/997.feature deleted file mode 100644 index 44e97f40..00000000 --- a/CHANGES/997.feature +++ /dev/null @@ -1 +0,0 @@ -Added core metadata to Simple API (PEP 714) diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index 5c61b640..8744bc78 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.24.0.dev" + version = "3.25.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 37107873..acae176b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.24.0.dev" +version = "3.25.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.24.0.dev" +current_version = "3.25.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 8f0ace8b..92d4e5f2 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.23' +latest_release_branch: '3.24' lint_requirements: true os_required_packages: [] parallel_test_workers: 8