Merge updates from master

This commit is contained in:
Repository mirror & CI
2025-05-08 19:24:49 +00:00
39 changed files with 222 additions and 50 deletions

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_TESTED=( python3_{10..13} pypy3 pypy3_11 )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t python3_14 python3_14t )
inherit distutils-r1

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1

View File

@@ -5,7 +5,7 @@
EAPI=8
DISTUTILS_USE_PEP517=standalone
PYTHON_COMPAT=( python3_{11..13} python3_13t pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi
@@ -32,7 +32,7 @@ distutils_enable_tests pytest
python_test() {
local EPYTEST_DESELECT=()
case ${EPYTHON} in
python3.13*)
python3.1[34]*)
EPYTEST_DESELECT+=(
# https://github.com/spulec/freezegun/issues/547
tests/test_datetimes.py::TestUnitTestMethodDecorator::test_method_decorator_works_on_unittest_kwarg_frozen_time

View File

@@ -5,7 +5,7 @@
EAPI=8
DISTUTILS_USE_PEP517=no
PYTHON_COMPAT=( pypy3_11 python3_{11..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=hatchling
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=standalone
PYTHON_TESTED=( pypy3 pypy3_11 python3_{10..13} )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t python3_14 python3_14t )
inherit distutils-r1

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=hatchling
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1

View File

@@ -5,7 +5,7 @@
EAPI=8
DISTUTILS_USE_PEP517=no
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYPI_PN=${PN/-/.}
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1 pypi

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYPI_PN=${PN/-/.}
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYPI_PN=${PN/-/.}
PYTHON_COMPAT=( python3_{11..13} python3_13t pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYPI_PN=${PN/-/.}
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1 pypi

View File

@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=flit
PYPI_PN=${PN/-/.}
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -5,7 +5,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{11..13} python3_13t pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1 pypi

View File

@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYTHON_TESTED=( python3_{10..13} pypy3 pypy3_11 )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t python3_14 python3_14t )
inherit distutils-r1 pypi

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_TESTED=( python3_{11..13} pypy3_11 )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t python3_14{,t} )
inherit distutils-r1 pypi

View File

@@ -6,7 +6,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
PYTHON_FULLY_TESTED=( python3_{10..13} pypy3 )
PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" pypy3_11 python3_13t )
PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" pypy3_11 python3_13t python3_14 python3_14t )
inherit distutils-r1 pypi

View File

@@ -5,7 +5,7 @@
EAPI=8
DISTUTILS_USE_PEP517=standalone
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -8,7 +8,7 @@ EAPI=8
DISTUTILS_USE_PEP517=standalone
PYTHON_TESTED=( python3_{11..13} pypy3_11 )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t python3_14 python3_14t )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1 pypi

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi

View File

