From fa5d6d7e54dc4bd4a82c4154b13d730b497a64da Mon Sep 17 00:00:00 2001 From: Mateusz Masiarz Date: Sun, 8 Jun 2025 12:36:56 +0200 Subject: [PATCH 1/3] Changes --- setup.cfg | 2 +- src/sio3pack/__init__.py | 1 + src/sio3pack/packages/sinolpack/model.py | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index a2748f2..0269f4f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,7 @@ classifiers = packages = find_namespace: packages_dir = src include_package_data = True -python_requires = >=3.9 +python_requires = >=3.10 install_requires = PyYAML diff --git a/src/sio3pack/__init__.py b/src/sio3pack/__init__.py index a611072..54eed6e 100644 --- a/src/sio3pack/__init__.py +++ b/src/sio3pack/__init__.py @@ -3,6 +3,7 @@ from sio3pack.exceptions import ImproperlyConfigured from sio3pack.files import LocalFile from sio3pack.packages.package import Package +from sio3pack.packages.sinolpack import Sinolpack __all__ = ["from_file", "from_db"] diff --git a/src/sio3pack/packages/sinolpack/model.py b/src/sio3pack/packages/sinolpack/model.py index 23f3885..8f25f52 100644 --- a/src/sio3pack/packages/sinolpack/model.py +++ b/src/sio3pack/packages/sinolpack/model.py @@ -505,10 +505,11 @@ def _process_existing_tests(self): test_id = match.group(1) group = match.group(2) test_ids.add((test_id, group, test_name)) - elif not self.configuration.allow_unrecognized_files: + elif not file.startswith('.') and not self.configuration.allow_unrecognized_files: raise ProcessPackageError( - f"Unrecognized test in {ext} directory: {file}", - f"All files in the {ext} directory should match the pattern: " f"{self._get_test_regex()}.", + f"Unrecognized file in '{ext}' directory: {file}", + f"Unrecognized file in '{ext}' directory ({file}). All files in the {ext} directory " + f"should match the pattern: " f"{self._get_test_regex()}.", ) # TODO: Sort this properly test_ids = sorted(test_ids) From 8553cb3f0d7253deb057546ca0ea051f64c0eaf4 Mon Sep 17 00:00:00 2001 From: Mateusz Masiarz Date: Sun, 8 Jun 2025 12:38:57 +0200 Subject: [PATCH 2/3] Format --- src/sio3pack/packages/sinolpack/model.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sio3pack/packages/sinolpack/model.py b/src/sio3pack/packages/sinolpack/model.py index 8f25f52..682e3a0 100644 --- a/src/sio3pack/packages/sinolpack/model.py +++ b/src/sio3pack/packages/sinolpack/model.py @@ -505,11 +505,12 @@ def _process_existing_tests(self): test_id = match.group(1) group = match.group(2) test_ids.add((test_id, group, test_name)) - elif not file.startswith('.') and not self.configuration.allow_unrecognized_files: + elif not file.startswith(".") and not self.configuration.allow_unrecognized_files: raise ProcessPackageError( f"Unrecognized file in '{ext}' directory: {file}", f"Unrecognized file in '{ext}' directory ({file}). All files in the {ext} directory " - f"should match the pattern: " f"{self._get_test_regex()}.", + f"should match the pattern: " + f"{self._get_test_regex()}.", ) # TODO: Sort this properly test_ids = sorted(test_ids) From f2f6ab25ea7947aade333996ce2313ced4c95f97 Mon Sep 17 00:00:00 2001 From: Mateusz Masiarz Date: Sun, 8 Jun 2025 12:49:09 +0200 Subject: [PATCH 3/3] Bump version --- src/sio3pack/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sio3pack/__init__.py b/src/sio3pack/__init__.py index 54eed6e..318c17b 100644 --- a/src/sio3pack/__init__.py +++ b/src/sio3pack/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.0.0.dev4" +__version__ = "1.0.0.dev5" from sio3pack.exceptions import ImproperlyConfigured from sio3pack.files import LocalFile