Merge branch 'main' into dependabot/github_actions/pypa/gh-action-pyp…

…i-publish-1.6.4

.github/workflows/ci.yml

@@ -37,24 +37,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         runs-on: [ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up Conda
-        uses: conda-incubator/setup-miniconda@v2.1.1
+        uses: conda-incubator/setup-miniconda@v2.2.0
         with:
-          mamba-version: "*"
+          python-version: ${{ matrix.python-version }}
+          miniforge-variant: Mambaforge
           channels: conda-forge,defaults
           channel-priority: true
           activate-environment: fsspec
       - name: Install build environment
         shell: bash -l {0}
         run: |
-          mamba install -c conda-forge python=${{ matrix.python-version }} "xrootd>=5.4.3"
+          mamba install -c conda-forge "xrootd>=5.4.3"
       - name: Install package
         shell: bash -l {0}
         run: python -m pip install .[test]

.pre-commit-config.yaml

@@ -43,7 +43,7 @@ repos:
         additional_dependencies: [black==22.3.0]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         args: ["-a", "from __future__ import annotations"] # Python 3.7+
@@ -84,7 +84,7 @@ repos:
         additional_dependencies: *flake8_dependencies
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.961
+    rev: v1.4.1
     hooks:
       - id: mypy
         files: src

src/fsspec_xrootd/xrootd.py

@@ -152,7 +152,7 @@ class XRootDFileSystem(AsyncFileSystem):  # type: ignore[misc]
 
     def __init__(
         self,
-        hostid: str = "",
+        hostid: str,
         asynchronous: bool = False,
         loop: Any = None,
         **storage_options: Any,
@@ -174,7 +174,7 @@ def __init__(
         self.timeout = storage_options.get("timeout", XRootDFileSystem.default_timeout)
         self._myclient = client.FileSystem("root://" + hostid)
         if not self._myclient.url.is_valid():
-            raise ValueError(f"Invalid hostid: '{hostid}'")
+            raise ValueError(f"Invalid hostid: {hostid!r}")
         storage_options.setdefault("listing_expiry_time", 0)
         self.storage_options = storage_options
 
@@ -196,7 +196,10 @@ def _get_kwargs_from_urls(u: str) -> dict[Any, Any]:
     @classmethod
     def _strip_protocol(cls, path: str | list[str]) -> Any:
         if type(path) == str:
-            return client.URL(path).path or cls.root_marker
+            if path.startswith(cls.protocol):
+                return client.URL(path).path.rstrip("/") or cls.root_marker
+            # assume already stripped
+            return path.rstrip("/") or cls.root_marker
         elif type(path) == list:
             return [cls._strip_protocol(item) for item in path]
         else:
@@ -676,6 +679,7 @@ def __init__(
                 " deprecated. "
                 "Specify it within the 'cache_options' argument instead.",
                 FutureWarning,
+                stacklevel=1,
             )
             cache_options["trim"] = kwargs.pop("trim")
 

tests/test_basicio.py

@@ -9,7 +9,11 @@
 import fsspec
 import pytest
 
-from fsspec_xrootd.xrootd import _chunks_to_vectors, _vectors_to_chunks
+from fsspec_xrootd.xrootd import (
+    XRootDFileSystem,
+    _chunks_to_vectors,
+    _vectors_to_chunks,
+)
 
 TESTDATA1 = "apple\nbanana\norange\ngrape"
 TESTDATA2 = "red\ngreen\nyellow\nblue"
@@ -53,6 +57,17 @@ def test_invalid_server():
         fsspec.core.url_to_fs("root://")
 
 
+def test_invalid_parameters():
+    with pytest.raises(TypeError):
+        fsspec.filesystem(protocol="root")
+
+
+def test_async_impl():
+    cls = fsspec.get_filesystem_class(protocol="root")
+    assert cls == XRootDFileSystem
+    assert cls.async_impl, "XRootDFileSystem should have async_impl=True"
+
+
 def test_broken_server():
     with pytest.raises(OSError):
         # try to connect on the wrong port should fail
@@ -71,9 +86,14 @@ def test_path_parsing():
     fs, _, (path,) = fsspec.get_fs_token_paths("root://server.com//blah")
     assert path == "/blah"
     fs, _, paths = fsspec.get_fs_token_paths(
-        ["root://server.com//blah", "root://server.com//more"]
+        [
+            "root://server.com//blah",
+            "root://server.com//more",
+            "root://server.com/dir/",
+            "root://serv.er//dir/",
+        ]
     )
-    assert paths == ["/blah", "/more"]
+    assert paths == ["/blah", "/more", "dir", "/dir"]
 
 
 def test_pickle(localserver, clear_server):