Merge remote-tracking branch 'upstream/main' into rm-deprecated

huggingface · Jul 1, 2024 · f91ca55 · f91ca55
2 parents 065bce0 + 100361d
commit f91ca55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -129,7 +129,7 @@
     "multiprocess",
     # to save datasets locally or on any filesystem
     # minimum 2023.1.0 to support protocol=kwargs in fsspec's `open`, `get_fs_token_paths`, etc.: see https://github.com/fsspec/filesystem_spec/pull/1143
-    "fsspec[http]>=2023.1.0,<=2024.5.0",
+    "fsspec[http]>=2023.1.0,<=2024.6.1",
     # for data streaming via http
     "aiohttp",
     # To get datasets from the Datasets Hub on huggingface.co

diff --git a/tests/utils.py b/tests/utils.py
@@ -67,18 +67,7 @@ def parse_flag_from_env(key, default=False):
 )
 
 
-def require_faiss(test_case):
-    """
-    Decorator marking a test that requires Faiss.
-
-    These tests are skipped when Faiss isn't installed.
-
-    """
-    try:
-        import faiss  # noqa
-    except ImportError:
-        test_case = unittest.skip("test requires faiss")(test_case)
-    return test_case
+require_faiss = pytest.mark.skipif(find_spec("faiss") is None or sys.platform == "win32", reason="test requires faiss")
 
 
 def require_regex(test_case):