From f0f886e9e932af2a6550c1ffcc9ebb3a0d0dfa10 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 9 Jul 2026 19:21:57 +0100 Subject: Update to jq 1.8.2 --- CHANGELOG.rst | 5 +++++ README.rst | 4 ++-- deps/jq-1.8.1.tar.gz | Bin 2026798 -> 0 bytes deps/jq-1.8.2.tar.gz | Bin 0 -> 1959950 bytes setup.py | 4 ++-- tests/jq_old_tests.py | 9 +++++++-- tests/jq_tests.py | 9 +++++++-- 7 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 deps/jq-1.8.1.tar.gz create mode 100644 deps/jq-1.8.2.tar.gz diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5ee54ec..d11db4f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +1.12.0 +------ + +* Update to jq 1.8.2. + 1.11.0 ------ diff --git a/README.rst b/README.rst index 13d133d..d7b5c61 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ jq.py: a lightweight and flexible JSON processor ================================================ This project contains Python bindings for -`jq `_ 1.8.1. +`jq `_ 1.8.2. Installation ------------ @@ -15,7 +15,7 @@ On these platforms, you should be able to install jq with a normal pip install: pip install jq If a wheel is not available, -the source for jq 1.8.1 is built. +the source for jq 1.8.2 is built. This requires: * Autoreconf diff --git a/deps/jq-1.8.1.tar.gz b/deps/jq-1.8.1.tar.gz deleted file mode 100644 index 7c1bcf0..0000000 Binary files a/deps/jq-1.8.1.tar.gz and /dev/null differ diff --git a/deps/jq-1.8.2.tar.gz b/deps/jq-1.8.2.tar.gz new file mode 100644 index 0000000..272f976 Binary files /dev/null and b/deps/jq-1.8.2.tar.gz differ diff --git a/setup.py b/setup.py index c79e917..5c130b3 100644 --- a/setup.py +++ b/setup.py @@ -27,8 +27,8 @@ def _read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -jq_lib_tarball_path = _dep_source_path("jq-1.8.1.tar.gz") -jq_lib_dir = _dep_build_path("jq-1.8.1") +jq_lib_tarball_path = _dep_source_path("jq-1.8.2.tar.gz") +jq_lib_dir = _dep_build_path("jq-1.8.2") class jq_with_deps_build_ext(build_ext): def finalize_options(self): diff --git a/tests/jq_old_tests.py b/tests/jq_old_tests.py index 794eed3..b2411c3 100644 --- a/tests/jq_old_tests.py +++ b/tests/jq_old_tests.py @@ -95,8 +95,13 @@ def test_value_error_is_raised_if_input_cannot_be_processed_by_program(): program.transform(1) assert False, "Expected error" except ValueError as error: - expected_error_str = "Cannot index number with string \"x\"" - assert_equal(str(error), expected_error_str) + expected_error_strs = [ + # jq 1.8.1 and earlier + "Cannot index number with string \"x\"", + # jq 1.8.2 and later + "Cannot index number with string (\"x\")", + ] + str(error) in expected_error_strs def test_errors_do_not_leak_between_transformations(): diff --git a/tests/jq_tests.py b/tests/jq_tests.py index 1c45472..69eccb2 100644 --- a/tests/jq_tests.py +++ b/tests/jq_tests.py @@ -215,8 +215,13 @@ def test_value_error_is_raised_if_input_cannot_be_processed_by_program(): program.input(1).all() assert False, "Expected error" except ValueError as error: - expected_error_str = "Cannot index number with string \"x\"" - assert_equal(str(error), expected_error_str) + expected_error_strs = [ + # jq 1.8.1 and earlier + "Cannot index number with string \"x\"", + # jq 1.8.2 and later + "Cannot index number with string (\"x\")", + ] + str(error) in expected_error_strs def test_non_string_error_is_converted_to_json_text(): -- cgit v1.2.3