mirror of
https://github.com/TECHNOFAB11/bumpver.git
synced 2025-12-12 14:30:09 +01:00
WIP: refactoring and testing
This commit is contained in:
parent
8189075385
commit
5108837f45
11 changed files with 203 additions and 151 deletions
|
|
@ -18,38 +18,48 @@ from .parse import PYCALVER_RE
|
|||
log = logging.getLogger("pycalver.config")
|
||||
|
||||
|
||||
def parse(config_file="setup.cfg") -> typ.Optional[typ.Dict[str, typ.Any]]:
|
||||
if not os.path.exists(config_file):
|
||||
log.error("File not found: setup.cfg")
|
||||
return None
|
||||
class Config(typ.NamedTuple):
|
||||
|
||||
current_version : str
|
||||
pep440_version : str
|
||||
|
||||
tag : bool
|
||||
commit : bool
|
||||
|
||||
file_patterns : typ.Dict[str, typ.List[str]]
|
||||
|
||||
|
||||
MaybeConfig = typ.Optional[Config]
|
||||
|
||||
|
||||
def _parse_buffer(cfg_buffer: io.StringIO) -> MaybeConfig:
|
||||
cfg_parser = configparser.RawConfigParser("")
|
||||
with io.open(config_file, mode="rt", encoding="utf-8") as fh:
|
||||
cfg_parser.readfp(fh)
|
||||
cfg_parser.readfp(cfg_buffer)
|
||||
|
||||
if "pycalver" not in cfg_parser:
|
||||
log.error("setup.cfg does not contain a [pycalver] section.")
|
||||
return None
|
||||
|
||||
cfg = dict(cfg_parser.items("pycalver"))
|
||||
base_cfg = dict(cfg_parser.items("pycalver"))
|
||||
|
||||
if "current_version" not in cfg:
|
||||
if "current_version" not in base_cfg:
|
||||
log.error("setup.cfg does not have 'pycalver.current_version'")
|
||||
return None
|
||||
|
||||
current_version = cfg["current_version"]
|
||||
current_version = base_cfg["current_version"]
|
||||
if PYCALVER_RE.match(current_version) is None:
|
||||
log.error(f"setup.cfg 'pycalver.current_version is invalid")
|
||||
log.error(f"current_version = {current_version}")
|
||||
return None
|
||||
|
||||
cfg["pep440_version"] = str(pkg_resources.parse_version(current_version))
|
||||
pep440_version = str(pkg_resources.parse_version(current_version))
|
||||
|
||||
cfg["tag"] = cfg.get("tag", "").lower() in ("yes", "true", "1", "on")
|
||||
cfg["commit"] = cfg.get("commit", "").lower() in ("yes", "true", "1", "on")
|
||||
tag = base_cfg.get("tag", "").lower() in ("yes", "true", "1", "on")
|
||||
commit = base_cfg.get("commit", "").lower() in ("yes", "true", "1", "on")
|
||||
|
||||
cfg["file_patterns"] = {}
|
||||
file_patterns: typ.Dict[str, typ.List[str]] = {}
|
||||
|
||||
section_name: str
|
||||
for section_name in cfg_parser.sections():
|
||||
if not section_name.startswith("pycalver:file:"):
|
||||
continue
|
||||
|
|
@ -59,25 +69,39 @@ def parse(config_file="setup.cfg") -> typ.Optional[typ.Dict[str, typ.Any]]:
|
|||
log.error(f"No such file: {filepath} from {section_name} in setup.cfg")
|
||||
return None
|
||||
|
||||
section = dict(cfg_parser.items(section_name))
|
||||
section: typ.Dict[str, str] = dict(cfg_parser.items(section_name))
|
||||
patterns = section.get("patterns")
|
||||
|
||||
if "patterns" in section:
|
||||
cfg["file_patterns"][filepath] = [
|
||||
if patterns is None:
|
||||
file_patterns[filepath] = ["{version}", "{pep440_version}"]
|
||||
else:
|
||||
file_patterns[filepath] = [
|
||||
line.strip()
|
||||
for line in section["patterns"].splitlines()
|
||||
for line in patterns.splitlines()
|
||||
if line.strip()
|
||||
]
|
||||
else:
|
||||
cfg["file_patterns"][filepath] = ["{version}", "{pep440_version}"]
|
||||
|
||||
if not cfg["file_patterns"]:
|
||||
cfg["file_patterns"]["setup.cfg"] = ["{version}", "{pep440_version}"]
|
||||
if not file_patterns:
|
||||
file_patterns["setup.cfg"] = ["{version}", "{pep440_version}"]
|
||||
|
||||
cfg = Config(current_version, pep440_version, tag, commit, file_patterns)
|
||||
log.debug(f"Config Parsed: {cfg}")
|
||||
|
||||
return cfg
|
||||
|
||||
|
||||
def parse(config_file="setup.cfg") -> MaybeConfig:
|
||||
if not os.path.exists(config_file):
|
||||
log.error("File not found: setup.cfg")
|
||||
return None
|
||||
|
||||
cfg_buffer = io.StringIO()
|
||||
with io.open(config_file, mode="rt", encoding="utf-8") as fh:
|
||||
cfg_buffer.write(fh.read())
|
||||
|
||||
cfg_buffer.seek(0)
|
||||
return _parse_buffer(cfg_buffer)
|
||||
|
||||
|
||||
def default_config_lines() -> typ.List[str]:
|
||||
initial_version = dt.datetime.now().strftime("v%Y%m.0001-dev")
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue