Fix tox configuration for GitHub CI and Ubuntu 24.04

Author: bernhardkaindl

.github/workflows/main.yml

@@ -28,8 +28,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - python-version: '3.6'
-          os: ubuntu-20.04
         - python-version: '3.10'
           os: ubuntu-22.04
         - python-version: '3.11'

pyproject.toml

@@ -73,7 +73,7 @@ mypy = [
 ]
 # pyre introduced two false-postives recently, pin it to prevent further surprises:
 pyre = [
-    "pyre-check == 0.9.21",
+    "pyre-check == 0.9.23",
     "pyre-extensions == 0.0.30",
 ]
 pytype = [

pyre_runner.py

@@ -7,7 +7,7 @@
 import sys
 import time
 
-import mock
+from unittest import mock
 
 me = os.path.basename(__file__) + ":"
 

pytest.ini

@@ -11,7 +11,6 @@
 required_plugins =
     pytest_httpserver
     pytest-forked
-    pytest-localftpserver
     pytest-pythonpath
     pytest-subprocess
     pytest-timeout

tests/test_httpaccessor.py

@@ -43,7 +43,6 @@ def http_get_request_data(self, url, read_file, error_handler):
 
     def assert_http_get_request_data(self, url, read_file, error_handler):
         # type:(str, str, ErrorHandler) -> HTTPAccessor
-        # pyre-ignore[23]: silence false positive
         with self.http_get_request_data(url, read_file, error_handler) as (httpaccessor, ref):
             http_accessor_filehandle = httpaccessor.openAddress(read_file)
             if sys.version_info >= (3, 0):

tox.ini

@@ -5,7 +5,7 @@
 # 2. python 3.6 test and pylint warnings from changed lines
 # 3. pytype (needs Python 3.8 for best results)
 # 4. pyre and pyright checks, pytest test report as markdown for GitHub Actions summary
-envlist = py38-covcombine-check, py36-lint-test, py310-pytype, py311-pyre-mdreport
+envlist = py311-covcombine-check, py36-lint-test, py310-pytype, py311-pyre-mdreport
 isolated_build = true
 skip_missing_interpreters = true
 requires =
@@ -203,7 +203,7 @@ max-line-length = 129
 [pyre]
 commands =
     pyre: python3.11 --version -V # Needs py311-pyre, does not work with py310-pyre
-    python pyre_runner.py
+    python3.11 pyre_runner.py
     -pyright
 
 [pytype]

xcp/bootloader.py

@@ -32,7 +32,7 @@
 
 import xcp.cmd
 
-# pyre-ignore-all-errors[21]
+# pyre-ignore-all-errors[21,30]
 try:  # xenserver-release.rpm puts a branding.py into our xcp installation directory:
     from xcp import branding  # type:ignore[attr-defined] # pytype: disable=import-error
 except ImportError:  # For CI, use stubs/branding.py (./stubs is added to pythonpath)

xcp/logger.py

@@ -64,9 +64,10 @@ def openLog(lfile, level=logging.INFO):
                 h.close()
                 handler = logging.handlers.RotatingFileHandler(lfile,
                                                                maxBytes=2**31)
+            # pyre-ignore[16]
             old = fcntl.fcntl(handler.stream.fileno(), fcntl.F_GETFD)
-            fcntl.fcntl(handler.stream.fileno(),
-                        fcntl.F_SETFD, old | fcntl.FD_CLOEXEC)
+            # pyre-ignore[16]
+            fcntl.fcntl(handler.stream.fileno(), fcntl.F_SETFD, old | fcntl.FD_CLOEXEC)
 
         # or if it is not a string, assume its a file-like object
         else: