From 7febf195ae6b9f4d6e7c0c2340f284fe1549ddc3 Mon Sep 17 00:00:00 2001 From: Manuel Barkhau Date: Fri, 18 Sep 2020 19:22:17 +0000 Subject: [PATCH] more cleanup --- src/pycalver2/cli.py | 3 ++- src/pycalver2/version.py | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/pycalver2/cli.py b/src/pycalver2/cli.py index 107d4b8..753f587 100644 --- a/src/pycalver2/cli.py +++ b/src/pycalver2/cli.py @@ -12,6 +12,7 @@ Provided subcommands: show, test, init, bump import typing as typ import logging +import pycalver.version as v1version import pycalver2.rewrite as v2rewrite import pycalver2.version as v2version from pycalver import config @@ -28,7 +29,7 @@ def update_cfg_from_vcs(cfg: config.Config, all_tags: typ.List[str]) -> config.C version_tags.sort(reverse=True) logger.debug(f"found {len(version_tags)} tags: {version_tags[:2]}") latest_version_tag = version_tags[0] - latest_version_pep440 = v2version.to_pep440(latest_version_tag) + latest_version_pep440 = v1version.to_pep440(latest_version_tag) if latest_version_tag <= cfg.current_version: return cfg diff --git a/src/pycalver2/version.py b/src/pycalver2/version.py index a5e2df6..21f2edd 100644 --- a/src/pycalver2/version.py +++ b/src/pycalver2/version.py @@ -10,7 +10,6 @@ import logging import datetime as dt import lexid -import pkg_resources import pycalver2.patterns as v2patterns @@ -637,12 +636,3 @@ def incr( return None else: return new_version - - -def to_pep440(version: str) -> str: - """Derive pep440 compliant version string from PyCalVer version string. - - >>> to_pep440("v201811.0007-beta") - '201811.7b0' - """ - return str(pkg_resources.parse_version(version))