diff --git a/release_management/_utils.py b/release_management/_utils.py index f97f434..cd3b9d3 100755 --- a/release_management/_utils.py +++ b/release_management/_utils.py @@ -33,40 +33,28 @@ MANIFEST_PATH = "./Cargo.toml" -class ReleaseVersion: +class ReleaseVersion: # pylint: disable=too-few-public-methods """ Release version for the package. """ - def __init__(self, base, *, suffix=None): + def __init__(self, base, *, prerelease=None): """ Initializer. :param str base: Base version - :param suffix: Version suffix - :type suffix: str or Nonetype + :param prerelease: pre-release + :type prerelease: str or Nonetype """ self.base = base - self.suffix = suffix + self.prerelease = prerelease def __str__(self): - return f"{self.base}{'' if self.suffix is None else '~' + self.suffix}" - - def to_crate_str(self): - """ - Return the release version in a crates.io-friendly string. - """ - return f"{self.base}{'' if self.suffix is None else '-' + self.suffix}" - - def base_only(self): - """ - Return only the base. - """ - return self.base + return f"{self.base}{'' if self.prerelease is None else '~' + self.prerelease}" -def calc_pre_release_suffix(): +def calc_release_suffix(): """ - Return a standard value for the pre-release suffix for the version + Return a standard value for the release suffix for the version :rtype: str :returns: standard pre-release suffix """ diff --git a/release_management/create_artifacts.py b/release_management/create_artifacts.py index d1fbc87..aa1a6b2 100755 --- a/release_management/create_artifacts.py +++ b/release_management/create_artifacts.py @@ -26,7 +26,7 @@ from _utils import ( MANIFEST_PATH, ReleaseVersion, - calc_pre_release_suffix, + calc_release_suffix, edit_specfile, get_package_info, get_python_package_info, @@ -113,13 +113,13 @@ def _stratisd_artifacts(namespace): (source_version, _) = get_package_info(manifest_abs_path, "stratisd") - pre_release_suffix = calc_pre_release_suffix() if namespace.pre_release else None + pre_release_suffix = calc_release_suffix() if namespace.pre_release else None specfile_path = namespace.specfile_path if specfile_path is None and pre_release_suffix is not None: raise RuntimeError("must specify specfile using --specfile-path option") - release_version = ReleaseVersion(source_version, suffix=pre_release_suffix) + release_version = ReleaseVersion(source_version, prerelease=pre_release_suffix) filtered = namespace.vendor_method == "filtered" @@ -157,13 +157,13 @@ def _stratis_cli_artifacts(namespace): (source_version, _) = get_python_package_info("stratis-cli") - pre_release_suffix = calc_pre_release_suffix() if namespace.pre_release else None + pre_release_suffix = calc_release_suffix() if namespace.pre_release else None specfile_path = namespace.specfile_path if specfile_path is None and pre_release_suffix is not None: raise RuntimeError("must specify specfile using --specfile-path option") - release_version = ReleaseVersion(source_version, suffix=pre_release_suffix) + release_version = ReleaseVersion(source_version, prerelease=pre_release_suffix) source_tarfile = make_source_tarball( "stratis-cli",