From cb0a7757f6c4a1c78b137ad25a2bf470f25c5920 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 1 Oct 2024 15:05:43 +0000 Subject: [PATCH] Bump minor version --- .bumpversion.cfg | 2 +- .ci/scripts/check_release.py | 11 ++++++++--- .ci/scripts/pr_labels.py | 2 +- .github/workflows/update_ci.yml | 8 ++++---- CHANGES/5766.feature | 4 ---- CHANGES/5843.bugfix | 1 - CHANGES/5850.bugfix | 1 - pulp_certguard/app/__init__.py | 2 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- setup.py | 2 +- template_config.yml | 2 +- 12 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 CHANGES/5766.feature delete mode 100644 CHANGES/5843.bugfix delete mode 100644 CHANGES/5850.bugfix diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 64f0d8f26b..f7d44aa7c9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.63.0.dev +current_version = 3.64.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.ci/scripts/check_release.py b/.ci/scripts/check_release.py index 8722686c55..9fab30a467 100755 --- a/.ci/scripts/check_release.py +++ b/.ci/scripts/check_release.py @@ -64,6 +64,7 @@ def main(): for branch in branches: if branch != DEFAULT_BRANCH: # Check if a Z release is needed + reasons = [] changes = repo.git.ls_tree("-r", "--name-only", f"origin/{branch}", "CHANGES/") z_changelog = False for change in changes.split("\n"): @@ -76,23 +77,27 @@ def main(): ) elif ext in Z_CHANGELOG_EXTS: z_changelog = True + if z_changelog: + reasons.append("Backports") last_tag = repo.git.describe("--tags", "--abbrev=0", f"origin/{branch}") req_txt_diff = repo.git.diff( f"{last_tag}", f"origin/{branch}", "--name-only", "--", "requirements.txt" ) - if z_changelog or req_txt_diff: + if req_txt_diff: + reasons.append("requirements.txt") + + if reasons: curr_version = Version(last_tag) assert curr_version.base_version.startswith( branch ), "Current-version has to belong to the current branch!" next_version = Version(f"{branch}.{curr_version.micro + 1}") - reason = "CHANGES" if z_changelog else "requirements.txt" print( f"A Z-release is needed for {branch}, " f"Prev: {last_tag}, " f"Next: {next_version.base_version}, " - f"Reason: {reason}" + f"Reason: {','.join(reasons)}" ) releases.append(next_version) else: diff --git a/.ci/scripts/pr_labels.py b/.ci/scripts/pr_labels.py index 24edc73247..0c478a212d 100755 --- a/.ci/scripts/pr_labels.py +++ b/.ci/scripts/pr_labels.py @@ -23,7 +23,7 @@ def main(): f".{item['directory']}" for item in PYPROJECT_TOML["tool"]["towncrier"]["type"] } except KeyError: - CHANGELOG_EXTS = {"feature", "bugfix", "doc", "removal", "misc"} + CHANGELOG_EXTS = {".feature", ".bugfix", ".doc", ".removal", ".misc"} repo = Repo(".") diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 5585dd60aa..d7fe13c955 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -69,7 +69,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.62" + ref: "3.63" - name: "Run update" working-directory: "pulpcore" @@ -83,9 +83,9 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.62" - branch: "update-ci/3.62" - base: "3.62" + title: "Update CI files for branch 3.63" + branch: "update-ci/3.63" + base: "3.63" delete-branch: true - uses: "actions/checkout@v4" with: diff --git a/CHANGES/5766.feature b/CHANGES/5766.feature deleted file mode 100644 index 9bc4c291f9..0000000000 --- a/CHANGES/5766.feature +++ /dev/null @@ -1,4 +0,0 @@ -Introduced new immutable resource identifier: Pulp Resource Name (PRN). All objects within Pulp -will now show their PRN alongside their pulp_href. The PRN can be used in lieu of the pulp_href -in API calls when creating or filtering objects. The PRN of any object has the form of -`prn:app_label.model_label:pulp_id`. diff --git a/CHANGES/5843.bugfix b/CHANGES/5843.bugfix deleted file mode 100644 index 7304824d7b..0000000000 --- a/CHANGES/5843.bugfix +++ /dev/null @@ -1 +0,0 @@ -Removed opentelemetry-instrumentation-django from dependencies. diff --git a/CHANGES/5850.bugfix b/CHANGES/5850.bugfix deleted file mode 100644 index 069e48d230..0000000000 --- a/CHANGES/5850.bugfix +++ /dev/null @@ -1 +0,0 @@ -Made Kafka dependencies optional depending on whether the producer is configured. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 99bd6d286f..83e73e078c 100644 --- a/pulp_certguard/app/__init__.py +++ b/pulp_certguard/app/__init__.py @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig): name = "pulp_certguard.app" label = "certguard" - version = "3.63.0.dev" + version = "3.64.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index ab11dd91bd..4dd855b765 100644 --- a/pulp_file/app/__init__.py +++ b/pulp_file/app/__init__.py @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig): name = "pulp_file.app" label = "file" - version = "3.63.0.dev" + version = "3.64.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index e7e225941f..11acfd7cd2 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.63.0.dev" + version = "3.64.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index ed3a166a89..9448e97b97 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.63.0.dev", + version="3.64.0.dev", description="Pulp Django Application and Related Modules", long_description=long_description, long_description_content_type="text/markdown", diff --git a/template_config.yml b/template_config.yml index f876ea6d74..1b5bb46574 100644 --- a/template_config.yml +++ b/template_config.yml @@ -25,7 +25,7 @@ flake8: true flake8_ignore: - ./pulpcore/app/protobuf/* github_org: pulp -latest_release_branch: '3.62' +latest_release_branch: '3.63' lint_requirements: true os_required_packages: [] parallel_test_workers: 8