mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
dev-python/build: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
committed by
Conrad Kostecki
parent
b91910935c
commit
8e2aeb670c
@@ -1,102 +0,0 @@
|
||||
From 9f6e34228a0da7e5ce724f400a34bc9f4e69a1ac Mon Sep 17 00:00:00 2001
|
||||
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
|
||||
Date: Wed, 17 Jan 2024 02:44:57 -0500
|
||||
Subject: [PATCH] tests: support setuptools v69.0.3+ (#722)
|
||||
|
||||
* tests: support setuptools v69.0.3+
|
||||
|
||||
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
|
||||
|
||||
* tests: missed one more normalization fix
|
||||
|
||||
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
|
||||
|
||||
* fix: add MANIFEST.in for old setuptools in tests
|
||||
|
||||
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
|
||||
|
||||
* tests: used the wrong name
|
||||
|
||||
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
|
||||
|
||||
---------
|
||||
|
||||
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
|
||||
---
|
||||
tests/packages/test-setuptools/MANIFEST.in | 1 +
|
||||
tests/test_projectbuilder.py | 6 ++++--
|
||||
tests/test_self_packaging.py | 1 +
|
||||
tests/test_util.py | 6 ++++--
|
||||
4 files changed, 10 insertions(+), 4 deletions(-)
|
||||
create mode 100644 tests/packages/test-setuptools/MANIFEST.in
|
||||
|
||||
diff --git a/tests/packages/test-setuptools/MANIFEST.in b/tests/packages/test-setuptools/MANIFEST.in
|
||||
new file mode 100644
|
||||
index 0000000..e69e3cf
|
||||
--- /dev/null
|
||||
+++ b/tests/packages/test-setuptools/MANIFEST.in
|
||||
@@ -0,0 +1 @@
|
||||
+include pyproject.toml setup.cfg
|
||||
diff --git a/tests/test_projectbuilder.py b/tests/test_projectbuilder.py
|
||||
index d46927b..69914ab 100644
|
||||
--- a/tests/test_projectbuilder.py
|
||||
+++ b/tests/test_projectbuilder.py
|
||||
@@ -502,7 +502,8 @@ def test_metadata_path_no_prepare(tmp_dir, package_test_no_prepare):
|
||||
pathlib.Path(builder.metadata_path(tmp_dir)),
|
||||
).metadata
|
||||
|
||||
- assert metadata['name'] == 'test-no-prepare'
|
||||
+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
|
||||
+ assert metadata['name'].replace('-', '_') == 'test_no_prepare'
|
||||
assert metadata['Version'] == '1.0.0'
|
||||
|
||||
|
||||
@@ -513,7 +514,8 @@ def test_metadata_path_with_prepare(tmp_dir, package_test_setuptools):
|
||||
pathlib.Path(builder.metadata_path(tmp_dir)),
|
||||
).metadata
|
||||
|
||||
- assert metadata['name'] == 'test-setuptools'
|
||||
+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
|
||||
+ assert metadata['name'].replace('-', '_') == 'test_setuptools'
|
||||
assert metadata['Version'] == '1.0.0'
|
||||
|
||||
|
||||
diff --git a/tests/test_self_packaging.py b/tests/test_self_packaging.py
|
||||
index fb1d124..3a436ef 100644
|
||||
--- a/tests/test_self_packaging.py
|
||||
+++ b/tests/test_self_packaging.py
|
||||
@@ -27,6 +27,7 @@ sdist_files = {
|
||||
'tests/constraints.txt',
|
||||
'tests/packages/test-cant-build-via-sdist/some-file-that-is-needed-for-build.txt',
|
||||
'tests/packages/test-no-project/empty.txt',
|
||||
+ 'tests/packages/test-setuptools/MANIFEST.in',
|
||||
'tox.ini',
|
||||
}
|
||||
|
||||
diff --git a/tests/test_util.py b/tests/test_util.py
|
||||
index 8045b51..0ab81b8 100644
|
||||
--- a/tests/test_util.py
|
||||
+++ b/tests/test_util.py
|
||||
@@ -12,7 +12,8 @@ import build.util
|
||||
def test_wheel_metadata(package_test_setuptools, isolated):
|
||||
metadata = build.util.project_wheel_metadata(package_test_setuptools, isolated)
|
||||
|
||||
- assert metadata['name'] == 'test-setuptools'
|
||||
+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
|
||||
+ assert metadata['name'].replace('-', '_') == 'test_setuptools'
|
||||
assert metadata['version'] == '1.0.0'
|
||||
assert isinstance(metadata.json, dict)
|
||||
|
||||
@@ -41,7 +42,8 @@ def test_wheel_metadata_isolation(package_test_flit):
|
||||
def test_with_get_requires(package_test_metadata):
|
||||
metadata = build.util.project_wheel_metadata(package_test_metadata)
|
||||
|
||||
- assert metadata['name'] == 'test-metadata'
|
||||
+ # Setuptools < v69.0.3 (https://github.com/pypa/setuptools/pull/4159) normalized this to dashes
|
||||
+ assert metadata['name'].replace('-', '_') == 'test_metadata'
|
||||
assert str(metadata['version']) == '1.0.0'
|
||||
assert metadata['summary'] == 'hello!'
|
||||
assert isinstance(metadata.json, dict)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Reference in New Issue
Block a user