summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2020-04-19 13:47:44 +0100
committerMichael Williamson <mike@zwobble.org>2020-04-19 13:59:59 +0100
commit2b985519c1b97c7ed23f679423834f71fc0fd2f6 (patch)
treee7d00f605b1926eb0a5d88a4b577a21119bcfb89
parente3c13aff3bb0f73459a2950d2fcb95e7cc2715c9 (diff)
Update jq to 1.6
-rw-r--r--README.rst2
-rw-r--r--setup.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/README.rst b/README.rst
index 573d1e8..1217c3c 100644
--- a/README.rst
+++ b/README.rst
@@ -18,7 +18,7 @@ On these platforms, you should be able to install jq with a normal pip install:
pip install jq --pre
If a wheel is not available,
-the source for jq 1.5 is downloaded over HTTPS and built.
+the source for jq 1.6 is downloaded over HTTPS and built.
Therefore, installation requires any programs required to build jq.
This includes:
diff --git a/setup.py b/setup.py
index 13e82d6..133b6df 100644
--- a/setup.py
+++ b/setup.py
@@ -31,8 +31,8 @@ def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
-jq_lib_tarball_path = dependency_path("jq-lib-1.5.tar.gz")
-jq_lib_dir = dependency_path("jq-jq-1.5")
+jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz")
+jq_lib_dir = dependency_path("jq-1.6")
oniguruma_version = "6.9.4"
oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version))
@@ -61,7 +61,7 @@ class jq_build_ext(build_ext):
def _build_libjq(self):
self._build_lib(
- source_url="https://github.com/stedolan/jq/archive/jq-1.5.tar.gz",
+ source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz",
tarball_path=jq_lib_tarball_path,
lib_dir=jq_lib_dir,
commands=[
@@ -103,7 +103,7 @@ class jq_build_ext(build_ext):
jq_extension = Extension(
"jq",
sources=["jq.c"],
- include_dirs=[jq_lib_dir],
+ include_dirs=[os.path.join(jq_lib_dir, "src")],
extra_objects=[
os.path.join(jq_lib_dir, ".libs/libjq.a"),
os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),