From 4ba1be33ec0fffd0065ea009563361a688e9daad Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 18 Nov 2025 15:44:18 +0000 Subject: [PATCH] Bump minor version --- .../workflows/scripts/publish_client_gem.sh | 28 ------------------- .../workflows/scripts/publish_client_pypi.sh | 26 ----------------- .../workflows/scripts/publish_plugin_pypi.sh | 26 ----------------- .github/workflows/update_ci.yml | 14 +++++----- CHANGES/1004.bugfix | 1 - CHANGES/1012.feature | 1 - CHANGES/982.feature | 1 - CHANGES/996.feature | 1 - pulp_python/app/__init__.py | 2 +- pyproject.toml | 4 +-- template_config.yml | 2 +- 11 files changed, 11 insertions(+), 95 deletions(-) delete mode 100755 .github/workflows/scripts/publish_client_gem.sh delete mode 100755 .github/workflows/scripts/publish_client_pypi.sh delete mode 100755 .github/workflows/scripts/publish_plugin_pypi.sh delete mode 100644 CHANGES/1004.bugfix delete mode 100644 CHANGES/1012.feature delete mode 100644 CHANGES/982.feature delete mode 100644 CHANGES/996.feature diff --git a/.github/workflows/scripts/publish_client_gem.sh b/.github/workflows/scripts/publish_client_gem.sh deleted file mode 100755 index e771b5e7..00000000 --- a/.github/workflows/scripts/publish_client_gem.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulp_python' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -euv - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. - -VERSION="$1" - -if [[ -z "${VERSION}" ]] -then - echo "No version specified." - exit 1 -fi - -mkdir -p ~/.gem -touch ~/.gem/credentials -echo "--- -:rubygems_api_key: ${RUBYGEMS_API_KEY}" > ~/.gem/credentials -sudo chmod 600 ~/.gem/credentials -gem push "pulp_python_client-${VERSION}.gem" diff --git a/.github/workflows/scripts/publish_client_pypi.sh b/.github/workflows/scripts/publish_client_pypi.sh deleted file mode 100755 index c5a4295c..00000000 --- a/.github/workflows/scripts/publish_client_pypi.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulp_python' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -euv - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")/../../.." - -VERSION="$1" - -if [[ -z "${VERSION}" ]] -then - echo "No version specified." - exit 1 -fi - -twine upload -u __token__ -p "${PYPI_API_TOKEN}" \ -"dist/pulp_python_client-${VERSION}-py3-none-any.whl" \ -"dist/pulp_python_client-${VERSION}.tar.gz" \ -; diff --git a/.github/workflows/scripts/publish_plugin_pypi.sh b/.github/workflows/scripts/publish_plugin_pypi.sh deleted file mode 100755 index 16b0ce05..00000000 --- a/.github/workflows/scripts/publish_plugin_pypi.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# WARNING: DO NOT EDIT! -# -# This file was generated by plugin_template, and is managed by it. Please use -# './plugin-template --github pulp_python' to update this file. -# -# For more info visit https://github.com/pulp/plugin_template - -set -euv - -# make sure this script runs at the repo root -cd "$(dirname "$(realpath -e "$0")")"/../../.. - -VERSION="$1" - -if [[ -z "${VERSION}" ]] -then - echo "No version specified." - exit 1 -fi - -twine upload -u __token__ -p "${PYPI_API_TOKEN}" \ -dist/pulp?python-"${VERSION}"-py3-none-any.whl \ -dist/pulp?python-"${VERSION}".tar.gz \ -; diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 6f8453b5..7c412007 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.20" + ref: "3.21" - 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_20" + id: "create_pr_3_21" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_python" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.20" - branch: "update-ci/3.20" - base: "3.20" + title: "Update CI files for branch 3.21" + branch: "update-ci/3.21" + base: "3.21" delete-branch: true - name: "Mark PR automerge" working-directory: "pulp_python" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_20.outputs.pull-request-number }}" - if: "steps.create_pr_3_20.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_21.outputs.pull-request-number }}" + if: "steps.create_pr_3_21.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/1004.bugfix b/CHANGES/1004.bugfix deleted file mode 100644 index 8d1132fe..00000000 --- a/CHANGES/1004.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed pull-through caching not checking the repository if package was not present on remote. diff --git a/CHANGES/1012.feature b/CHANGES/1012.feature deleted file mode 100644 index 19ca50a7..00000000 --- a/CHANGES/1012.feature +++ /dev/null @@ -1 +0,0 @@ -Added the new /scan endpoint to the RepositoryVersion viewset to generate vulnerability reports. diff --git a/CHANGES/982.feature b/CHANGES/982.feature deleted file mode 100644 index 27a6ecf6..00000000 --- a/CHANGES/982.feature +++ /dev/null @@ -1 +0,0 @@ -Added ability to serve a specific repository version of a PyPI index. diff --git a/CHANGES/996.feature b/CHANGES/996.feature deleted file mode 100644 index bd8e582a..00000000 --- a/CHANGES/996.feature +++ /dev/null @@ -1 +0,0 @@ -Implemented PEP 700 support, adding `versions`, `size` and `upload-time` to the Simple JSON API. diff --git a/pulp_python/app/__init__.py b/pulp_python/app/__init__.py index 28156f1a..aad6770b 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.21.0.dev" + version = "3.22.0.dev" python_package_name = "pulp-python" domain_compatible = True diff --git a/pyproject.toml b/pyproject.toml index 41217018..3d069a6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulp-python" -version = "3.21.0.dev" +version = "3.22.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.21.0.dev" +current_version = "3.22.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 6ade258b..25bc2591 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.20' +latest_release_branch: '3.21' lint_requirements: true os_required_packages: [] parallel_test_workers: 8