From b66212fb9cbc852b8da3a1a9bb84cee79f8ae59c1f50372ca941a057ce7d8281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 10 Feb 2020 14:52:07 +0000 Subject: [PATCH] - add issue_254.patch to fix tests under non-x86_64 pplatforms OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-packaging?expand=0&rev=36 --- issue_254.patch | 80 ++++++++++++++++++++++++++++++++++++++++ python-packaging.changes | 5 +++ python-packaging.spec | 2 + 3 files changed, 87 insertions(+) create mode 100644 issue_254.patch diff --git a/issue_254.patch b/issue_254.patch new file mode 100644 index 0000000..0a62898 --- /dev/null +++ b/issue_254.patch @@ -0,0 +1,80 @@ +From f1d67cb7b6903c29c725fe46777d6e28757e04d5 Mon Sep 17 00:00:00 2001 +From: Marius Bakke +Date: Tue, 4 Feb 2020 09:29:23 +0100 +Subject: [PATCH] Fix test_linux_platforms_manylinux* on architectures other + than x86_64 (#256) + +* Fix test_linux_platforms_manylinux tests for i686. + + By not assuming the platform is x86_64. Fixes #254. + +* Allow test_linux_platforms_manylinux tests to pass on non x86. + + The expected output only occurs on x86 platforms, so mock it on other + architectures. + +Co-authored-by: Brett Cannon <54418+brettcannon@users.noreply.github.com> +--- + tests/test_tags.py | 30 ++++++++++++++++++------------ + 1 file changed, 18 insertions(+), 12 deletions(-) + +diff --git a/tests/test_tags.py b/tests/test_tags.py +index 1c05969..d7c1514 100644 +--- a/tests/test_tags.py ++++ b/tests/test_tags.py +@@ -435,37 +435,43 @@ def test_linux_platforms_manylinux_unsupported(self, monkeypatch): + linux_platform = list(tags._linux_platforms(is_32bit=False)) + assert linux_platform == ["linux_x86_64"] + +- def test_linux_platforms_manylinux1(self, monkeypatch): ++ def test_linux_platforms_manylinux1(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux1" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +- assert platforms == ["manylinux1_x86_64", "linux_x86_64"] ++ arch = platform.machine() ++ assert platforms == ["manylinux1_" + arch, "linux_" + arch] + +- def test_linux_platforms_manylinux2010(self, monkeypatch): ++ def test_linux_platforms_manylinux2010(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2010" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) +- expected = ["manylinux2010_x86_64", "manylinux1_x86_64", "linux_x86_64"] ++ arch = platform.machine() ++ expected = ["manylinux2010_" + arch, "manylinux1_" + arch, "linux_" + arch] + assert platforms == expected + +- def test_linux_platforms_manylinux2014(self, monkeypatch): ++ def test_linux_platforms_manylinux2014(self, is_x86, monkeypatch): + monkeypatch.setattr( + tags, "_is_manylinux_compatible", lambda name, _: name == "manylinux2014" + ) +- if platform.system() != "Linux": ++ if platform.system() != "Linux" or not is_x86: + monkeypatch.setattr(distutils.util, "get_platform", lambda: "linux_x86_64") ++ monkeypatch.setattr(platform, "machine", lambda: "x86_64") + platforms = list(tags._linux_platforms(is_32bit=False)) ++ arch = platform.machine() + expected = [ +- "manylinux2014_x86_64", +- "manylinux2010_x86_64", +- "manylinux1_x86_64", +- "linux_x86_64", ++ "manylinux2014_" + arch, ++ "manylinux2010_" + arch, ++ "manylinux1_" + arch, ++ "linux_" + arch, + ] + assert platforms == expected + diff --git a/python-packaging.changes b/python-packaging.changes index cfc0e7b..09e8ecd 100644 --- a/python-packaging.changes +++ b/python-packaging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 10 14:51:38 UTC 2020 - Ondřej Súkup + +- add issue_254.patch to fix tests under non-x86_64 pplatforms + ------------------------------------------------------------------- Wed Feb 5 13:45:06 UTC 2020 - Ondřej Súkup diff --git a/python-packaging.spec b/python-packaging.spec index a28c4ee..3b6180f 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -33,6 +33,7 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/pypa/packaging Source: https://pypi.io/packages/source/p/packaging/packaging-%{version}.tar.gz +Patch0: issue_254.patch BuildRequires: %{python_module six} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -55,6 +56,7 @@ Core utilities for Python packages %prep %setup -q -n packaging-%{version} +%patch0 -p1 # sdist must provide a packaging.egg-info, used below in install phase test -d packaging.egg-info