file-groups 0.3.1__tar.gz → 0.4.0__tar.gz

{file_groups-0.3.1 → file_groups-0.4.0}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 1ddef8a
+_commit: 451d88a
 _src_path: git@github.com:lhupfeldt/copier_python_package_template.git
 author_email: lhn@hupfeldtit.dk
 author_name: Lars Hupfeldt Nielsen

{file_groups-0.3.1 → file_groups-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: file_groups
-Version: 0.3.1
+Version: 0.4.0
 Summary: Group files into 'protect' and 'work_on' and provide operations for safe delete/move and symlink handling.
 Home-page: https://github.com/lhupfeldt/file_groups.git
 Author: Lars Hupfeldt Nielsen
@@ -14,9 +14,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: appdirs>=1.4.4

{file_groups-0.3.1 → file_groups-0.4.0}/file_groups.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: file_groups
-Version: 0.3.1
+Version: 0.4.0
 Summary: Group files into 'protect' and 'work_on' and provide operations for safe delete/move and symlink handling.
 Home-page: https://github.com/lhupfeldt/file_groups.git
 Author: Lars Hupfeldt Nielsen
@@ -14,9 +14,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: appdirs>=1.4.4

{file_groups-0.3.1 → file_groups-0.4.0}/noxfile.py

@@ -11,7 +11,7 @@ import nox
 
 _HERE = Path(__file__).absolute().parent
 _TEST_DIR = _HERE/"test"
-_PY_VERSIONS = ['3.13', '3.12', '3.11', '3.10']
+_PY_VERSIONS = ['3.13', '3.12', '3.11']
 
 nox.options.error_on_missing_interpreters = True
 
@@ -19,7 +19,7 @@ nox.options.error_on_missing_interpreters = True
 @nox.session(python=_PY_VERSIONS, reuse_venv=True)
 def typecheck(session):
     session.install("-e", ".", "mypy>=1.5.1")
-    session.run("mypy", str(_HERE/"src"))
+    session.run("mypy", "--strict", "--check-untyped", "--implicit-optional", "--disable-error-code=type-arg", str(_HERE/"src"))
 
 
 @nox.session(python=_PY_VERSIONS[0], reuse_venv=True)

{file_groups-0.3.1 → file_groups-0.4.0}/setup.cfg

@@ -16,7 +16,6 @@ classifiers =
 	Programming Language :: Python :: 3.13
 	Programming Language :: Python :: 3.12
 	Programming Language :: Python :: 3.11
-	Programming Language :: Python :: 3.10
 	Topic :: Software Development :: Libraries
 
 [options]
@@ -24,7 +23,7 @@ zip_safe = True
 include_package_data = True
 install_requires = 
 	appdirs>=1.4.4
-python_requires = >= 3.10
+python_requires = >= 3.11
 packages = 
 	file_groups
 package_dir = 

{file_groups-0.3.1 → file_groups-0.4.0}/src/__init__.py

@@ -1,6 +1,6 @@
 """Set __version__ property."""
 
-from importlib.metadata import version  # type: ignore
+from importlib.metadata import version
 
 
 __version__ = version("file_groups")

{file_groups-0.3.1 → file_groups-0.4.0}/src/config_files.py

@@ -26,7 +26,7 @@ class ProtectConfig():
     """Hold global (site or user) protect config."""
     protect_recursive: set[re.Pattern]
 
-    def __json__(self):
+    def __json__(self) -> dict[str, Any]:
         return {
             ProtectConfig.__name__: {
                 "protect_recursive": [str(pat) for pat in self.protect_recursive],
@@ -41,13 +41,13 @@ class DirConfig(ProtectConfig):
     config_dir: Path|None
     config_files: list[str]
 
-    def is_protected(self, ff: FsPath):
+    def is_protected(self, ff: FsPath) -> re.Pattern|None:
         """If ff id protected by a regex pattern then return the pattern, otherwise return None."""
 
         # _LOG.debug("ff '%s'", ff)
         for pattern in itertools.chain(self.protect_local, self.protect_recursive):
             if os.sep in str(pattern):
-                # _LOG.debug("Pattern '%s' has path sep", pattern)
+                # _LOG.debug("re.Pattern '%s' has path sep", pattern)
                 assert os.path.isabs(ff), f"Expected absolute path, got '{ff}'"
 
                 # Search against full path
@@ -68,7 +68,7 @@ class DirConfig(ProtectConfig):
 
         return None
 
-    def __json__(self):
+    def __json__(self) -> dict[str, Any]:
         return {
             DirConfig.__name__: super().__json__()[ProtectConfig.__name__] | {
                 "protect_local": [str(pat) for pat in self.protect_local],
@@ -159,7 +159,7 @@ class ConfigFiles():
 
     def __init__(  # pylint: disable=too-many-positional-arguments,too-many-arguments
             self, protect: Sequence[re.Pattern] = (),
-            ignore_config_dirs_config_files=False, ignore_per_directory_config_files=False, remember_configs=True,
+            ignore_config_dirs_config_files: bool = False, ignore_per_directory_config_files: bool =False, remember_configs: bool =True,
             app_dirs: Sequence[AppDirs]|None = None,
             *,
             config_file: Path|None = None,

{file_groups-0.3.1 → file_groups-0.4.0}/src/groups.py

@@ -35,14 +35,14 @@ class _Group():
     num_directories: int = 0
     num_directory_symlinks: int = 0
 
-    def add_entry_match(self, entry: DirEntry):
+    def add_entry_match(self, entry: DirEntry) -> None:
         """Abstract, but abstract and dataclass does not work with mypy. https://github.com/python/mypy/issues/500"""
 
 @dataclass
 class _IncludeMatchGroup(_Group):
     include: re.Pattern|None = None
 
-    def add_entry_match(self, entry: DirEntry):
+    def add_entry_match(self, entry: DirEntry) -> None:
         if not self.include:
             self.files[entry.path] = entry
             return
@@ -58,7 +58,7 @@ class _IncludeMatchGroup(_Group):
 class _ExcludeMatchGroup(_Group):
     exclude: re.Pattern|None = None
 
-    def add_entry_match(self, entry: DirEntry):
+    def add_entry_match(self, entry: DirEntry) -> None:
         if not self.exclude:
             self.files[entry.path] = entry
             return
@@ -169,7 +169,7 @@ class FileGroups():
 
         checked_dirs: set[str] = set()
 
-        def handle_entry(abs_dir_path: str, group: _Group, other_group: _Group, dir_config: DirConfig, entry: DirEntry):
+        def handle_entry(abs_dir_path: str, group: _Group, other_group: _Group, dir_config: DirConfig, entry: DirEntry) -> None:
             """Put entry in  the correct group. Call 'find_group' if entry is a directory."""
             if group.typ is GroupType.MAY_WORK_ON:
                 # Check for match against configured protect patterns, if match, then the file must got to protect group instead
@@ -207,7 +207,7 @@ class FileGroups():
             _LOG.debug("find %s - entry name: %s", group.typ.name, entry.name)
             group.add_entry_match(entry)
 
-        def find_group(abs_dir_path: str, group: _Group, other_group: _Group, parent_conf: DirConfig|None):
+        def find_group(abs_dir_path: str, group: _Group, other_group: _Group, parent_conf: DirConfig|None) -> None:
             """Recursively find all files belonging to 'group'"""
             _LOG.debug("find %s: %s", group.typ.name, abs_dir_path)
             if abs_dir_path in checked_dirs:
@@ -238,7 +238,7 @@ class FileGroups():
             else:
                 find_group(any_dir, self.may_work_on, self.must_protect, parent_conf)
 
-    def dump(self):
+    def dump(self) -> None:
         """Log collected files. This may be A LOT of output for large directories."""
 
         log = _LOG.getChild("dump")
@@ -280,7 +280,7 @@ class FileGroups():
 
         log.log(lvl, "")
 
-    def stats(self):
+    def stats(self) -> None:
         """Log collection numbers."""
         log = _LOG.getChild("stats")
         lvl = logging.INFO

{file_groups-0.3.1 → file_groups-0.4.0}/src/handler.py

@@ -2,13 +2,12 @@ import os
 from pathlib import Path
 import shutil
 import re
-from contextlib import contextmanager
 import logging
 from typing import Sequence
 
 from .groups import FileGroups
 from .config_files import ConfigFiles
-
+from .types import FsPath
 
 _LOG = logging.getLogger(__name__)
 
@@ -35,7 +34,7 @@ class FileHandler(FileGroups):
             protect_exclude: re.Pattern|None = None, work_include: re.Pattern|None = None,
             config_files: ConfigFiles|None = None,
             dry_run: bool,
-            delete_symlinks_instead_of_relinking=False):
+            delete_symlinks_instead_of_relinking: bool =False):
         super().__init__(
             protect_dirs_seq=protect_dirs_seq, work_dirs_seq=work_dirs_seq,
             protect_exclude=protect_exclude, work_include=work_include,
@@ -55,7 +54,7 @@ class FileHandler(FileGroups):
         self.num_moved = 0
         self.num_relinked = 0
 
-    def reset(self):
+    def reset(self) -> None:
         """Reset internal housekeeping of deleted/renamed/moved files.
 
         This makes it possible to do a 'dry_run' and an actual run without collecting files again.
@@ -69,7 +68,7 @@ class FileHandler(FileGroups):
         self.num_moved = 0
         self.num_relinked = 0
 
-    def _no_symlink_check_registered_delete(self, delete_path: str):
+    def _no_symlink_check_registered_delete(self, delete_path: str) -> None:
         """Does a registered delete without checking for symlinks, so that we can use this in the symlink handling."""
         assert isinstance(delete_path, str)
         assert os.path.isabs(delete_path), f"Expected absolute path, got '{delete_path}'"
@@ -84,7 +83,7 @@ class FileHandler(FileGroups):
         if delete_path in self.may_work_on.symlinks:
             self.deleted_symlinks.add(delete_path)
 
-    def _handle_single_symlink_chain(self, symlnk_path: str, keep_path):
+    def _handle_single_symlink_chain(self, symlnk_path: str, keep_path: str|FsPath|None) -> None:
         """TODO doc - Symlink will only be deleted if it is in self.may_work_on.files."""
 
         assert os.path.isabs(symlnk_path), f"Expected an absolute path, got '{symlnk_path}'"
@@ -141,8 +140,12 @@ class FileHandler(FileGroups):
 
         self.num_relinked += 1
 
-    def _fix_symlinks_to_deleted_or_moved_files(self, from_path: str, to_path):
-        """Any symlinks pointing to 'from_path' will be change to point to 'to_path'"""
+    def _fix_symlinks_to_deleted_or_moved_files(self, from_path: str, to_path: str|FsPath|None) -> None:
+        """Any symlinks pointing to 'from_path' will be change to point to 'to_path' or deleted.
+
+        If 'to_path' is None then delete full chains of symlinks in 'may_work_on' dirs.
+        """
+
         _LOG.debug("_fix_symlinks_to_deleted_or_moved_files(self, %s, %s)", from_path, to_path)
 
         for symlnk in self.must_protect.symlinks_by_abs_points_to.get(from_path, ()):
@@ -153,13 +156,13 @@ class FileHandler(FileGroups):
             _LOG.debug("_fix_symlinks_to_deleted_or_moved_files, may_work_on symlink: '%s'.", symlnk)
             self._handle_single_symlink_chain(os.fspath(symlnk), to_path)
 
-    def registered_delete(self, delete_path: str, corresponding_keep_path) -> Path|None:
+    def registered_delete(self, delete_path: str, corresponding_keep_path: str|FsPath|None) -> Path|None:
         """Return `corresponding_keep_path` as absolute Path"""
         self._no_symlink_check_registered_delete(delete_path)
         self._fix_symlinks_to_deleted_or_moved_files(delete_path, corresponding_keep_path)
         return Path(corresponding_keep_path).absolute() if corresponding_keep_path else None
 
-    def _registered_move_or_rename(self, from_path: str, to_path, *, is_move) -> Path:
+    def _registered_move_or_rename(self, from_path: str, to_path: str|FsPath, *, is_move: bool) -> Path:
         """Return `to_path` as absolute Path"""
         assert isinstance(from_path, str)
         assert os.path.isabs(from_path), f"Expected absolute path, got '{from_path}'"
@@ -189,20 +192,18 @@ class FileHandler(FileGroups):
         self._fix_symlinks_to_deleted_or_moved_files(from_path, to_path)
         return res
 
-    def registered_move(self, from_path: str, to_path) -> Path:
+    def registered_move(self, from_path: str, to_path: str|FsPath) -> Path:
         """Return `to_path` as absolute Path"""
         return self._registered_move_or_rename(from_path, to_path, is_move=True)
 
-    def registered_rename(self, from_path: str, to_path) -> Path:
+    def registered_rename(self, from_path: str, to_path: str|FsPath) -> Path:
         """Return `to_path` as absolute Path"""
         return self._registered_move_or_rename(from_path, to_path, is_move=False)
 
-    @contextmanager
-    def stats(self):
+    def stats(self) -> None:
         log = _LOG.getChild("stats")
         lvl = logging.INFO
         if not log.isEnabledFor(lvl):
-            yield
             return
 
         prefix = ''
@@ -218,10 +219,3 @@ class FileHandler(FileGroups):
         log.log(lvl, "%srenamed: %s", prefix, self.num_renamed)
         log.log(lvl, "%smoved: %s", prefix, self.num_moved)
         log.log(lvl, "%srelinked: %s", prefix, self.num_relinked)
-
-        try:
-            yield
-
-        finally:
-            if self.dry_run:
-                log.log(lvl, "*** DRY RUN ***")

{file_groups-0.3.1 → file_groups-0.4.0}/src/handler_compare.py

@@ -29,7 +29,7 @@ class FileHandlerCompare(FileHandler):
             protect_exclude: re.Pattern|None = None, work_include: re.Pattern|None = None,
             config_files: ConfigFiles|None = None,
             dry_run: bool,
-            delete_symlinks_instead_of_relinking=False):
+            delete_symlinks_instead_of_relinking: bool = False):
         super().__init__(
             protect_dirs_seq=protect_dirs_seq, work_dirs_seq=work_dirs_seq,
             protect_exclude=protect_exclude, work_include=work_include,

file_groups-0.4.0/src/types.py

@@ -0,0 +1,5 @@
+from os import DirEntry
+from pathlib import Path
+
+
+FsPath = DirEntry|Path

{file_groups-0.3.1 → file_groups-0.4.0}/test/groups/utils.py

@@ -58,7 +58,7 @@ class FGC():
         group = getattr(self.fg, group_name)
         return getattr(group, attr_name)
 
-    def ckfl(self, attr_name, *rel_paths: str):
+    def ckfl(self, attr_name, *rel_paths: str|os.PathLike):
         self.checked.add(attr_name)
         return ckfl(attr_name, self._ggetattr(attr_name), *rel_paths)
 

{file_groups-0.3.1 → file_groups-0.4.0}/test/handler/core_test.py

@@ -412,8 +412,8 @@ def test_stats(duplicates_dir, log_debug):
     ck = FP(fh, str(Path('df/f11').absolute()), 'df/z', log_debug)
 
     assert ck.check_rename(dry=True)
-    with fh.stats():
-        print('did nothing')
+    fh.stats()
+    print('did nothing')
 
     out = log_debug.text
     assert 'DRY' in out
@@ -421,8 +421,8 @@ def test_stats(duplicates_dir, log_debug):
     log_debug.clear()
 
     assert ck.check_rename(dry=False)
-    with fh.stats():
-        print('did stuff')
+    fh.stats()
+    print('did stuff')
 
     out = log_debug.text
     assert 'DRY' not in out
@@ -436,8 +436,7 @@ def test_no_info_log_stats(duplicates_dir, caplog):
     FP(fh, str(Path('df/f11').absolute()), 'df/z', caplog)
 
     caplog.set_level(logging.WARNING)
-    with fh.stats():
-        pass
+    fh.stats()
 
     out = caplog.text
     assert "DRY" not in out

file_groups-0.3.1/src/types.py

@@ -1,6 +0,0 @@
-from os import DirEntry
-from pathlib import Path
-from typing import Union
-
-
-FsPath = Union[DirEntry, Path]