Fix GitHub CI

Author: bernhardkaindl

pyproject.toml

@@ -71,11 +71,6 @@ mypy = [
     "types-six",
     "types-toml",
 ]
-# pyre introduced two false-postives recently, pin it to prevent further surprises:
-pyre = [
-    "pyre-check == 0.9.23",
-    "pyre-extensions == 0.0.30",
-]
 pytype = [
     "pandas",
     "pytype",
@@ -198,7 +193,7 @@ exclude = [
 extraPaths = ["stubs"]
 include = ["xcp", "tests"]
 pythonPlatform = "Linux"
-pythonVersion = "3.6"
+pythonVersion = "3.11"
 reportFunctionMemberAccess = true
 reportGeneralTypeIssues = "warning"
 reportOptionalMemberAccess = "warning"

pyre_runner.py

@@ -37,4 +37,5 @@ filterwarnings=ignore:Unknown config option
 pythonpath=stubs
 # Disable when using pytest >= 7.0.0:
 # Used by pytest-pythonpath for Python >=2.7 (https://pypi.org/project/pytest-pythonpath):
-python_paths=stubs
+# Can now only be activated when using newer pytest:
+#python_paths=stubs

pytest.ini

@@ -1,4 +1,5 @@
 import os
+import sys
 import unittest
 from typing import Callable, Optional
 
@@ -11,9 +12,10 @@
     from pytest_httpserver import HTTPServer
     from werkzeug.wrappers import Request, Response
 
-    ErrorHandler = Optional[Callable[[Request], Response]]
+    ErrorHandler = Optional[Callable[[Request], Response | None]]
 except ImportError:
     pytest.skip(allow_module_level=True)
+    sys.exit(0)  # Let pyright know that this is a dead end
 
 
 class HTTPServerTestCase(unittest.TestCase):
@@ -31,7 +33,7 @@ def tearDownClass(cls):
 
     @classmethod
     def serve_file(cls, root, file_path, error_handler=None, real_path=None):
-        # type:(str, str, Optional[Callable[[Request], Response]], Optional[str]) -> None
+        # type:(str, str, ErrorHandler, Optional[str]) -> None
         """Expect a GET request and handle it using the local pytest_httpserver.HTTPServer"""
 
         def handle_get(request):

stubs/pyfakefs/__init__.pyi

@@ -1,19 +1,20 @@
 import unittest
 
 from pyfakefs.fake_filesystem import FakeFilesystem
+from pytest import LogCaptureFixture
 
 import xcp.accessor
 
 from .test_mountingaccessor import check_binary_read, check_binary_write
 
 
-def test_file_accessor(fs):
-    # type:(FakeFilesystem) -> None
+def test_file_accessor(fs, caplog):
+    # type(FakeFilesystem, LogCaptureFixture) -> None
     """Test FileAccessor.writeFile(), .openAddress and .access using pyfakefs"""
     accessor = xcp.accessor.createAccessor("file://repo/", False)
     assert isinstance(accessor, xcp.accessor.FileAccessor)
     check_binary_read(accessor, "/repo", fs)
-    check_binary_write(accessor, "/repo", fs)
+    check_binary_write(accessor, "/repo", fs, caplog)
 
 
 class TestAccessor(unittest.TestCase):

stubs/pyfakefs/fake_filesystem_unittest.pyi

@@ -21,13 +21,14 @@
 from io import BytesIO
 
 import pytest
-import pytest_localftpserver  # pylint: disable=unused-import # Ensure that it is installed
+import pytest_localftpserver  # Ensure that it is installed
 from six import ensure_binary, ensure_str
 
 import xcp.accessor
 
 binary_data = b"\x80\x91\xaa\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xcc\xdd\xee\xff"
 text_data = "✋➔Hello Accessor from the 🗺, download and verify ✅ me!"
+assert pytest_localftpserver
 
 
 def upload_textfile(ftpserver, accessor):