From 09977d486a88b0e05c622ef071414eabaa33b1e1 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Mon, 4 Mar 2024 17:34:39 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/template_gitref | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/create-branch.yml | 4 ++-- .github/workflows/nightly.yml | 2 +- .github/workflows/update-labels.yml | 2 +- .github/workflows/update_ci.yml | 33 ++++++++++++++++++++++++--- CHANGES/1010.feature | 1 - CHANGES/1010.removal | 2 -- CHANGES/1019.bugfix | 1 - CHANGES/1027.feature | 1 - CHANGES/911.feature | 3 --- CHANGES/919.misc | 1 - CHANGES/921.bugfix | 3 --- CHANGES/970.misc | 1 - CHANGES/976.bugfix | 1 - CHANGES/984.bugfix | 1 - CHANGES/994.bugfix | 1 - docs/conf.py | 4 ++-- pulp_deb/app/__init__.py | 2 +- setup.py | 2 +- template_config.yml | 4 ++-- 22 files changed, 43 insertions(+), 32 deletions(-) delete mode 100644 CHANGES/1010.feature delete mode 100644 CHANGES/1010.removal delete mode 100644 CHANGES/1019.bugfix delete mode 100644 CHANGES/1027.feature delete mode 100644 CHANGES/911.feature delete mode 100644 CHANGES/919.misc delete mode 100644 CHANGES/921.bugfix delete mode 100644 CHANGES/970.misc delete mode 100644 CHANGES/976.bugfix delete mode 100644 CHANGES/984.bugfix delete mode 100644 CHANGES/994.bugfix diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c7f405a50..258e1d3cf 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.2.0.dev +current_version = 3.3.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/template_gitref b/.github/template_gitref index e456a48e1..6461befc1 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-316-g69ef1f6 +2021.08.26-317-gde9891b diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2e91b094e..7b12591f3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index e0d86168b..15ddc00a1 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -72,7 +72,7 @@ jobs: find CHANGES -type f -regex ".*\.\(bugfix\|doc\|feature\|misc\|deprecation\|removal\)" -exec git rm {} + - name: Checkout plugin template - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: pulp/plugin_template path: plugin_template @@ -85,7 +85,7 @@ jobs: git add -A - name: Make a PR with version bump and without CHANGES/* - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: path: pulp_deb token: ${{ secrets.RELEASE_TOKEN }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 21538a4e0..6dfe8ad63 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -57,7 +57,7 @@ jobs: run: python .ci/scripts/collect_changes.py - name: Create Pull Request - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.RELEASE_TOKEN }} title: "Update Changelog" diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index 3e930adc7..81be84727 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -31,7 +31,7 @@ jobs: echo ::group::PYDEPS pip install requests pyyaml echo ::endgroup:: - - uses: "actions/checkout@v3" + - uses: "actions/checkout@v4" - name: "Update labels" run: | python3 .github/workflows/scripts/update_backport_labels.py diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 92513c91c..49234a739 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -55,7 +55,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_deb" @@ -71,6 +71,33 @@ jobs: [noissue] delete-branch: true - uses: "actions/checkout@v4" + with: + fetch-depth: 0 + path: "pulp_deb" + ref: "3.2" + + - name: "Run update" + working-directory: "pulp_deb" + run: | + ../plugin_template/scripts/update_ci.sh + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v6" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_deb" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 3.2" + body: "" + branch: "update-ci/3.2" + base: "3.2" + commit-message: | + Update CI files + + [noissue] + delete-branch: true + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulp_deb" @@ -82,7 +109,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_deb" @@ -109,7 +136,7 @@ jobs: ../plugin_template/scripts/update_ci.sh - name: "Create Pull Request for CI files" - uses: "peter-evans/create-pull-request@v4" + uses: "peter-evans/create-pull-request@v6" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulp_deb" diff --git a/CHANGES/1010.feature b/CHANGES/1010.feature deleted file mode 100644 index 93a1fc0fa..000000000 --- a/CHANGES/1010.feature +++ /dev/null @@ -1 +0,0 @@ -Added retrieve functionality for ReleaseArchitecture and ReleaseComponent content. diff --git a/CHANGES/1010.removal b/CHANGES/1010.removal deleted file mode 100644 index a3d9c70fd..000000000 --- a/CHANGES/1010.removal +++ /dev/null @@ -1,2 +0,0 @@ -The API endpoints for ReleaseArchitecture and ReleaseComponent creation will no longer return a 400 ``non_field_errors`` if the content to be created already exists. -Instead a task is triggered that will list the existing content in its ``created_resources`` field. diff --git a/CHANGES/1019.bugfix b/CHANGES/1019.bugfix deleted file mode 100644 index ce0b17303..000000000 --- a/CHANGES/1019.bugfix +++ /dev/null @@ -1 +0,0 @@ -Suppressed deb822's confusing log warning about python-apt not being installed. diff --git a/CHANGES/1027.feature b/CHANGES/1027.feature deleted file mode 100644 index 448fa638a..000000000 --- a/CHANGES/1027.feature +++ /dev/null @@ -1 +0,0 @@ -Allow optimize with mirror mode if nothing at all has changed in the repository being synced. diff --git a/CHANGES/911.feature b/CHANGES/911.feature deleted file mode 100644 index f9c555fa0..000000000 --- a/CHANGES/911.feature +++ /dev/null @@ -1,3 +0,0 @@ -Added feature to serve published artifacts from previous publications for 3 days. -This fulfills the apt-by-hash/acquire-by-hash spec by allowing by-hash files to be cached for a -period of 3 days. diff --git a/CHANGES/919.misc b/CHANGES/919.misc deleted file mode 100644 index 4c7462fe0..000000000 --- a/CHANGES/919.misc +++ /dev/null @@ -1 +0,0 @@ -Added tests that verify the download of content served by ``pulp_deb``. diff --git a/CHANGES/921.bugfix b/CHANGES/921.bugfix deleted file mode 100644 index 0a539c9df..000000000 --- a/CHANGES/921.bugfix +++ /dev/null @@ -1,3 +0,0 @@ -Fixed repo uniqueness constraints. -Duplicate packages with identical checksums are now allowed. -In addition, duplicates are now also handled for the set of incoming content. diff --git a/CHANGES/970.misc b/CHANGES/970.misc deleted file mode 100644 index cc2257d73..000000000 --- a/CHANGES/970.misc +++ /dev/null @@ -1 +0,0 @@ -Added sync, publish and pulp2pulp performance tests to run with the nightly CI. diff --git a/CHANGES/976.bugfix b/CHANGES/976.bugfix deleted file mode 100644 index b6900cb1c..000000000 --- a/CHANGES/976.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed a bug where pulp_deb was serving unpublished content when distributing a repository that has content but no publications. diff --git a/CHANGES/984.bugfix b/CHANGES/984.bugfix deleted file mode 100644 index cbb377b8d..000000000 --- a/CHANGES/984.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed a bug where enabling the ``APT_BY_HASH`` setting did not enable the feature. diff --git a/CHANGES/994.bugfix b/CHANGES/994.bugfix deleted file mode 100644 index ca062bb4e..000000000 --- a/CHANGES/994.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed DEBUG logging of prohibited duplicate packages. diff --git a/docs/conf.py b/docs/conf.py index 288f53568..ccee126a5 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -74,9 +74,9 @@ # built documents. # # The short X.Y version. -version = "3.2.0.dev" +version = "3.3.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.2.0.dev" +release = "3.3.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_deb/app/__init__.py b/pulp_deb/app/__init__.py index 31a65ebc6..a6c46d8b1 100644 --- a/pulp_deb/app/__init__.py +++ b/pulp_deb/app/__init__.py @@ -6,5 +6,5 @@ class PulpDebPluginAppConfig(PulpPluginAppConfig): name = "pulp_deb.app" label = "deb" - version = "3.2.0.dev" + version = "3.3.0.dev" python_package_name = "pulp_deb" diff --git a/setup.py b/setup.py index 3e35c341d..588a034f6 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-deb", - version="3.2.0.dev", + version="3.3.0.dev", description="pulp-deb plugin for the Pulp Project", long_description=long_description, long_description_content_type="text/markdown", diff --git a/template_config.yml b/template_config.yml index a3072f0e0..02eaf6e73 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-316-g69ef1f6 +# generated with plugin_template@2021.08.26-317-gde9891b api_root: /pulp/ black: true @@ -29,7 +29,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: false -latest_release_branch: null +latest_release_branch: '3.2' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8