mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 01:46:58 +02:00
dev-python/wheel: Sync with Gentoo
It's from Gentoo commit e3c29ca4138fdd292dd2cdf66433983ea8fbd437.
This commit is contained in:
parent
a2fa0b326a
commit
f2654493cb
38
sdk_container/src/third_party/portage-stable/dev-python/wheel/files/wheel-0.44.0-ft.patch
vendored
Normal file
38
sdk_container/src/third_party/portage-stable/dev-python/wheel/files/wheel-0.44.0-ft.patch
vendored
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From d30f834fcec7ecdbb74e263789db2fbe9ff37e99 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||||
|
Date: Fri, 11 Oct 2024 16:12:50 +0200
|
||||||
|
Subject: [PATCH] Skip abi3 tests when freethreading Python build is used
|
||||||
|
|
||||||
|
Skip the tests using abi3 extension when the freethreading build is
|
||||||
|
used, as Python 3.13 freethreading does not support the limited API
|
||||||
|
and its use results in a build error.
|
||||||
|
|
||||||
|
Fixes #636
|
||||||
|
---
|
||||||
|
tests/conftest.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||||
|
index 5ee84da..d5bd356 100644
|
||||||
|
--- a/tests/conftest.py
|
||||||
|
+++ b/tests/conftest.py
|
||||||
|
@@ -7,6 +7,7 @@ from __future__ import annotations
|
||||||
|
import os.path
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
+import sysconfig
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
@@ -22,7 +23,7 @@ def wheels_and_eggs(tmp_path_factory):
|
||||||
|
"unicode.dist",
|
||||||
|
)
|
||||||
|
|
||||||
|
- if sys.platform != "win32":
|
||||||
|
+ if sys.platform != "win32" and sysconfig.get_config_var("Py_GIL_DISABLED") != 1:
|
||||||
|
# ABI3 extensions don't really work on Windows
|
||||||
|
test_distributions += ("abi3extension.dist",)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
@ -5,7 +5,7 @@
|
|||||||
EAPI=8
|
EAPI=8
|
||||||
|
|
||||||
DISTUTILS_USE_PEP517=flit
|
DISTUTILS_USE_PEP517=flit
|
||||||
PYTHON_COMPAT=( python3_{10..13} pypy3 )
|
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 )
|
||||||
|
|
||||||
inherit distutils-r1 pypi
|
inherit distutils-r1 pypi
|
||||||
|
|
||||||
@ -36,10 +36,20 @@ EPYTEST_DESELECT=(
|
|||||||
distutils_enable_tests pytest
|
distutils_enable_tests pytest
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
|
local PATCHES=(
|
||||||
|
# https://github.com/pypa/wheel/pull/637
|
||||||
|
"${FILESDIR}/${P}-ft.patch"
|
||||||
|
)
|
||||||
|
|
||||||
|
distutils-r1_src_prepare
|
||||||
|
|
||||||
# unbundle packaging
|
# unbundle packaging
|
||||||
rm -r src/wheel/vendored || die
|
rm -r src/wheel/vendored || die
|
||||||
sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
|
sed -i -e 's:\.vendored\.::' src/wheel/*.py || die
|
||||||
sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
|
sed -i -e 's:wheel\.vendored\.::' tests/*.py || die
|
||||||
|
}
|
||||||
distutils-r1_src_prepare
|
|
||||||
|
python_test() {
|
||||||
|
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
|
||||||
|
epytest
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user