Merge pull request #125 from ArcanaFramework/exc-msg-fix

Fix message in value error raised when no paths

Author: tclose

.github/workflows/ci-cd.yml

@@ -48,7 +48,7 @@ jobs:
     - name: Install Extras Package
       run: python3 -m pip install -e ./extras[test,application,image,vendor_openxmlformats_officedocument]
     - name: MyPy
-      run: mypy --install-types --non-interactive --no-warn-unused-ignores .
+      run: mypy --install-types --non-interactive --no-warn-unused-ignores --python-version "${{ matrix.python-version }}" .
     - name: Pytest
       run: pytest -vvs --cov fileformats --cov-config .coveragerc --cov-report xml .
     - name: Upload coverage to Codecov

extras/fileformats/extras/application/archive.py

@@ -1,17 +1,17 @@
 import os.path
-import sys
-import typing as ty
-import tempfile
 import tarfile
+import tempfile
+import typing as ty
 import zipfile
 from pathlib import Path
+
 from pydra.compose import python
-from fileformats.generic import FsObject
-from fileformats.core.utils import set_cwd
-from fileformats.core.typing import PathType
-from fileformats.core import converter, FileSet
-from fileformats.application import Zip, Tar, TarGzip
 
+from fileformats.application import Tar, TarGzip, Zip
+from fileformats.core import FileSet, converter
+from fileformats.core.typing import PathType
+from fileformats.core.utils import set_cwd
+from fileformats.generic import FsObject
 
 TAR_COMPRESSION_TYPES = ["", "gz", "bz2", "xz"]
 
@@ -162,23 +162,13 @@ def create_zip(
 
     out_file = out_file.absolute()
 
-    zip_kwargs = {}
-    if not strict_timestamps:  # Truthy is the default in earlier versions
-        if sys.version_info.major <= 3 and sys.version_info.minor < 8:
-            raise Exception(
-                "Must be using Python >= 3.8 to pass "
-                f"strict_timestamps={strict_timestamps!r}"
-            )
-
-        zip_kwargs["strict_timestamps"] = strict_timestamps
-
     with zipfile.ZipFile(
         out_file,
         mode="w",
         compression=compression,
         allowZip64=allowZip64,
         compresslevel=compresslevel,
-        **zip_kwargs,
+        strict_timestamps=strict_timestamps,
     ) as zfile, set_cwd(base_dir):
         for fspath in in_file.fspaths:
             fspath = Path(fspath)

fileformats/core/fileset.py

@@ -23,8 +23,8 @@
 else:
     from typing_extensions import TypeAlias
 
-from fileformats.core.typing import Self
 from fileformats.core.converter_helpers import SubtypeVar
+from fileformats.core.typing import Self
 from fileformats.core.utils import _excluded_subpackages
 
 from .classifier import Classifier
@@ -119,8 +119,6 @@ def __init__(
         metadata: ty.Optional[ty.Dict[str, ty.Any]] = None,
         **load_kwargs: ty.Any,
     ):
-        if not fspaths:
-            raise ValueError("No file-system paths provided to FileSet")
         self._explicit_metadata = metadata
         self._load_kwargs = load_kwargs
         self._validate_class()
@@ -137,7 +135,7 @@ def __init__(
 
     def _validate_fspaths(self) -> None:
         if not self.fspaths:
-            raise ValueError(f"No file-system paths provided to {self}")
+            raise ValueError(f"No file-system paths provided to {type(self)}")
         missing = [p for p in self.fspaths if not p or not p.exists()]
         if missing:
             missing_str = "\n".join(str(p) for p in missing)

pyproject.toml

@@ -92,7 +92,7 @@ exclude = "fileformats/core/_version.py"
 
 
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.9"
 ignore_missing_imports = true
 strict = true
 namespace_packages = true