Skip to content

Commit

Permalink
Bump minor version
Browse files Browse the repository at this point in the history
  • Loading branch information
pulpbot authored and mdellweg committed Oct 1, 2024
1 parent c481d44 commit cb0a775
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.63.0.dev
current_version = 3.64.0.dev
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
Expand Down
11 changes: 8 additions & 3 deletions .ci/scripts/check_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/pr_labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(".")

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
with:
fetch-depth: 0
path: "pulpcore"
ref: "3.62"
ref: "3.63"

- name: "Run update"
working-directory: "pulpcore"
Expand All @@ -83,9 +83,9 @@ jobs:
path: "pulpcore"
committer: "pulpbot <[email protected]>"
author: "pulpbot <[email protected]>"
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:
Expand Down
4 changes: 0 additions & 4 deletions CHANGES/5766.feature

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/5843.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/5850.bugfix

This file was deleted.

2 changes: 1 addition & 1 deletion pulp_certguard/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pulp_file/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pulpcore/app/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb0a775

Please sign in to comment.