Run tests on more platforms (#93)

* bump checkout action to v6

* run tests on macos, more python versions

* update old actions, use newer python version to build docs

* split test setup into `conftest.py`

* do not test so many python versions to avoid overloading the CI

* 3.11 for full coverage

* 3.13 as well -  it's fine to overload the CI

---------

Co-authored-by: Lindsey Gray <lindsey.gray@gmail.com>

Author: lobis

.github/workflows/cd.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v3
@@ -39,8 +39,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.14"]
-        runs-on: [ubuntu-latest]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        runs-on: [ubuntu-latest, macos-latest]
     defaults:
       run:
         shell: bash -l {0}

.github/workflows/docs.yml

@@ -17,9 +17,9 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.14
 
       - name: Install package
         run: python -m pip install -e .[docs]

tests/conftest.py

@@ -0,0 +1,64 @@
+"""Test basic IO against a xrootd server fixture"""
+
+from __future__ import annotations
+
+import os
+import shutil
+import socket
+import subprocess
+import time
+
+import fsspec
+import pytest
+
+XROOTD_PORT = 1094
+
+
+def require_port_availability(port: int) -> bool:
+    """Raise an exception if the given port is already in use."""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        if s.connect_ex(("localhost", port)) == 0:
+            raise RuntimeError(f"This test requires port {port} to be available")
+
+    return True
+
+
+@pytest.fixture(scope="module")
+def localserver(tmpdir_factory):
+    require_port_availability(XROOTD_PORT)
+
+    srvdir = tmpdir_factory.mktemp("srv")
+    tempPath = os.path.join(srvdir, "Folder")
+    os.mkdir(tempPath)
+    cfgfile = os.path.join(srvdir, "xrd.cfg")
+    with open(cfgfile, "w") as fout:
+        fout.write("all.export /Folder\n")
+        fout.write(f"oss.localroot {srvdir}\n")
+    xrdexe = shutil.which("xrootd")
+    proc = subprocess.Popen([xrdexe, "-p", str(XROOTD_PORT), "-c", cfgfile])
+    time.sleep(2)  # give it some startup
+    yield "root://localhost//Folder", tempPath
+    proc.terminate()
+    proc.wait(timeout=10)
+
+
+@pytest.fixture()
+def clear_server(localserver):
+    remoteurl, localpath = localserver
+    fs, _, _ = fsspec.get_fs_token_paths(remoteurl)
+    # The open file handles on client side imply an open file handle on the server,
+    # so removing the directory doesn't actually work until the client closes its handles!
+    fs.invalidate_cache()
+    shutil.rmtree(localpath)
+    os.mkdir(localpath)
+    yield
+
+
+def test_ping(localserver, clear_server):
+    remoteurl, localpath = localserver
+    from XRootD import client
+
+    fs = client.FileSystem(remoteurl)
+    status, _n = fs.ping()
+    if not status.ok:
+        raise OSError(f"Server did not run properly: {status.message}")

tests/test_basicio.py

@@ -4,9 +4,6 @@
 
 import asyncio
 import os
-import shutil
-import socket
-import subprocess
 import time
 
 import fsspec
@@ -18,61 +15,12 @@
     _vectors_to_chunks,
 )
 
-XROOTD_PORT = 1094
 TESTDATA1 = "apple\nbanana\norange\ngrape"
 TESTDATA2 = "red\ngreen\nyellow\nblue"
 sleep_time = 0.2
 expiry_time = 0.1
 
 
-def require_port_availability(port: int) -> bool:
-    """Raise an exception if the given port is already in use."""
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        if s.connect_ex(("localhost", port)) == 0:
-            raise RuntimeError(f"This test requires port {port} to be available")
-
-
-@pytest.fixture(scope="module")
-def localserver(tmpdir_factory):
-    require_port_availability(XROOTD_PORT)
-
-    srvdir = tmpdir_factory.mktemp("srv")
-    tempPath = os.path.join(srvdir, "Folder")
-    os.mkdir(tempPath)
-    cfgfile = os.path.join(srvdir, "xrd.cfg")
-    with open(cfgfile, "w") as fout:
-        fout.write("all.export /Folder\n")
-        fout.write(f"oss.localroot {srvdir}\n")
-    xrdexe = shutil.which("xrootd")
-    proc = subprocess.Popen([xrdexe, "-p", str(XROOTD_PORT), "-c", cfgfile])
-    time.sleep(2)  # give it some startup
-    yield "root://localhost//Folder", tempPath
-    proc.terminate()
-    proc.wait(timeout=10)
-
-
-@pytest.fixture()
-def clear_server(localserver):
-    remoteurl, localpath = localserver
-    fs, _, _ = fsspec.get_fs_token_paths(remoteurl)
-    # The open file handles on client side imply an open file handle on the server,
-    # so removing the directory doesn't actually work until the client closes its handles!
-    fs.invalidate_cache()
-    shutil.rmtree(localpath)
-    os.mkdir(localpath)
-    yield
-
-
-def test_ping(localserver, clear_server):
-    remoteurl, localpath = localserver
-    from XRootD import client
-
-    fs = client.FileSystem(remoteurl)
-    status, _n = fs.ping()
-    if not status.ok:
-        raise OSError(f"Server did not run properly: {status.message}")
-
-
 def test_invalid_server():
     with pytest.raises(ValueError):
         fsspec.core.url_to_fs("root://")