diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 139ca45e4..b18190043 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -150,7 +150,7 @@ then pip install -r test_requirements.txt pytest -v tests -m "pulp_python" else - PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest + PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest PYTEST_MARK="live and (pulp_python)" fi popd diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index f95bbe5a9..3ed323d60 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -231,7 +231,7 @@ jobs: with: fetch-depth: 0 path: "pulp_python" - ref: "3.30" + ref: "3.31" - name: "Run update" working-directory: "pulp_python" @@ -240,21 +240,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_3_30" + id: "create_pr_3_31" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.30" - branch: "update-ci/3.30" - base: "3.30" + title: "Update CI files for branch 3.31" + branch: "update-ci/3.31" + base: "3.31" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_30.outputs.pull-request-number }}" - if: "steps.create_pr_3_30.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_31.outputs.pull-request-number }}" + if: "steps.create_pr_3_31.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+add-pulp-exceptions.feature b/CHANGES/+add-pulp-exceptions.feature deleted file mode 100644 index b0fd64373..000000000 --- a/CHANGES/+add-pulp-exceptions.feature +++ /dev/null @@ -1 +0,0 @@ -Add more Pulp Exceptions. diff --git a/CHANGES/1232.bugfix b/CHANGES/1232.bugfix deleted file mode 100644 index d6eabc4a5..000000000 --- a/CHANGES/1232.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed `upload_time` in Simple and JSON APIs to reflect repository addition time instead of content creation time. diff --git a/CHANGES/1238.bugfix b/CHANGES/1238.bugfix deleted file mode 100644 index 7f5e19d83..000000000 --- a/CHANGES/1238.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed blocklist entries API to support `isnull` filter lookup on `version` to uniquely identify name-only entries. diff --git a/CHANGES/1242.bugfix b/CHANGES/1242.bugfix deleted file mode 100644 index 94a77391e..000000000 --- a/CHANGES/1242.bugfix +++ /dev/null @@ -1 +0,0 @@ -Optimized `upload_time` lookups in Simple and JSON APIs. diff --git a/CHANGES/1243.bugfix b/CHANGES/1243.bugfix deleted file mode 100644 index e5138e18c..000000000 --- a/CHANGES/1243.bugfix +++ /dev/null @@ -1 +0,0 @@ -Optimized `provenance` lookups in Simple API. diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index f1667a4e8..d9fa7596b 100644 --- a/pulp_python/app/__init__.py +++ b/pulp_python/app/__init__.py @@ -12,7 +12,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig): name = "pulp_python.app" label = "python" - version = "3.31.0.dev" + version = "3.32.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 1d04739fc..3dea8ca9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.31.0.dev" +version = "3.32.0.dev" description = "pulp-python plugin for the Pulp Project" readme = "README.md" authors = [ @@ -79,7 +79,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.31.0.dev" +current_version = "3.32.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 3e93a08cb..4ec79cda0 100644 --- a/template_config.yml +++ b/template_config.yml @@ -22,7 +22,7 @@ disabled_redis_runners: [] docker_fixtures: false extra_files: [] github_org: "pulp" -latest_release_branch: "3.30" +latest_release_branch: "3.31" lint_ignore: [] lint_requirements: true os_required_packages: []