evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update bump_version.py to append also the time to nightlies and add possibility to set manual a nightly version (#114300)

Browse source
This commit is contained in:
Robert Resch 2024-03-27 14:12:45 +01:00 • committed by GitHub
parent 9ea666b5e1
commit aaecbbdc40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/builder.yml vendored
View file

@ -105,7 +105,7 @@ jobs:
python3 -m pip install "$(grep '^uv' < requirements_test.txt)" python3 -m pip install "$(grep '^uv' < requirements_test.txt)"
uv pip install packaging tomli uv pip install packaging tomli
uv pip install . uv pip install .
version="$(python3 script/version_bump.py nightly)" python3 script/version_bump.py nightly --set-nightly-version "${{ needs.init.outputs.version }}"
if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then
echo "Found frontend wheel, setting version to: ${BASH_REMATCH[1]}" echo "Found frontend wheel, setting version to: ${BASH_REMATCH[1]}"

33
script/version_bump.py
View file

@ -24,7 +24,9 @@ def _bump_release(release, bump_type):
return major, minor, patch return major, minor, patch
def bump_version(version, bump_type): def bump_version(
version: Version, bump_type: str, *, nightly_version: str | None = None
) -> Version:
"""Return a new version given a current version and action.""" """Return a new version given a current version and action."""
to_change = {} to_change = {}
@ -83,11 +85,14 @@ def bump_version(version, bump_type):
to_change["pre"] = ("b", 0) to_change["pre"] = ("b", 0)
elif bump_type == "nightly": elif bump_type == "nightly":
# Convert 0.70.0d0 to 0.70.0d20190424, fails when run on non dev release # Convert 0.70.0d0 to 0.70.0d201904241254, fails when run on non dev release
if not version.is_devrelease: if not version.is_devrelease:
raise ValueError("Can only be run on dev release") raise ValueError("Can only be run on dev release")
to_change["dev"] = ("dev", dt_util.utcnow().strftime("%Y%m%d")) to_change["dev"] = (
"dev",
nightly_version or dt_util.utcnow().strftime("%Y%m%d%H%M"),
)
else: else:
raise ValueError(f"Unsupported type: {bump_type}") raise ValueError(f"Unsupported type: {bump_type}")
@ -146,7 +151,7 @@ def write_ci_workflow(version: Version) -> None:
fp.write(content) fp.write(content)
def main(): def main() -> None:
"""Execute script.""" """Execute script."""
parser = argparse.ArgumentParser(description="Bump version of Home Assistant") parser = argparse.ArgumentParser(description="Bump version of Home Assistant")
parser.add_argument( parser.add_argument(
@ -157,8 +162,15 @@ def main():
parser.add_argument( parser.add_argument(
"--commit", action="store_true", help="Create a version bump commit." "--commit", action="store_true", help="Create a version bump commit."
) )
parser.add_argument(
"--set-nightly-version", help="Set the nightly version to", type=str
)
arguments = parser.parse_args() arguments = parser.parse_args()
if arguments.set_nightly_version and arguments.type != "nightly":
parser.error("--set-nightly-version requires type set to nightly.")
if ( if (
arguments.commit arguments.commit
and subprocess.run(["git", "diff", "--quiet"], check=False).returncode == 1 and subprocess.run(["git", "diff", "--quiet"], check=False).returncode == 1
@ -167,7 +179,9 @@ def main():
return return
current = Version(const.__version__) current = Version(const.__version__)
bumped = bump_version(current, arguments.type) bumped = bump_version(
current, arguments.type, nightly_version=arguments.set_nightly_version
)
assert bumped > current, "BUG! New version is not newer than old version" assert bumped > current, "BUG! New version is not newer than old version"
write_version(bumped) write_version(bumped)
@ -181,7 +195,7 @@ def main():
subprocess.run(["git", "commit", "-nam", f"Bump version to {bumped}"], check=True) subprocess.run(["git", "commit", "-nam", f"Bump version to {bumped}"], check=True)
def test_bump_version(): def test_bump_version() -> None:
"""Make sure it all works.""" """Make sure it all works."""
import pytest import pytest
@ -204,10 +218,13 @@ def test_bump_version():
assert bump_version(Version("0.56.0.dev0"), "minor") == Version("0.56.0") assert bump_version(Version("0.56.0.dev0"), "minor") == Version("0.56.0")
assert bump_version(Version("0.56.2.dev0"), "minor") == Version("0.57.0") assert bump_version(Version("0.56.2.dev0"), "minor") == Version("0.57.0")
today = dt_util.utcnow().strftime("%Y%m%d") now = dt_util.utcnow().strftime("%Y%m%d%H%M")
assert bump_version(Version("0.56.0.dev0"), "nightly") == Version( assert bump_version(Version("0.56.0.dev0"), "nightly") == Version(
f"0.56.0.dev{today}" f"0.56.0.dev{now}"
) )
assert bump_version(
Version("0.56.0.dev0"), "nightly", nightly_version="1234"
) == Version("0.56.0.dev1234")
with pytest.raises(ValueError): with pytest.raises(ValueError):
assert bump_version(Version("0.56.0"), "nightly") assert bump_version(Version("0.56.0"), "nightly")