diff --git a/poetry.lock b/poetry.lock index 697e19f..dbbcbef 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4241,4 +4241,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = ">=3.7.1,<3.13" -content-hash = "46c8ac6e52ba644414fd4d6df09fb36207b13433391a84d4e960fe7de4a99bd2" +content-hash = "2044ecb17338a42991bff2e0612fed4812780f4ba619c82e3e7d88bd4ad74131" diff --git a/pyproject.toml b/pyproject.toml index 25806d1..4d9d3eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ pyarrow = [ { version = ">=15", python = ">=3.8"} ] # Temporarily lock this version to avoid Windows install error -pycatch22 = { version = ">=0.4", platform = "~win32" } +pycatch22 = { version = ">=0.4", markers = "sys_platform != 'win32'" } antropy = [ { version = "^0.1.5", python = "<3.8" }, { version = ">=0.1.6", python = ">=3.8" } diff --git a/tests/test_features_integration.py b/tests/test_features_integration.py index 54f0300..3b980a4 100644 --- a/tests/test_features_integration.py +++ b/tests/test_features_integration.py @@ -319,6 +319,10 @@ def test_tsfel_feature_dict_wrapper(dummy_data): ## CATCH22 +@pytest.mark.skipif( + sys.platform == "win32", + reason="latest version of pycatch22 (0.4.4) fails to install on Windows", +) def test_catch22_all_features(dummy_data): # Tests if we integrate with the catch22 features from pycatch22 import catch22_all diff --git a/tsflex/features/integrations.py b/tsflex/features/integrations.py index ef97ee3..405e50d 100644 --- a/tsflex/features/integrations.py +++ b/tsflex/features/integrations.py @@ -283,7 +283,7 @@ def tsfresh_settings_wrapper(settings: Dict) -> List[Union[Callable, FuncWrapper # -------------------------------------CATCH22 ------------------------------------- -def catch22_wrapper(catch22_all: Callable, **kwargs) -> FuncWrapper: +def catch22_wrapper(catch22_all: Callable, **kwargs) -> FuncWrapper: # type: ignore[no-untyped-def] """Wrapper enabling compatibility with catch22. [catch22](https://github.com/chlubba/catch22) is a collection of 22 time series