Merge pull request #700 from pypa/win-py3.13-tests

Fix tests on Python 3.13 & Windows

Author: takluyver

.github/workflows/test.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+    tags:
+      - "*"
   pull_request:
 
 concurrency:

flit_core/flit_core/config.py

@@ -4,6 +4,7 @@
 import logging
 import os
 import os.path as osp
+from os.path import isabs
 from pathlib import Path
 import re
 
@@ -163,7 +164,7 @@ def prep_toml_config(d, path):
             raise ConfigError(f"{toml_key} must be a string")
 
         normp = osp.normpath(data_dir)
-        if osp.isabs(normp):
+        if isabs_ish(normp):
             raise ConfigError(f"{toml_key} cannot be an absolute path")
         if normp.startswith('..' + os.sep):
             raise ConfigError(
@@ -233,9 +234,9 @@ def _check_glob_patterns(pats, clude):
 
         normp = osp.normpath(p)
 
-        if osp.isabs(normp):
+        if isabs_ish(normp):
             raise ConfigError(
-                '{} pattern {!r} is an absolute path'.format(clude, p)
+                f'{clude} pattern {p!r} is an absolute path'
             )
         if normp.startswith('..' + os.sep):
             raise ConfigError(
@@ -274,7 +275,7 @@ def add_scripts(self, scripts_dict):
 
 
 def description_from_file(rel_path: str, proj_dir: Path, guess_mimetype=True):
-    if osp.isabs(rel_path):
+    if isabs_ish(rel_path):
         raise ConfigError("Readme path must be relative")
 
     desc_path = proj_dir / rel_path
@@ -708,3 +709,12 @@ def pep621_people(people, group_name='author') -> dict:
     if emails:
         res[group_name + '_email'] = ", ".join(emails)
     return res
+
+
+def isabs_ish(path):
+    """Like os.path.isabs(), but Windows paths from a drive root count as absolute
+
+    isabs() worked this way up to Python 3.12 (inclusive), and where we reject
+    absolute paths, we also want to reject these odd halfway paths.
+    """
+    return os.path.isabs(path) or path.startswith(('/', '\\'))

tests/test_find_python_executable.py

@@ -1,4 +1,5 @@
 from os.path import isabs, basename, dirname
+import os
 import re
 import sys
 import venv
@@ -17,7 +18,8 @@ def test_self():
 
 
 def test_abs():
-    assert find_python_executable("/usr/bin/python") == "/usr/bin/python"
+    abs_path = "C:\\PythonXY\\python.exe" if os.name == 'nt' else '/usr/bin/python'
+    assert find_python_executable(abs_path) == abs_path
 
 
 def test_find_in_path():