fix gh #172: allow recursive globs

This commit is contained in:
Manuel Barkhau 2022-02-15 18:58:00 +00:00
parent 1fb7e84e91
commit 3e6fa33eeb

View file

@ -6,7 +6,6 @@
"""Parse bumpver.toml, setup.cfg or pyproject.toml files.""" """Parse bumpver.toml, setup.cfg or pyproject.toml files."""
import re import re
import glob
import typing as typ import typing as typ
import logging import logging
import datetime as dt import datetime as dt
@ -250,19 +249,20 @@ def _parse_toml(cfg_buffer: typ.IO[str]) -> RawConfig:
def _iter_glob_expanded_file_patterns( def _iter_glob_expanded_file_patterns(
raw_patterns_by_file: RawPatternsByFile, raw_patterns_by_file: RawPatternsByFile,
) -> typ.Iterable[FileRawPatternsItem]: ) -> typ.Iterator[FileRawPatternsItem]:
for filepath_glob, raw_patterns in raw_patterns_by_file.items(): for filepath_glob, raw_patterns in raw_patterns_by_file.items():
filepaths = glob.glob(filepath_glob) filepaths = list(pl.Path().glob(filepath_glob))
if filepaths: if filepaths:
for filepath in filepaths: for filepath in filepaths:
yield filepath, raw_patterns yield str(filepath), raw_patterns
else: else:
logger.warning(f"Invalid config, no such file: {filepath_glob}") logger.warning(f"Invalid config, no such file: {filepath_glob}")
# fallback to treating it as a simple path # fallback to treating it as a simple path
yield filepath_glob, raw_patterns yield filepath_glob, raw_patterns
def _compile_v1_file_patterns(raw_cfg: RawConfig) -> typ.Iterable[FilePatternsItem]: def _compile_v1_file_patterns(raw_cfg: RawConfig) -> typ.Iterator[FilePatternsItem]:
"""Create inernal/compiled representation of the file_patterns config field. """Create inernal/compiled representation of the file_patterns config field.
The result the same, regardless of the config format. The result the same, regardless of the config format.