mirror of
https://git.yoctoproject.org/poky
synced 2026-02-08 09:46:38 +01:00
f7dbf89d5a
(From OE-Core rev: 7a317c575437dc5a1b9b32ba7711377896ee9db4) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 8cb9dbf19e2b76ab025efc11208bd50e09e8223e Mon Sep 17 00:00:00 2001
|
|
From: Moyiz <8603313+moyiz@users.noreply.github.com>
|
|
Date: Tue, 2 Nov 2021 21:42:53 +0200
|
|
Subject: [PATCH] Revert pyparsing constraint (#482)
|
|
|
|
Upstream-Status: Backport
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
setup.py | 2 +-
|
|
tests/test_requirements.py | 4 +++-
|
|
4 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index c6a1caec..419aa284 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -48,7 +48,7 @@
|
|
author=about["__author__"],
|
|
author_email=about["__email__"],
|
|
python_requires=">=3.6",
|
|
- install_requires=["pyparsing>=2.0.2,<3"], # Needed to avoid issue #91
|
|
+ install_requires=["pyparsing>=2.0.2"], # Needed to avoid issue #91
|
|
classifiers=[
|
|
"Development Status :: 5 - Production/Stable",
|
|
"Intended Audience :: Developers",
|
|
diff --git a/tests/test_requirements.py b/tests/test_requirements.py
|
|
index 8cc45687..f2c209c4 100644
|
|
--- a/tests/test_requirements.py
|
|
+++ b/tests/test_requirements.py
|
|
@@ -192,4 +192,6 @@ def test_sys_platform_linux_in(self):
|
|
def test_parseexception_error_msg(self):
|
|
with pytest.raises(InvalidRequirement) as e:
|
|
Requirement("toto 42")
|
|
- assert "Expected stringEnd" in str(e.value)
|
|
+ assert "Expected stringEnd" in str(e.value) or (
|
|
+ "Expected string_end" in str(e.value) # pyparsing>=3.0.0
|
|
+ )
|