77from pathlib import Path
88from typing import Any
99from typing import Callable
10- from typing import Literal
1110from typing import Optional
11+ < << << << ours
1212print (sys .version_info )
1313print (sys .executable )
1414from typing_extensions import TypeAlias
15+ == == == =
16+ >> >> >> > theirs
1517
1618
1719REPO_FOLDER : Path = Path (__file__ ).resolve ().parent .parent
1820
19- Increment : TypeAlias = Literal ["MAJOR" , "MINOR" , "PATCH" , "PRERELEASE" ]
20-
2121
2222class 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