Update to jq 1.8.0

6 files changed, 19 insertions, 13 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7aa6186..a7e5a5b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,8 @@ Changelog
 1.9.0
 -----
 
+* Update to jq 1.8.0.
+
 * Drop support for Python 3.6
 
 * Distribute Cython sources instead of C sources to improve compatibility.
diff --git a/deps/jq-1.7.1.tar.gz b/deps/jq-1.7.1.tar.gz
deleted file mode 100644
index 40718ba..0000000
--- a/deps/jq-1.7.1.tar.gz
+++ /dev/null
diff --git a/deps/jq-1.8.0.tar.gz b/deps/jq-1.8.0.tar.gz
new file mode 100644
index 0000000..1e270e4
--- /dev/null
+++ b/deps/jq-1.8.0.tar.gz
diff --git a/setup.py b/setup.py
index 1bb2f4d..42ee039 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.7.1.tar.gz")
-jq_lib_dir = _dep_build_path("jq-1.7.1")
+jq_lib_tarball_path = _dep_source_path("jq-1.8.0.tar.gz")
+jq_lib_dir = _dep_build_path("jq-1.8.0")
 
 class jq_with_deps_build_ext(build_ext):
     def finalize_options(self):
@@ -92,7 +92,7 @@ else:
     link_args_deps = []
     extra_objects = [
         os.path.join(jq_lib_dir, ".libs/libjq.a"),
-        os.path.join(jq_lib_dir, "modules/oniguruma/src/.libs/libonig.a"),
+        os.path.join(jq_lib_dir, "vendor/oniguruma/src/.libs/libonig.a"),
     ]
 
 jq_extension = Extension(
diff --git a/tests/jq_old_tests.py b/tests/jq_old_tests.py
index 1beafcf..794eed3 100644
--- a/tests/jq_old_tests.py
+++ b/tests/jq_old_tests.py
@@ -75,14 +75,16 @@ def test_value_error_is_raised_if_program_is_invalid():
         assert False, "Expected error"
     except ValueError as error:
         expected_error_strs = [
-            # jq 1.6
+            # jq 1.6 on Unix
             "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting $end (Unix shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
-            # jq 1.7
-            "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file (Unix shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
-            # jq 1.6 -win
+            # jq 1.6 on Windows
             "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting $end (Windows cmd shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
-            # jq 1.7 -win
+            # jq 1.7 on Unix
+            "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file (Unix shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
+            # jq 1.7 on Windows
             "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file (Windows cmd shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
+            # jq 1.8
+            "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file at <top-level>, line 1, column 1:\n    !\n    ^\njq: 1 compile error",
         ]
         assert str(error) in expected_error_strs
 
diff --git a/tests/jq_tests.py b/tests/jq_tests.py
index c42c862..1c45472 100644
--- a/tests/jq_tests.py
+++ b/tests/jq_tests.py
@@ -195,14 +195,16 @@ def test_value_error_is_raised_if_program_is_invalid():
         assert False, "Expected error"
     except ValueError as error:
         expected_error_strs = [
-            # jq 1.6
+            # jq 1.6 on Unix
             "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting $end (Unix shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
-            # jq 1.7
-            "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file (Unix shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
-            # jq 1.6 -win
+            # jq 1.6 on Windows
             "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting $end (Windows cmd shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
-            # jq 1.7 -win
+            # jq 1.7 on Unix
+            "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file (Unix shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
+            # jq 1.7 on Windows
             "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file (Windows cmd shell quoting issues?) at <top-level>, line 1:\n!\njq: 1 compile error",
+            # jq 1.8
+            "jq: error: syntax error, unexpected INVALID_CHARACTER, expecting end of file at <top-level>, line 1, column 1:\n    !\n    ^\njq: 1 compile error",
         ]
         assert str(error) in expected_error_strs