diff --git a/Makefile b/Makefile index f45cfa9b..504b46bc 100644 --- a/Makefile +++ b/Makefile @@ -49,9 +49,9 @@ release-test: dist ## package and upload test release twine upload --repository testpypi dist/* bumpversion-to-dev: - uv pip install -qq bumpversion==0.5.3 + uv pip install -qq bump2version uv run python ./tools/bumpversion-tool.py --to-dev bumpversion-from-dev: - uv pip install -qq bumpversion==0.5.3 + uv pip install -qq bump2version uv run python ./tools/bumpversion-tool.py --from-dev diff --git a/setup.cfg b/setup.cfg index 85a005b2..06d01859 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,9 +1,9 @@ [bumpversion] -current_version = 0.2.1.dev1 +current_version = 0.3.0.dev1 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(?:\.dev(?P\d+))? -serialize = +serialize = {major}.{minor}.{patch}.dev{dev} {major}.{minor}.{patch} @@ -14,4 +14,3 @@ replace = version="{new_version}" [bumpversion:file:src/sweeps/__init__.py] search = __version__ = "{current_version}" replace = __version__ = "{new_version}" - diff --git a/tools/bumpversion-tool.py b/tools/bumpversion-tool.py index d17a6f8b..c6b3edb6 100755 --- a/tools/bumpversion-tool.py +++ b/tools/bumpversion-tool.py @@ -4,7 +4,7 @@ import configparser import sys -import bumpversion +from bumpversion.cli import main as bump2version_main parser = argparse.ArgumentParser() parser.add_argument("--to-dev", action="store_true", help="bump the dev version") @@ -36,7 +36,7 @@ def bump_release_to_dev(current_version): if args.debug: bump_args += ["--allow-dirty", "--dry-run", "--verbose"] bump_args += ["--new-version", new_version, "dev"] - bumpversion.main(bump_args) + bump2version_main(bump_args) def bump_release_from_dev(current_version): @@ -51,7 +51,7 @@ def bump_release_from_dev(current_version): if args.debug: bump_args += ["--allow-dirty", "--dry-run", "--verbose"] bump_args += ["--new-version", new_version, "patch"] - bumpversion.main(bump_args) + bump2version_main(bump_args) def main():