Merge remote-tracking branch 'origin/main' into subclassing

Author: normanrz

upath/tests/conftest.py

@@ -1,18 +1,17 @@
 import os
+import shutil
 import tempfile
 from pathlib import Path
 import subprocess
 import shlex
 import time
 import sys
-from gcsfs.core import GCSFileSystem
 
 import pytest
 from fsspec.implementations.local import LocalFileSystem
 from fsspec.registry import register_implementation, _registry
 
 import fsspec
-import requests
 
 
 def pytest_addoption(parser):
@@ -85,11 +84,18 @@ def pathlib_base(local_testdir):
 
 @pytest.fixture(scope="session")
 def htcluster():
-    proc = subprocess.Popen(
-        shlex.split("htcluster startup"),
-        stderr=subprocess.DEVNULL,
-        stdout=subprocess.DEVNULL,
-    )
+    try:
+        proc = subprocess.Popen(
+            shlex.split("htcluster startup"),
+            stderr=subprocess.DEVNULL,
+            stdout=subprocess.DEVNULL,
+        )
+    except FileNotFoundError as err:
+        if err.errno == 2 and 'htcluster' == err.filename:
+            pytest.skip("htcluster not installed")
+        else:
+            raise
+
     time.sleep(30)
     yield
     proc.terminate()
@@ -197,6 +203,11 @@ def docker_gcs():
         # assume using real API or otherwise have a server already set up
         yield os.environ["STORAGE_EMULATOR_HOST"]
         return
+
+    requests = pytest.importorskip("requests")
+    if shutil.which("docker") is None:
+        pytest.skip("docker not installed")
+
     container = "gcsfs_test"
     cmd = (
         "docker run -d -p 4443:4443 --name gcsfs_test fsouza/fake-gcs-server:latest -scheme "  # noqa: E501
@@ -223,6 +234,11 @@ def docker_gcs():
 
 @pytest.fixture
 def gcs(docker_gcs, tempdir, local_testdir, populate=True):
+    try:
+        from gcsfs.core import GCSFileSystem
+    except ImportError:
+        pytest.skip("gcsfs not installed")
+
     # from gcsfs.credentials import GoogleCredentials
     GCSFileSystem.clear_instance_cache()
     gcs = fsspec.filesystem("gcs", endpoint_url=docker_gcs)

upath/tests/implementations/test_http.py

@@ -1,8 +1,15 @@
 import pytest  # noqa: F401
 
+from fsspec import get_filesystem_class
+
 from upath import UPath
 from upath.implementations.http import HTTPPath
 
+try:
+    get_filesystem_class("http")
+except ImportError:
+    pytestmark = pytest.mark.skip
+
 
 def test_httppath():
     path = UPath("http://example.com")