From c41943a04b20c9a2070625a71461e4a6b3bb7302 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Wed, 19 Jun 2024 14:34:59 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/template_gitref | 2 +- .github/workflows/update_ci.yml | 27 +++++++++++++++++++++++++++ CHANGES/1014.doc | 1 - CHANGES/1038.feature | 2 -- CHANGES/1038.removal | 3 --- CHANGES/1039.removal | 1 - CHANGES/1053.bugfix | 2 -- CHANGES/1077.feature | 1 - CHANGES/1077.removal | 1 - CHANGES/1100.feature | 1 - docs/conf.py | 4 ++-- pulp_deb/app/__init__.py | 2 +- setup.py | 2 +- template_config.yml | 4 ++-- 15 files changed, 35 insertions(+), 20 deletions(-) delete mode 100644 CHANGES/1014.doc delete mode 100644 CHANGES/1038.feature delete mode 100644 CHANGES/1038.removal delete mode 100644 CHANGES/1039.removal delete mode 100644 CHANGES/1053.bugfix delete mode 100644 CHANGES/1077.feature delete mode 100644 CHANGES/1077.removal delete mode 100644 CHANGES/1100.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 258e1d3c..e3e9bf48 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.3.0.dev +current_version = 3.4.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 9122ea22..1d4100e7 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-339-gf0d923e +2021.08.26-341-g5cb6e90 diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 3b25ceff..8a7d4000 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -71,6 +71,33 @@ jobs: [noissue] delete-branch: true - uses: "actions/checkout@v4" + with: + fetch-depth: 0 + path: "pulp_deb" + ref: "3.3" + + - 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.3" + body: "" + branch: "update-ci/3.3" + base: "3.3" + commit-message: | + Update CI files + + [noissue] + delete-branch: true + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulp_deb" diff --git a/CHANGES/1014.doc b/CHANGES/1014.doc deleted file mode 100644 index 245d62e0..00000000 --- a/CHANGES/1014.doc +++ /dev/null @@ -1 +0,0 @@ -Added initial staging docs. diff --git a/CHANGES/1038.feature b/CHANGES/1038.feature deleted file mode 100644 index 2444ee20..00000000 --- a/CHANGES/1038.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added the ``architectures`` and ``components`` parameters to the release API in order to create releases with accompanying architectures and components in a single API call. -Also added retrieve functionality to the release API. diff --git a/CHANGES/1038.removal b/CHANGES/1038.removal deleted file mode 100644 index d1ad2794..00000000 --- a/CHANGES/1038.removal +++ /dev/null @@ -1,3 +0,0 @@ -When creating a release, the API now returns a task instead of the release being created. -In addition, attempting to create a release that already exists will no longer return an error. -Instead the resulting task will simply list the existing content in its ``created_resources`` field. diff --git a/CHANGES/1039.removal b/CHANGES/1039.removal deleted file mode 100644 index 91a14c18..00000000 --- a/CHANGES/1039.removal +++ /dev/null @@ -1 +0,0 @@ -Dropped support for Python 3.8. pulp_deb now supports Python >=3.9. diff --git a/CHANGES/1053.bugfix b/CHANGES/1053.bugfix deleted file mode 100644 index ed7d596c..00000000 --- a/CHANGES/1053.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Fixed a bug where an ``IntegrityError`` was raised during publish when a source package belonged to -two dists. diff --git a/CHANGES/1077.feature b/CHANGES/1077.feature deleted file mode 100644 index 26c43d94..00000000 --- a/CHANGES/1077.feature +++ /dev/null @@ -1 +0,0 @@ -Added support for duplicate source debs. If an source deb already exists, return it instead of raising an exception. diff --git a/CHANGES/1077.removal b/CHANGES/1077.removal deleted file mode 100644 index 3142ed9d..00000000 --- a/CHANGES/1077.removal +++ /dev/null @@ -1 +0,0 @@ -When uploading a source deb that already exists, instead of throwing an exception it will now return the existing source package. diff --git a/CHANGES/1100.feature b/CHANGES/1100.feature deleted file mode 100644 index 2998e4fb..00000000 --- a/CHANGES/1100.feature +++ /dev/null @@ -1 +0,0 @@ -Made the plugin compatible with pulpcore 3.55.0+. diff --git a/docs/conf.py b/docs/conf.py index 642240f9..507e3e18 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,9 +73,9 @@ # built documents. # # The short X.Y version. -version = "3.3.0.dev" +version = "3.4.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.3.0.dev" +release = "3.4.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 a6c46d8b..04604fa3 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.3.0.dev" + version = "3.4.0.dev" python_package_name = "pulp_deb" diff --git a/setup.py b/setup.py index 4424c0ad..76b97871 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-deb", - version="3.3.0.dev", + version="3.4.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 31301253..9455530d 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-326-ge5addc7 +# generated with plugin_template@2021.08.26-341-g5cb6e90 api_root: /pulp/ black: true @@ -29,7 +29,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: false -latest_release_branch: '3.2' +latest_release_branch: '3.3' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8