Drop testing on Python 3.7 and add testing on Python 3.13

With cryptography version 44.0 including deprecation warnings for Python
3.7 with plans to drop support in its next release, this commit updates
the test matrix to drop Python 3.7 and add Python 3.13.

This commit also fixes a few issues that caused failures on Windows with
Python 3.8 and later. With these changes, Windows tests should be able
to run on all currently supported versions of Python.

This commit also updates the supported versions in the project metadata.

Author: ronf

.github/workflows/run_tests.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - os: macos-latest
             python-version: "3.10"
@@ -19,22 +19,9 @@ jobs:
           - os: macos-latest
             python-version: "3.12"
             openssl-version: "3"
-        exclude:
-          # having trouble with arch arm64 on macos-ltest on Python 3.7
           - os: macos-latest
-            python-version: "3.7"
-
-          # test hangs on these combination
-          - os: windows-latest
-            python-version: "3.8"
-          - os: windows-latest
-            python-version: "3.9"
-          - os: windows-latest
-            python-version: "3.10"
-          - os: windows-latest
-            python-version: "3.11"
-          - os: windows-latest
-            python-version: "3.12"
+            python-version: "3.13"
+            openssl-version: "3"
 
     runs-on: ${{ matrix.os }}
     env:

asyncssh/sftp.py

@@ -7534,6 +7534,11 @@ def readlink(self, path: bytes) -> MaybeAwait[bytes]:
         """
 
         path = os.readlink(_to_local_path(self.map_path(path)))
+
+        if sys.platform == 'win32' and \
+                path.startswith('\\\\?\\'): # pragma: no cover
+            path = path[4:]
+
         return self.reverse_map_path(_from_local_path(path))
 
     def symlink(self, oldpath: bytes, newpath: bytes) -> MaybeAwait[None]:
@@ -7799,7 +7804,13 @@ async def mkdir(self, path: bytes) -> None:
     async def readlink(self, path: bytes) -> bytes:
         """Return the target of a local symbolic link"""
 
-        return _from_local_path(os.readlink(_to_local_path(path)))
+        path = os.readlink(_to_local_path(path))
+
+        if sys.platform == 'win32' and \
+                path.startswith('\\\\?\\'): # pragma: no cover
+            path = path[4:]
+
+        return _from_local_path(path)
 
     async def symlink(self, oldpath: bytes, newpath: bytes) -> None:
         """Create a local symbolic link"""

pyproject.toml

@@ -15,12 +15,12 @@ classifiers = [
     'License :: OSI Approved',
     'Operating System :: MacOS :: MacOS X',
     'Operating System :: POSIX',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Topic :: Internet',
     'Topic :: Security :: Cryptography',
     'Topic :: Software Development :: Libraries :: Python Modules',

tests/server.py

@@ -26,6 +26,7 @@
 import signal
 import socket
 import subprocess
+import sys
 
 import asyncssh
 from asyncssh.misc import async_context_manager
@@ -269,17 +270,20 @@ async def asyncSetUpClass(cls):
         if 'XAUTHORITY' in os.environ: # pragma: no cover
             del os.environ['XAUTHORITY']
 
-        try:
-            output = run('ssh-agent -a agent 2>/dev/null')
-        except subprocess.CalledProcessError: # pragma: no cover
-            cls._agent_pid = None
-        else:
-            cls._agent_pid = int(output.splitlines()[2].split()[3][:-1])
+        if sys.platform != 'win32':
+            try:
+                output = run('ssh-agent -a agent 2>/dev/null')
+            except subprocess.CalledProcessError: # pragma: no cover
+                cls._agent_pid = None
+            else:
+                cls._agent_pid = int(output.splitlines()[2].split()[3][:-1])
 
-            os.environ['SSH_AUTH_SOCK'] = 'agent'
+                os.environ['SSH_AUTH_SOCK'] = 'agent'
 
-            async with asyncssh.connect_agent() as agent:
-                await agent.add_keys([ckey_ecdsa, (ckey, ckey_cert)])
+                async with asyncssh.connect_agent() as agent:
+                    await agent.add_keys([ckey_ecdsa, (ckey, ckey_cert)])
+        else: # pragma: no cover
+            cls._agent_pid = None
 
         with open('ssh-keysign', 'wb'):
             pass
@@ -288,14 +292,14 @@ async def asyncSetUpClass(cls):
     async def asyncTearDownClass(cls):
         """Shut down test server and agent"""
 
+        cls._server.close()
+        await cls._server.wait_closed()
+
         tasks = all_tasks()
         tasks.remove(current_task())
 
         await asyncio.gather(*tasks, return_exceptions=True)
 
-        cls._server.close()
-        await cls._server.wait_closed()
-
         if cls._agent_pid: # pragma: no branch
             os.kill(cls._agent_pid, signal.SIGTERM)
 

tests/test_config.py

@@ -502,7 +502,7 @@ def test_uid_percent_expansion_unavailable(self):
         def mock_hasattr(obj, attr):
             if obj == os and attr == 'getuid':
                 return False
-            else:
+            else: # pragma: no cover
                 return orig_hasattr(obj, attr)
 
         with self.assertRaises(asyncssh.ConfigParseError):

tests/test_connection_auth.py

@@ -1280,7 +1280,8 @@ async def test_agent_auth_failure(self):
     async def test_agent_auth_unset(self):
         """Test connecting with no local keys and no ssh-agent configured"""
 
-        with patch.dict(os.environ, HOME='xxx', SSH_AUTH_SOCK=''):
+        with patch.dict(os.environ, HOME='xxx', USERPROFILE='xxx',
+                        SSH_AUTH_SOCK=''):
             with self.assertRaises(asyncssh.PermissionDenied):
                 await self.connect(username='ckey',
                                    known_hosts='.ssh/known_hosts')

tests/test_sftp.py

@@ -704,7 +704,12 @@ def _check_stat_v4(self, sftp_stat, local_stat):
     def _check_link(self, link, target):
         """Check if a symlink points to the right target"""
 
-        self.assertEqual(os.readlink(link), target)
+        link = os.readlink(link)
+
+        if link.startswith('\\\\?\\'): # pragma: no cover
+            link = link[4:]
+
+        self.assertEqual(link, target)
 
 
 class _TestSFTP(_CheckSFTP):

tox.ini

@@ -1,10 +1,10 @@
 [tox]
-minversion = 3.7
+minversion = 3.8
 skip_missing_interpreters = True
 envlist =
     clean
     report
-    py3{7,8,9,10,11,12}-{linux,darwin,windows}
+    py3{8,9,10,11,12,13}-{linux,darwin,windows}
 
 [testenv]
 deps =
@@ -53,7 +53,7 @@ commands =
     coverage html
     coverage xml
 depends =
-    py3{7,8,9,10,11,12}-{linux,darwin,windows}
+    py3{8,9,10,11,12,13}-{linux,darwin,windows}
 
 [pytest]
 testpaths = tests