diff --git a/.github/template_gitref b/.github/template_gitref index 4630e6c4..35466456 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-421-g204a709 +unknown diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 46ceadfd..e3257e47 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -109,7 +109,7 @@ jobs: with: fetch-depth: 0 path: "pulp_python" - ref: "3.12" + ref: "3.13" - name: "Run update" working-directory: "pulp_python" @@ -118,21 +118,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v6" - id: "create_pr_3_12" + id: "create_pr_3_13" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.12" - branch: "update-ci/3.12" - base: "3.12" + title: "Update CI files for branch 3.13" + branch: "update-ci/3.13" + base: "3.13" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_12.outputs.pull-request-number }}" - if: "steps.create_pr_3_12.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_13.outputs.pull-request-number }}" + if: "steps.create_pr_3_13.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+fix-any-type.bugfix b/CHANGES/+fix-any-type.bugfix deleted file mode 100644 index 89ea25f5..00000000 --- a/CHANGES/+fix-any-type.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed the JSONField specification so it doesn't break ruby bindings. -See context [here](https://github.com/pulp/pulp_rpm/issues/3639). diff --git a/CHANGES/+pulpcore-3.70.feature b/CHANGES/+pulpcore-3.70.feature deleted file mode 100644 index b70054c1..00000000 --- a/CHANGES/+pulpcore-3.70.feature +++ /dev/null @@ -1 +0,0 @@ -Added pulpcore 3.70 compatibility diff --git a/CHANGES/682.bugfix b/CHANGES/682.bugfix deleted file mode 100644 index 4bf3e5b5..00000000 --- a/CHANGES/682.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed uploads not supporting packages using metadata spec 2.3 diff --git a/CHANGES/691.bugfix b/CHANGES/691.bugfix deleted file mode 100644 index 448af729..00000000 --- a/CHANGES/691.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed the `package_types` filter breaking other remote filters. diff --git a/CHANGES/716.bugfix b/CHANGES/716.bugfix deleted file mode 100644 index 344bbf23..00000000 --- a/CHANGES/716.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed package name normalization issue preventing syncing packages with "." or "_" in their names. diff --git a/CHANGES/718.bugfix b/CHANGES/718.bugfix deleted file mode 100644 index 6f546fee..00000000 --- a/CHANGES/718.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed replicate failing on upstream on-demand repositories diff --git a/CHANGES/773.bugfix b/CHANGES/773.bugfix deleted file mode 100644 index cc947f69..00000000 --- a/CHANGES/773.bugfix +++ /dev/null @@ -1,4 +0,0 @@ -Fixed `requires_python` field not being properly set on package upload. - -Run the new `pulpcore-manager repair-python-metadata` command with repositories containing affected -packages to repair their metadata. diff --git a/CHANGES/774.misc b/CHANGES/774.misc deleted file mode 100644 index 27489693..00000000 --- a/CHANGES/774.misc +++ /dev/null @@ -1 +0,0 @@ -Rebase migrations to prepare for pulpcore 3.70. diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index 1a4d476e..481f5b2e 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.13.0.dev" + version = "3.14.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 9cc858dc..6e18da75 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.13.0.dev" +version = "3.14.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.13.0.dev" +current_version = "3.14.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 d84bdba0..c7a5a0d4 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@2021.08.26-420-gf332a34 +# generated with plugin_template@unknown api_root: /pulp/ black: false @@ -23,7 +23,7 @@ docker_fixtures: false flake8: true flake8_ignore: [] github_org: pulp -latest_release_branch: '3.12' +latest_release_branch: '3.13' lint_requirements: true os_required_packages: [] parallel_test_workers: 8