Skip to content

Commit 213a067

Browse files
committed
chore: update demo to the latest cookiecutter-robust-python
1 parent 49f6948 commit 213a067

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.cookiecutter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"_commit": "3fe6276285c66293f418a38abcdb8785d8fe5012",
2+
"_commit": "a77aa4d78cc34e55b4a187437d067ccd14657730",
33
"_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
44
"add_rust_extension": false,
55
"author": "Kyle Oliver",

.cruft.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
3-
"commit": "3fe6276285c66293f418a38abcdb8785d8fe5012",
3+
"commit": "a77aa4d78cc34e55b4a187437d067ccd14657730",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -18,7 +18,7 @@
1818
"license": "MIT",
1919
"development_status": "Development Status :: 1 - Planning",
2020
"_template": "C:\\Users\\56kyl\\source\\repos\\cookiecutter-robust-python",
21-
"_commit": "3fe6276285c66293f418a38abcdb8785d8fe5012"
21+
"_commit": "a77aa4d78cc34e55b4a187437d067ccd14657730"
2222
}
2323
},
2424
"directory": null

scripts/util.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
from pathlib import Path
88
from typing import Any
99
from typing import Callable
10-
from typing import Literal
1110
from typing import Optional
11+
<<<<<<< ours
1212
print(sys.version_info)
1313
print(sys.executable)
1414
from typing_extensions import TypeAlias
15+
=======
16+
>>>>>>> theirs
1517

1618

1719
REPO_FOLDER: Path = Path(__file__).resolve().parent.parent
1820

19-
Increment: TypeAlias = Literal["MAJOR", "MINOR", "PATCH", "PRERELEASE"]
20-
2121

2222
class MissingDependencyError(Exception):
2323
"""Exception raised when a depedency is missing from the system running setup-repo."""
@@ -72,7 +72,7 @@ def get_package_version() -> str:
7272
return result.stdout.decode("utf-8").strip()
7373

7474

75-
def get_bumped_package_version(increment: Optional[Increment] = None) -> str:
75+
def get_bumped_package_version(increment: Optional[str] = None) -> str:
7676
"""Gets the bumped package version."""
7777
args: list[str] = ["uvx", "cz", "bump", "--get-next", "--yes", "--dry-run"]
7878
if increment is not None:
@@ -92,7 +92,7 @@ def create_release_branch(new_version: str) -> None:
9292
subprocess.run(command, cwd=REPO_FOLDER, capture_output=True, check=True)
9393

9494

95-
def bump_version(increment: Optional[Increment] = None) -> None:
95+
def bump_version(increment: Optional[str] = None) -> None:
9696
"""Bumps the package version."""
9797
bump_cmd: list[str] = ["uvx", "cz", "bump", "--yes", "--files-only", "--changelog"]
9898
if increment is not None:

0 commit comments

Comments
 (0)