diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch')
-rw-r--r-- | meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch b/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch deleted file mode 100644 index 42b1dc133f..0000000000 --- a/meta/recipes-devtools/python/python3-packaging/8cb9dbf19e2b76ab025efc11208bd50e09e8223e.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 8cb9dbf19e2b76ab025efc11208bd50e09e8223e Mon Sep 17 00:00:00 2001 | ||
2 | From: Moyiz <8603313+moyiz@users.noreply.github.com> | ||
3 | Date: Tue, 2 Nov 2021 21:42:53 +0200 | ||
4 | Subject: [PATCH] Revert pyparsing constraint (#482) | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | setup.py | 2 +- | ||
10 | tests/test_requirements.py | 4 +++- | ||
11 | 4 files changed, 6 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/setup.py b/setup.py | ||
14 | index c6a1caec..419aa284 100644 | ||
15 | --- a/setup.py | ||
16 | +++ b/setup.py | ||
17 | @@ -48,7 +48,7 @@ | ||
18 | author=about["__author__"], | ||
19 | author_email=about["__email__"], | ||
20 | python_requires=">=3.6", | ||
21 | - install_requires=["pyparsing>=2.0.2,<3"], # Needed to avoid issue #91 | ||
22 | + install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91 | ||
23 | classifiers=[ | ||
24 | "Development Status :: 5 - Production/Stable", | ||
25 | "Intended Audience :: Developers", | ||
26 | diff --git a/tests/test_requirements.py b/tests/test_requirements.py | ||
27 | index 8cc45687..f2c209c4 100644 | ||
28 | --- a/tests/test_requirements.py | ||
29 | +++ b/tests/test_requirements.py | ||
30 | @@ -192,4 +192,6 @@ def test_sys_platform_linux_in(self): | ||
31 | def test_parseexception_error_msg(self): | ||
32 | with pytest.raises(InvalidRequirement) as e: | ||
33 | Requirement("toto 42") | ||
34 | - assert "Expected stringEnd" in str(e.value) | ||
35 | + assert "Expected stringEnd" in str(e.value) or ( | ||
36 | + "Expected string_end" in str(e.value) # pyparsing>=3.0.0 | ||
37 | + ) | ||