@@ -4,8 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_TESTED=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1 pypi
@@ -26,20 +25,13 @@ RDEPEND="
BDEPEND="
dev-python/setuptools-scm[${PYTHON_USEDEP}]
test? (
$(python_gen_cond_dep '
dev-python/pytest-freezer[${PYTHON_USEDEP}]
' "${PYTHON_TESTED[@]}")
dev-python/pytest-freezer[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest
python_test() {
if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
einfo "Skipping tests on ${EPYTHON}"
return
fi
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
epytest -p freezer
}

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( pypy3_11 python3_{11..13} python3_13t )
PYTHON_COMPAT=( pypy3_11 python3_{11..14} python3_1{3t,4t} )
inherit distutils-r1 pypi

View File

@@ -0,0 +1,41 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi
DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
HOMEPAGE="
https://pypi.org/project/typing-extensions/
https://github.com/python/typing_extensions/
"
LICENSE="PSF-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="
>=dev-python/flit-core-3.11[${PYTHON_USEDEP}]
test? (
dev-python/test[${PYTHON_USEDEP}]
)
"
distutils_enable_tests unittest
PATCHES=(
# https://github.com/python/typing_extensions/pull/566
# https://github.com/python/typing_extensions/pull/592
"${FILESDIR}/${P}-py314.patch"
)
python_test() {
cd src || die
eunittest
}

View File

@@ -0,0 +1,125 @@
From 36877e99122e8df90d4aa41d414999857d6d852d Mon Sep 17 00:00:00 2001
From: shenxianpeng <xianpeng.shen@gmail.com>
Date: Sun, 16 Mar 2025 01:35:32 +0800
Subject: [PATCH] Fixed test failures (#651)
---
tests/test_bdist_wheel.py | 4 ++--
tests/test_tagopt.py | 18 +++++++++---------
tests/testdata/unicode.dist/setup.py | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
index fcb2dfc..21eddd0 100644
--- a/tests/test_bdist_wheel.py
+++ b/tests/test_bdist_wheel.py
@@ -79,9 +79,9 @@ def test_no_scripts(wheel_paths):
def test_unicode_record(wheel_paths):
- path = next(path for path in wheel_paths if "unicode.dist" in path)
+ path = next(path for path in wheel_paths if "unicode_dist" in path)
with ZipFile(path) as zf:
- record = zf.read("unicode.dist-0.1.dist-info/RECORD")
+ record = zf.read("unicode_dist-0.1.dist-info/RECORD")
assert "åäö_日本語.py".encode() in record
diff --git a/tests/test_tagopt.py b/tests/test_tagopt.py
index 5335af4..5733e1a 100644
--- a/tests/test_tagopt.py
+++ b/tests/test_tagopt.py
@@ -14,7 +14,7 @@ SETUP_PY = """\
from setuptools import setup, Extension
setup(
- name="Test",
+ name="test",
version="1.0",
author_email="author@example.com",
py_modules=["test"],
@@ -63,7 +63,7 @@ def test_default_tag(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name == f"Test-1.0-py{sys.version_info[0]}-none-any.whl"
+ assert wheels[0].name == f"test-1.0-py{sys.version_info[0]}-none-any.whl"
assert wheels[0].suffix == ".whl"
@@ -76,7 +76,7 @@ def test_build_number(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name == f"Test-1.0-1-py{sys.version_info[0]}-none-any.whl"
+ assert wheels[0].name == f"test-1.0-1-py{sys.version_info[0]}-none-any.whl"
assert wheels[0].suffix == ".whl"
@@ -89,7 +89,7 @@ def test_explicit_tag(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name.startswith("Test-1.0-py32-")
+ assert wheels[0].name.startswith("test-1.0-py32-")
assert wheels[0].suffix == ".whl"
@@ -101,7 +101,7 @@ def test_universal_tag(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name.startswith("Test-1.0-py2.py3-")
+ assert wheels[0].name.startswith("test-1.0-py2.py3-")
assert wheels[0].suffix == ".whl"
@@ -114,7 +114,7 @@ def test_universal_beats_explicit_tag(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name.startswith("Test-1.0-py2.py3-")
+ assert wheels[0].name.startswith("test-1.0-py2.py3-")
assert wheels[0].suffix == ".whl"
@@ -129,7 +129,7 @@ def test_universal_in_setup_cfg(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name.startswith("Test-1.0-py2.py3-")
+ assert wheels[0].name.startswith("test-1.0-py2.py3-")
assert wheels[0].suffix == ".whl"
@@ -144,7 +144,7 @@ def test_pythontag_in_setup_cfg(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name.startswith("Test-1.0-py32-")
+ assert wheels[0].name.startswith("test-1.0-py32-")
assert wheels[0].suffix == ".whl"
@@ -157,7 +157,7 @@ def test_legacy_wheel_section_in_setup_cfg(temp_pkg):
assert dist_dir.is_dir()
wheels = list(dist_dir.iterdir())
assert len(wheels) == 1
- assert wheels[0].name.startswith("Test-1.0-py2.py3-")
+ assert wheels[0].name.startswith("test-1.0-py2.py3-")
assert wheels[0].suffix == ".whl"
diff --git a/tests/testdata/unicode.dist/setup.py b/tests/testdata/unicode.dist/setup.py
index ec66d1e..46ef0a1 100644
--- a/tests/testdata/unicode.dist/setup.py
+++ b/tests/testdata/unicode.dist/setup.py
@@ -3,7 +3,7 @@ from __future__ import annotations
from setuptools import setup
setup(
- name="unicode.dist",
+ name="unicode_dist",
version="0.1",
description="A testing distribution \N{SNOWMAN}",
packages=["unicodedist"],

View File

@@ -5,7 +5,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 )
PYTHON_COMPAT=( python3_{11..14} python3_1{3t,4t} pypy3_11 )
inherit distutils-r1 pypi
@@ -28,14 +28,14 @@ BDEPEND="
)
"
EPYTEST_DESELECT=(
# fails if any setuptools plugin imported the module first
tests/test_bdist_wheel.py::test_deprecated_import
)
distutils_enable_tests pytest
src_prepare() {
local PATCHES=(
# https://github.com/pypa/wheel/pull/651
"${FILESDIR}/${P}-test.patch"
)
distutils-r1_src_prepare
# unbundle packaging
@@ -46,6 +46,17 @@ src_prepare() {
}
python_test() {
local EPYTEST_DESELECT=(
# fails if any setuptools plugin imported the module first
tests/test_bdist_wheel.py::test_deprecated_import
# broken by setuptools license changes
# upstream removed the tests already
tests/test_bdist_wheel.py::test_licenses_default
tests/test_bdist_wheel.py::test_licenses_deprecated
tests/test_bdist_wheel.py::test_licenses_override
)
local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
epytest
}

View File

@@ -2030,7 +2030,10 @@ _distutils-r1_post_python_compile() {
ln -s "${PYTHON}" "${bindir}/${EPYTHON}" || die
ln -s "${EPYTHON}" "${bindir}/python3" || die
ln -s "${EPYTHON}" "${bindir}/python" || die
# python3.14t seems to require "home" being present
# (though it does not seem to care about the actual value)
cat > "${bindir}"/pyvenv.cfg <<-EOF || die
home = ${EPREFIX}/usr/bin
include-system-site-packages = true
EOF

View File

@@ -1 +1 @@
DIST memtest86-bin-11.2.zip 12176449 BLAKE2B af394e83d0cd17f1b7f0e5ad5b5af900349bda04b19051ac26d245afa1f2984789fd6fd4960c5ab76ae2d2802ef466e87fdc4595dc35e2372ea485f2bca9382e SHA512 cecfa045c00c2b53e2013a1670298ea240116e23df47dc26229c6c04944ff8409037eeeb34042400a23a3e8a26d7dfb34c461995deaf00d59047e81ef13fcb11
DIST memtest86-bin-11.3.zip 12214283 BLAKE2B e2348e7637de38447bf57876ead3dceef855c540299680113196c0f9b842f25cb1874e85537369e9a3513216140811a28d53d897da7047bb7a811e129ae7049c SHA512 3115bff7d7c0944d3c7cb7fc4ae646f523f47b7156ad4ac543d9ad697e32c57cb088410e1f8a82b25e3a60aa2db0fba14933d8b5548bc4538c65ec687b03f756