diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index c7898301..e804255c 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.17" + ref: "3.18" - 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_17" + id: "create_pr_3_18" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.17" - branch: "update-ci/3.17" - base: "3.17" + title: "Update CI files for branch 3.18" + branch: "update-ci/3.18" + base: "3.18" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_17.outputs.pull-request-number }}" - if: "steps.create_pr_3_17.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_18.outputs.pull-request-number }}" + if: "steps.create_pr_3_18.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+3.85-compat.feature b/CHANGES/+3.85-compat.feature deleted file mode 100644 index a5a08e2e..00000000 --- a/CHANGES/+3.85-compat.feature +++ /dev/null @@ -1 +0,0 @@ -Bump pulpcore upperbound to <3.100. pulp_python is now a Python >=3.11 project. diff --git a/CHANGES/927.doc b/CHANGES/927.doc deleted file mode 100644 index 21e99e17..00000000 --- a/CHANGES/927.doc +++ /dev/null @@ -1 +0,0 @@ -Updated docs for adding/removing repository content to handle duplicate filenames. diff --git a/CHANGES/929.bugfix b/CHANGES/929.bugfix deleted file mode 100644 index fb49d5e5..00000000 --- a/CHANGES/929.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed PYTHON_GROUP_UPLOADS failing when domains are turned on. \ No newline at end of file diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index c727d38b..6cee7db9 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.18.0.dev" + version = "3.19.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index e82983ce..9af9375a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.18.0.dev" +version = "3.19.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.18.0.dev" +current_version = "3.19.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 217abf83..2b8b90d6 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.17' +latest_release_branch: '3.18' lint_requirements: true os_required_packages: [] parallel_test_workers: 8