From 802508f5825f913f5bf384ab82af190c26973fa6 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Mon, 19 Feb 2024 18:17:01 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/workflows/update_ci.yml | 27 +++++++++++++++++++++++++++ CHANGES/289.bugfix | 1 - CHANGES/321.feature | 1 - CHANGES/324.misc | 1 - CHANGES/325.misc | 1 - CHANGES/326.misc | 1 - CHANGES/327.misc | 1 - CHANGES/331.feature | 1 - docs/conf.py | 4 ++-- pulp_ostree/app/__init__.py | 2 +- setup.py | 2 +- template_config.yml | 2 +- 13 files changed, 33 insertions(+), 13 deletions(-) delete mode 100644 CHANGES/289.bugfix delete mode 100644 CHANGES/321.feature delete mode 100644 CHANGES/324.misc delete mode 100644 CHANGES/325.misc delete mode 100644 CHANGES/326.misc delete mode 100644 CHANGES/327.misc delete mode 100644 CHANGES/331.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf8b493e..5bc90758 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.3.0.dev +current_version = 2.4.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 16bfeadb..4014a88d 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_ostree" + ref: "2.3" + + - name: "Run update" + working-directory: "pulp_ostree" + run: | + ../plugin_template/scripts/update_ci.sh + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_ostree" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 2.3" + body: "" + branch: "update-ci/2.3" + base: "2.3" + commit-message: | + Update CI files + + [noissue] + delete-branch: true + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulp_ostree" diff --git a/CHANGES/289.bugfix b/CHANGES/289.bugfix deleted file mode 100644 index 95615080..00000000 --- a/CHANGES/289.bugfix +++ /dev/null @@ -1 +0,0 @@ -Improved the performance of subsequent imports. diff --git a/CHANGES/321.feature b/CHANGES/321.feature deleted file mode 100644 index ef90ad80..00000000 --- a/CHANGES/321.feature +++ /dev/null @@ -1 +0,0 @@ -Added support for domains. diff --git a/CHANGES/324.misc b/CHANGES/324.misc deleted file mode 100644 index 893646e6..00000000 --- a/CHANGES/324.misc +++ /dev/null @@ -1 +0,0 @@ -Rewritten test_filter.py using pytest. diff --git a/CHANGES/325.misc b/CHANGES/325.misc deleted file mode 100644 index 8097a958..00000000 --- a/CHANGES/325.misc +++ /dev/null @@ -1 +0,0 @@ -Rewritten test_import.py using pytest. diff --git a/CHANGES/326.misc b/CHANGES/326.misc deleted file mode 100644 index e93714b5..00000000 --- a/CHANGES/326.misc +++ /dev/null @@ -1 +0,0 @@ -Rewritten test_modify.py using pytest. diff --git a/CHANGES/327.misc b/CHANGES/327.misc deleted file mode 100644 index c0074a48..00000000 --- a/CHANGES/327.misc +++ /dev/null @@ -1 +0,0 @@ -Rewritten test_sync.py using pytest. diff --git a/CHANGES/331.feature b/CHANGES/331.feature deleted file mode 100644 index cb5b07e3..00000000 --- a/CHANGES/331.feature +++ /dev/null @@ -1 +0,0 @@ -Added role-based access control. diff --git a/docs/conf.py b/docs/conf.py index c5641749..1f80c24e 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -74,9 +74,9 @@ # built documents. # # The short X.Y version. -version = "2.3.0.dev" +version = "2.4.0.dev" # The full version, including alpha/beta/rc tags. -release = "2.3.0.dev" +release = "2.4.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_ostree/app/__init__.py b/pulp_ostree/app/__init__.py index 2496fd73..aa3673b2 100755 --- a/pulp_ostree/app/__init__.py +++ b/pulp_ostree/app/__init__.py @@ -6,6 +6,6 @@ class PulpOstreePluginAppConfig(PulpPluginAppConfig): name = "pulp_ostree.app" label = "ostree" - version = "2.3.0.dev" + version = "2.4.0.dev" python_package_name = "pulp-ostree" domain_compatible = True diff --git a/setup.py b/setup.py index db975ba9..790589d2 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-ostree", - version="2.3.0.dev", + version="2.4.0.dev", description="OSTree 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 a897a6ad..ea8f7e1c 100644 --- a/template_config.yml +++ b/template_config.yml @@ -29,7 +29,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: true -latest_release_branch: null +latest_release_branch: '2.3' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8