Skip to contentSkip to conversation

python: fix msys2 CI tests

PATCH In review John Snow 4 participants 5 messages Jan 30 – Feb 2

lore
Share & tools
lore

John Snow

author
#0 lore raw

cover python: fix msys2 CI tests

CI: https://gitlab.com/jsnow/qemu/-/pipelines/2294908892

The CI isn't completely green, but I *think* the remaining issues are not directly related to the issue at hand. Re-running some jobs and submitting to get a quick fix into origin/master. See commit for actual info.

--js

John Snow (1):
python: fix msys64 wheel directory specification

 python/scripts/mkvenv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.52.0
author
#1 lore raw

PATCH 1/1 python: fix msys64 wheel directory specification

In python3.14, fixes were made to the file URI parsing [1] such that file URIs that used to work but were technically out of spec are now broken.

As a result, our msys2 GitLab CI tests began failing.

Stop using "file://" URI links in favor of simple paths (Thanks pbo) to fix parsing errors under Python 3.14 and fix the msys2 GitLab CI tests.

[1] https://docs.python.org/3/whatsnew/3.14.html#urllib

---
 python/scripts/mkvenv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
python/scripts/mkvenv.py +1 -1
index a064709e6ce..5cba5770d22 100644
@@ -683,7 +683,7 @@ def pip_install(
     if not online:
         full_args += ["--no-index"]
     if wheels_dir:
-        full_args += ["--find-links", f"file://{str(wheels_dir)}"]
+        full_args += ["--find-links", str(wheels_dir)]
     full_args += list(args)
     subprocess.run(
         full_args,
Signature · 1 line
2.52.0
Reviewed-by Tested-by on v1 1/1
#2 lore raw

Re: [PATCH 1/1] python: fix msys64 wheel directory specification

Quoted 9 lines · John Snow

In python3.14, fixes were made to the file URI parsing [1] such that file URIs that used to work but were technically out of spec are now broken.

As a result, our msys2 GitLab CI tests began failing.

Stop using "file://" URI links in favor of simple paths (Thanks pbo) to fix parsing errors under Python 3.14 and fix the msys2 GitLab CI tests.

Quoted 8 lines

[1] https://docs.python.org/3/whatsnew/3.14.html#urllib

---
  python/scripts/mkvenv.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks for this patch John!
I can confirm it solved the problem on my side as well, and works on windows/macos/linux/netbsd/freebsd.

Regards,
Pierrick

#3 lore raw

Re: [PATCH 1/1] python: fix msys64 wheel directory specification

Quoted 19 lines · Pierrick Bouvier
Quoted 9 lines · John Snow

In python3.14, fixes were made to the file URI parsing [1] such that file URIs that used to work but were technically out of spec are now broken.

As a result, our msys2 GitLab CI tests began failing.

Stop using "file://" URI links in favor of simple paths (Thanks pbo) to fix parsing errors under Python 3.14 and fix the msys2 GitLab CI tests.

Quoted 8 lines

[1] https://docs.python.org/3/whatsnew/3.14.html#urllib

---
  python/scripts/mkvenv.py | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 9 lines

Thanks for this patch John!
I can confirm it solved the problem on my side as well, and works on windows/macos/linux/ netbsd/freebsd.

Regards,
Pierrick

Thanks. Applied directly to master as a build fix.

r~

#4 lore raw

Re: [PATCH 1/1] python: fix msys64 wheel directory specification

In reply to John Snow
Quoted 10 lines · John Snow

In python3.14, fixes were made to the file URI parsing [1] such that file URIs that used to work but were technically out of spec are now broken.

As a result, our msys2 GitLab CI tests began failing.

Stop using "file://" URI links in favor of simple paths (Thanks pbo) to fix parsing errors under Python 3.14 and fix the msys2 GitLab CI tests.

[1] https://docs.python.org/3/whatsnew/3.14.html#urllib

I'm picking this up for current stable series too. Please let me know if I shouldn't.

Thanks,

/mjt