diff options
author | Ross Burton <ross.burton@arm.com> | 2023-06-19 15:06:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-10 11:36:34 +0100 |
commit | 5591c1eebfd89ac1b522bdec1ea09a22a6cd8547 (patch) | |
tree | 6d45fbebbd0f777f607dce5746215089b702b43a | |
parent | 28de7ad7315b7d8f53426e6113823fdd3f0ee220 (diff) | |
download | poky-5591c1eebfd89ac1b522bdec1ea09a22a6cd8547.tar.gz |
python3-jsonpointer: upgrade to 2.4
Drop the merged patch.
(From OE-Core rev: d4581006a2a05c289280bece02b9a44e409299b8)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch | 62 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-jsonpointer_2.4.bb (renamed from meta/recipes-devtools/python/python3-jsonpointer_2.3.bb) | 4 |
2 files changed, 1 insertions, 65 deletions
diff --git a/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch b/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch deleted file mode 100644 index 4121834dbf..0000000000 --- a/meta/recipes-devtools/python/python3-jsonpointer/0001-Clean-up-test-runner.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From 04a864f33848da6af1dea906ba4922770022ef66 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Thu, 16 Mar 2023 14:21:32 +0000 | ||
4 | Subject: [PATCH] Clean up test runner | ||
5 | |||
6 | Test code doesn't need to manually construct a TestSuite and a | ||
7 | TextTestRunner, the unittest module has a discovery function that does | ||
8 | all this for you. | ||
9 | |||
10 | Delete all of the manual logic from tests.py, replace it with the two | ||
11 | lines to bring in the doctest unit tests, and update the makefile to | ||
12 | run the unittest discovery. | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/stefankoegl/python-json-pointer/pull/54] | ||
15 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
16 | --- | ||
17 | makefile | 2 +- | ||
18 | tests.py | 24 ++++-------------------- | ||
19 | 2 files changed, 5 insertions(+), 21 deletions(-) | ||
20 | |||
21 | diff --git a/tests.py b/tests.py | ||
22 | index 9252369..6b4b8cc 100755 | ||
23 | --- a/tests.py | ||
24 | +++ b/tests.py | ||
25 | @@ -7,6 +7,7 @@ import doctest | ||
26 | import unittest | ||
27 | import sys | ||
28 | import copy | ||
29 | +import jsonpointer | ||
30 | from jsonpointer import resolve_pointer, EndOfList, JsonPointerException, \ | ||
31 | JsonPointer, set_pointer | ||
32 | |||
33 | @@ -410,23 +411,6 @@ class AltTypesTests(unittest.TestCase): | ||
34 | self.assertRaises(JsonPointerException, resolve_pointer, doc, '/root/1/2/3/4') | ||
35 | |||
36 | |||
37 | - | ||
38 | -suite = unittest.TestSuite() | ||
39 | -suite.addTest(unittest.makeSuite(SpecificationTests)) | ||
40 | -suite.addTest(unittest.makeSuite(ComparisonTests)) | ||
41 | -suite.addTest(unittest.makeSuite(WrongInputTests)) | ||
42 | -suite.addTest(unittest.makeSuite(ToLastTests)) | ||
43 | -suite.addTest(unittest.makeSuite(SetTests)) | ||
44 | -suite.addTest(unittest.makeSuite(AltTypesTests)) | ||
45 | - | ||
46 | -modules = ['jsonpointer'] | ||
47 | - | ||
48 | -for module in modules: | ||
49 | - m = __import__(module, fromlist=[module]) | ||
50 | - suite.addTest(doctest.DocTestSuite(m)) | ||
51 | - | ||
52 | -runner = unittest.TextTestRunner(verbosity=1) | ||
53 | -result = runner.run(suite) | ||
54 | - | ||
55 | -if not result.wasSuccessful(): | ||
56 | - sys.exit(1) | ||
57 | +def load_tests(loader, tests, ignore): | ||
58 | + tests.addTests(doctest.DocTestSuite(jsonpointer)) | ||
59 | + return tests | ||
60 | -- | ||
61 | 2.34.1 | ||
62 | |||
diff --git a/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb b/meta/recipes-devtools/python/python3-jsonpointer_2.4.bb index 0ec4de055c..d7a1fea70a 100644 --- a/meta/recipes-devtools/python/python3-jsonpointer_2.3.bb +++ b/meta/recipes-devtools/python/python3-jsonpointer_2.4.bb | |||
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b15c843b7a329130f4e266a281ebb3" | |||
5 | 5 | ||
6 | inherit pypi ptest setuptools3 | 6 | inherit pypi ptest setuptools3 |
7 | 7 | ||
8 | SRC_URI += "file://0001-Clean-up-test-runner.patch" | 8 | SRC_URI[sha256sum] = "585cee82b70211fa9e6043b7bb89db6e1aa49524340dde8ad6b63206ea689d88" |
9 | |||
10 | SRC_URI[sha256sum] = "97cba51526c829282218feb99dab1b1e6bdf8efd1c43dc9d57be093c0d69c99a" | ||
11 | 9 | ||
12 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
13 | ${PYTHON_PN}-json \ | 11 | ${PYTHON_PN}-json \ |