* [PR PATCH] python3-jq: update to 1.3.0.
@ 2022-09-24 5:55 RunningDroid
2022-09-24 7:56 ` [PR PATCH] [Updated] " RunningDroid
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: RunningDroid @ 2022-09-24 5:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]
There is a new pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_python3-jq
https://github.com/void-linux/void-packages/pull/39441
python3-jq: update to 1.3.0.
I replaced the existing patch (which came from Arch) with FreeBSD's patch because Arch's patch no longer applies and I also added the `-X language_level=3` argument to `cython` to silence a warning
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_python3-jq-39441.patch --]
[-- Type: text/x-diff, Size: 7886 bytes --]
From 57e7e6c0a097b36ec5ba13fe13ecbde65962f6e9 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 24 Sep 2022 01:50:05 -0400
Subject: [PATCH] python3-jq: update to 1.3.0.
replace Arch's patch with FreeBSD's patch
---
srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 -------------------
srcpkgs/python3-jq/patches/setup.py.patch | 24 ++++
srcpkgs/python3-jq/template | 8 +-
3 files changed, 28 insertions(+), 147 deletions(-)
delete mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
create mode 100644 srcpkgs/python3-jq/patches/setup.py.patch
diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
deleted file mode 100644
index 1eb4f28e7aa9..000000000000
--- a/srcpkgs/python3-jq/patches/jq-py-setup.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
-From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
-Date: Fri, 7 May 2021 19:14:20 -0400
-Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
-
----
- setup.py | 98 +-------------------------------------------------------
- 1 file changed, 1 insertion(+), 97 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 663792c..3ebcabe 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,113 +1,19 @@
- #!/usr/bin/env python
-
- import os
--import subprocess
--import tarfile
--import shutil
--import sysconfig
-
--import requests
- from setuptools import setup
--from setuptools.command.build_ext import build_ext
- from setuptools.extension import Extension
-
-
--def urlretrieve(source_url, destination_path):
-- response = requests.get(source_url, stream=True)
-- if response.status_code != 200:
-- raise Exception("status code was: {}".format(response.status_code))
--
-- with open(destination_path, "wb") as fileobj:
-- for chunk in response.iter_content(chunk_size=128):
-- fileobj.write(chunk)
--
--def path_in_dir(relative_path):
-- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
--
--def dependency_path(relative_path):
-- return os.path.join(path_in_dir("_deps"), relative_path)
--
- def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
--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))
--oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
--oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
--
--class jq_build_ext(build_ext):
-- def run(self):
-- if not os.path.exists(dependency_path(".")):
-- os.makedirs(dependency_path("."))
-- self._build_oniguruma()
-- self._build_libjq()
-- build_ext.run(self)
--
-- def _build_oniguruma(self):
-- self._build_lib(
-- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
-- tarball_path=oniguruma_lib_tarball_path,
-- lib_dir=oniguruma_lib_build_dir,
-- commands=[
-- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
-- ["make"],
-- ["make", "install"],
-- ])
--
--
-- def _build_libjq(self):
-- self._build_lib(
-- 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=[
-- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
-- ["make"],
-- ])
--
-- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
-- self._download_tarball(
-- source_url=source_url,
-- tarball_path=tarball_path,
-- lib_dir=lib_dir,
-- )
--
-- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
-- if macosx_deployment_target:
-- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
--
-- def run_command(args):
-- print("Executing: %s" % ' '.join(args))
-- subprocess.check_call(args, cwd=lib_dir)
--
-- for command in commands:
-- run_command(command)
--
-- def _download_tarball(self, source_url, tarball_path, lib_dir):
-- if os.path.exists(tarball_path):
-- os.unlink(tarball_path)
-- print("Downloading {}".format(source_url))
-- urlretrieve(source_url, tarball_path)
-- print("Downloaded {}".format(source_url))
--
-- if os.path.exists(lib_dir):
-- shutil.rmtree(lib_dir)
-- tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
--
--
- jq_extension = Extension(
- "jq",
- sources=["jq.c"],
-- include_dirs=[os.path.join(jq_lib_dir, "src")],
-- extra_link_args=["-lm"],
-- extra_objects=[
-- os.path.join(jq_lib_dir, ".libs/libjq.a"),
-- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
-- ],
-+ libraries=["jq"]
- )
-
- setup(
-@@ -120,7 +26,6 @@ setup(
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
- license='BSD 2-Clause',
- ext_modules = [jq_extension],
-- cmdclass={"build_ext": jq_build_ext},
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
-@@ -137,4 +42,3 @@ setup(
- 'Programming Language :: Python :: 3.9',
- ],
- )
--
---
-2.29.3
diff --git a/srcpkgs/python3-jq/patches/setup.py.patch b/srcpkgs/python3-jq/patches/setup.py.patch
new file mode 100644
index 000000000000..9ccffed61039
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/setup.py.patch
@@ -0,0 +1,24 @@
+--- a/setup.py.orig 2022-09-19 15:51:09 UTC
++++ b/setup.py
+@@ -36,8 +36,6 @@ class jq_build_ext(build_ext):
+ def run(self):
+ if not os.path.exists(_dep_build_path(".")):
+ os.makedirs(_dep_build_path("."))
+- self._build_oniguruma()
+- self._build_libjq()
+ build_ext.run(self)
+
+ def _build_oniguruma(self):
+@@ -87,11 +85,7 @@ jq_extension = Extension(
+ "jq",
+ sources=["jq.c"],
+ include_dirs=[os.path.join(jq_lib_dir, "src")],
+- extra_link_args=["-lm"],
+- extra_objects=[
+- os.path.join(jq_lib_dir, ".libs/libjq.a"),
+- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+- ],
++ extra_link_args=["-lm", "-ljq", "-lonig"],
+ )
+
+ setup(
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
index 443318c6bbd7..1a91caae99cb 100644
--- a/srcpkgs/python3-jq/template
+++ b/srcpkgs/python3-jq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-jq'
pkgname=python3-jq
-version=1.2.3
+version=1.3.0
revision=1
wrksrc="${pkgname#*-}.py-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
-makedepends="python3-devel jq-devel"
+makedepends="python3-devel jq-devel oniguruma-devel"
depends="python3"
short_desc="Python bindings for jq"
maintainer="RunningDroid <runningdroid@zoho.com>"
@@ -13,10 +13,10 @@ license="BSD-2-Clause"
homepage="https://pypi.org/project/jq/"
changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst"
distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
-checksum=52392e001cd90769d68f4e46821c645e277b9c1db01528a6bbc9d1875b81fcf5
+checksum=736e0d42d719592189cdd9921eab19d5bb4b65a3ce41a8f8f13794153fc5a5b1
pre_build() {
- cython jq.pyx
+ cython -X language_level=3 jq.pyx
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] python3-jq: update to 1.3.0.
2022-09-24 5:55 [PR PATCH] python3-jq: update to 1.3.0 RunningDroid
@ 2022-09-24 7:56 ` RunningDroid
2022-09-25 6:45 ` RunningDroid
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: RunningDroid @ 2022-09-24 7:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_python3-jq
https://github.com/void-linux/void-packages/pull/39441
python3-jq: update to 1.3.0.
I replaced the existing patch (which came from Arch) with FreeBSD's patch because Arch's patch no longer applies and I also added the `-X language_level=3` argument to `cython` to silence a warning
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_python3-jq-39441.patch --]
[-- Type: text/x-diff, Size: 7886 bytes --]
From 6ba856d2c5c4420c9170290db66c63e360a646dc Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 24 Sep 2022 01:50:05 -0400
Subject: [PATCH] python3-jq: update to 1.3.0.
replace Arch's patch with FreeBSD's patch
---
srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 -------------------
srcpkgs/python3-jq/patches/setup.py.patch | 24 ++++
srcpkgs/python3-jq/template | 8 +-
3 files changed, 28 insertions(+), 147 deletions(-)
delete mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
create mode 100644 srcpkgs/python3-jq/patches/setup.py.patch
diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
deleted file mode 100644
index 1eb4f28e7aa9..000000000000
--- a/srcpkgs/python3-jq/patches/jq-py-setup.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
-From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
-Date: Fri, 7 May 2021 19:14:20 -0400
-Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
-
----
- setup.py | 98 +-------------------------------------------------------
- 1 file changed, 1 insertion(+), 97 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 663792c..3ebcabe 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,113 +1,19 @@
- #!/usr/bin/env python
-
- import os
--import subprocess
--import tarfile
--import shutil
--import sysconfig
-
--import requests
- from setuptools import setup
--from setuptools.command.build_ext import build_ext
- from setuptools.extension import Extension
-
-
--def urlretrieve(source_url, destination_path):
-- response = requests.get(source_url, stream=True)
-- if response.status_code != 200:
-- raise Exception("status code was: {}".format(response.status_code))
--
-- with open(destination_path, "wb") as fileobj:
-- for chunk in response.iter_content(chunk_size=128):
-- fileobj.write(chunk)
--
--def path_in_dir(relative_path):
-- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
--
--def dependency_path(relative_path):
-- return os.path.join(path_in_dir("_deps"), relative_path)
--
- def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
--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))
--oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
--oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
--
--class jq_build_ext(build_ext):
-- def run(self):
-- if not os.path.exists(dependency_path(".")):
-- os.makedirs(dependency_path("."))
-- self._build_oniguruma()
-- self._build_libjq()
-- build_ext.run(self)
--
-- def _build_oniguruma(self):
-- self._build_lib(
-- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
-- tarball_path=oniguruma_lib_tarball_path,
-- lib_dir=oniguruma_lib_build_dir,
-- commands=[
-- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
-- ["make"],
-- ["make", "install"],
-- ])
--
--
-- def _build_libjq(self):
-- self._build_lib(
-- 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=[
-- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
-- ["make"],
-- ])
--
-- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
-- self._download_tarball(
-- source_url=source_url,
-- tarball_path=tarball_path,
-- lib_dir=lib_dir,
-- )
--
-- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
-- if macosx_deployment_target:
-- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
--
-- def run_command(args):
-- print("Executing: %s" % ' '.join(args))
-- subprocess.check_call(args, cwd=lib_dir)
--
-- for command in commands:
-- run_command(command)
--
-- def _download_tarball(self, source_url, tarball_path, lib_dir):
-- if os.path.exists(tarball_path):
-- os.unlink(tarball_path)
-- print("Downloading {}".format(source_url))
-- urlretrieve(source_url, tarball_path)
-- print("Downloaded {}".format(source_url))
--
-- if os.path.exists(lib_dir):
-- shutil.rmtree(lib_dir)
-- tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
--
--
- jq_extension = Extension(
- "jq",
- sources=["jq.c"],
-- include_dirs=[os.path.join(jq_lib_dir, "src")],
-- extra_link_args=["-lm"],
-- extra_objects=[
-- os.path.join(jq_lib_dir, ".libs/libjq.a"),
-- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
-- ],
-+ libraries=["jq"]
- )
-
- setup(
-@@ -120,7 +26,6 @@ setup(
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
- license='BSD 2-Clause',
- ext_modules = [jq_extension],
-- cmdclass={"build_ext": jq_build_ext},
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
-@@ -137,4 +42,3 @@ setup(
- 'Programming Language :: Python :: 3.9',
- ],
- )
--
---
-2.29.3
diff --git a/srcpkgs/python3-jq/patches/setup.py.patch b/srcpkgs/python3-jq/patches/setup.py.patch
new file mode 100644
index 000000000000..9ccffed61039
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/setup.py.patch
@@ -0,0 +1,24 @@
+--- a/setup.py.orig 2022-09-19 15:51:09 UTC
++++ b/setup.py
+@@ -36,8 +36,6 @@ class jq_build_ext(build_ext):
+ def run(self):
+ if not os.path.exists(_dep_build_path(".")):
+ os.makedirs(_dep_build_path("."))
+- self._build_oniguruma()
+- self._build_libjq()
+ build_ext.run(self)
+
+ def _build_oniguruma(self):
+@@ -87,11 +85,7 @@ jq_extension = Extension(
+ "jq",
+ sources=["jq.c"],
+ include_dirs=[os.path.join(jq_lib_dir, "src")],
+- extra_link_args=["-lm"],
+- extra_objects=[
+- os.path.join(jq_lib_dir, ".libs/libjq.a"),
+- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+- ],
++ extra_link_args=["-lm", "-ljq", "-lonig"],
+ )
+
+ setup(
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
index 443318c6bbd7..1a91caae99cb 100644
--- a/srcpkgs/python3-jq/template
+++ b/srcpkgs/python3-jq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-jq'
pkgname=python3-jq
-version=1.2.3
+version=1.3.0
revision=1
wrksrc="${pkgname#*-}.py-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
-makedepends="python3-devel jq-devel"
+makedepends="python3-devel jq-devel oniguruma-devel"
depends="python3"
short_desc="Python bindings for jq"
maintainer="RunningDroid <runningdroid@zoho.com>"
@@ -13,10 +13,10 @@ license="BSD-2-Clause"
homepage="https://pypi.org/project/jq/"
changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst"
distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
-checksum=52392e001cd90769d68f4e46821c645e277b9c1db01528a6bbc9d1875b81fcf5
+checksum=736e0d42d719592189cdd9921eab19d5bb4b65a3ce41a8f8f13794153fc5a5b1
pre_build() {
- cython jq.pyx
+ cython -X language_level=3 jq.pyx
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] python3-jq: update to 1.3.0.
2022-09-24 5:55 [PR PATCH] python3-jq: update to 1.3.0 RunningDroid
2022-09-24 7:56 ` [PR PATCH] [Updated] " RunningDroid
@ 2022-09-25 6:45 ` RunningDroid
2022-09-26 1:53 ` RunningDroid
2022-10-02 1:40 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: RunningDroid @ 2022-09-25 6:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_python3-jq
https://github.com/void-linux/void-packages/pull/39441
python3-jq: update to 1.3.0.
I replaced the existing patch (which came from Arch) with FreeBSD's patch because Arch's patch no longer applies and I also added the `-X language_level=3` argument to `cython` to silence a warning
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_python3-jq-39441.patch --]
[-- Type: text/x-diff, Size: 7886 bytes --]
From edf46220e76c8e1126d2ec3fa81f5177091be713 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 24 Sep 2022 01:50:05 -0400
Subject: [PATCH] python3-jq: update to 1.3.0.
replace Arch's patch with FreeBSD's patch
---
srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 -------------------
srcpkgs/python3-jq/patches/setup.py.patch | 24 ++++
srcpkgs/python3-jq/template | 8 +-
3 files changed, 28 insertions(+), 147 deletions(-)
delete mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
create mode 100644 srcpkgs/python3-jq/patches/setup.py.patch
diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
deleted file mode 100644
index 1eb4f28e7aa9..000000000000
--- a/srcpkgs/python3-jq/patches/jq-py-setup.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
-From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
-Date: Fri, 7 May 2021 19:14:20 -0400
-Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
-
----
- setup.py | 98 +-------------------------------------------------------
- 1 file changed, 1 insertion(+), 97 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 663792c..3ebcabe 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,113 +1,19 @@
- #!/usr/bin/env python
-
- import os
--import subprocess
--import tarfile
--import shutil
--import sysconfig
-
--import requests
- from setuptools import setup
--from setuptools.command.build_ext import build_ext
- from setuptools.extension import Extension
-
-
--def urlretrieve(source_url, destination_path):
-- response = requests.get(source_url, stream=True)
-- if response.status_code != 200:
-- raise Exception("status code was: {}".format(response.status_code))
--
-- with open(destination_path, "wb") as fileobj:
-- for chunk in response.iter_content(chunk_size=128):
-- fileobj.write(chunk)
--
--def path_in_dir(relative_path):
-- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
--
--def dependency_path(relative_path):
-- return os.path.join(path_in_dir("_deps"), relative_path)
--
- def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
--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))
--oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
--oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
--
--class jq_build_ext(build_ext):
-- def run(self):
-- if not os.path.exists(dependency_path(".")):
-- os.makedirs(dependency_path("."))
-- self._build_oniguruma()
-- self._build_libjq()
-- build_ext.run(self)
--
-- def _build_oniguruma(self):
-- self._build_lib(
-- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
-- tarball_path=oniguruma_lib_tarball_path,
-- lib_dir=oniguruma_lib_build_dir,
-- commands=[
-- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
-- ["make"],
-- ["make", "install"],
-- ])
--
--
-- def _build_libjq(self):
-- self._build_lib(
-- 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=[
-- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
-- ["make"],
-- ])
--
-- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
-- self._download_tarball(
-- source_url=source_url,
-- tarball_path=tarball_path,
-- lib_dir=lib_dir,
-- )
--
-- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
-- if macosx_deployment_target:
-- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
--
-- def run_command(args):
-- print("Executing: %s" % ' '.join(args))
-- subprocess.check_call(args, cwd=lib_dir)
--
-- for command in commands:
-- run_command(command)
--
-- def _download_tarball(self, source_url, tarball_path, lib_dir):
-- if os.path.exists(tarball_path):
-- os.unlink(tarball_path)
-- print("Downloading {}".format(source_url))
-- urlretrieve(source_url, tarball_path)
-- print("Downloaded {}".format(source_url))
--
-- if os.path.exists(lib_dir):
-- shutil.rmtree(lib_dir)
-- tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
--
--
- jq_extension = Extension(
- "jq",
- sources=["jq.c"],
-- include_dirs=[os.path.join(jq_lib_dir, "src")],
-- extra_link_args=["-lm"],
-- extra_objects=[
-- os.path.join(jq_lib_dir, ".libs/libjq.a"),
-- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
-- ],
-+ libraries=["jq"]
- )
-
- setup(
-@@ -120,7 +26,6 @@ setup(
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
- license='BSD 2-Clause',
- ext_modules = [jq_extension],
-- cmdclass={"build_ext": jq_build_ext},
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
-@@ -137,4 +42,3 @@ setup(
- 'Programming Language :: Python :: 3.9',
- ],
- )
--
---
-2.29.3
diff --git a/srcpkgs/python3-jq/patches/setup.py.patch b/srcpkgs/python3-jq/patches/setup.py.patch
new file mode 100644
index 000000000000..9ccffed61039
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/setup.py.patch
@@ -0,0 +1,24 @@
+--- a/setup.py.orig 2022-09-19 15:51:09 UTC
++++ b/setup.py
+@@ -36,8 +36,6 @@ class jq_build_ext(build_ext):
+ def run(self):
+ if not os.path.exists(_dep_build_path(".")):
+ os.makedirs(_dep_build_path("."))
+- self._build_oniguruma()
+- self._build_libjq()
+ build_ext.run(self)
+
+ def _build_oniguruma(self):
+@@ -87,11 +85,7 @@ jq_extension = Extension(
+ "jq",
+ sources=["jq.c"],
+ include_dirs=[os.path.join(jq_lib_dir, "src")],
+- extra_link_args=["-lm"],
+- extra_objects=[
+- os.path.join(jq_lib_dir, ".libs/libjq.a"),
+- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+- ],
++ extra_link_args=["-lm", "-ljq", "-lonig"],
+ )
+
+ setup(
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
index 443318c6bbd7..1a91caae99cb 100644
--- a/srcpkgs/python3-jq/template
+++ b/srcpkgs/python3-jq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-jq'
pkgname=python3-jq
-version=1.2.3
+version=1.3.0
revision=1
wrksrc="${pkgname#*-}.py-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
-makedepends="python3-devel jq-devel"
+makedepends="python3-devel jq-devel oniguruma-devel"
depends="python3"
short_desc="Python bindings for jq"
maintainer="RunningDroid <runningdroid@zoho.com>"
@@ -13,10 +13,10 @@ license="BSD-2-Clause"
homepage="https://pypi.org/project/jq/"
changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst"
distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
-checksum=52392e001cd90769d68f4e46821c645e277b9c1db01528a6bbc9d1875b81fcf5
+checksum=736e0d42d719592189cdd9921eab19d5bb4b65a3ce41a8f8f13794153fc5a5b1
pre_build() {
- cython jq.pyx
+ cython -X language_level=3 jq.pyx
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] python3-jq: update to 1.3.0.
2022-09-24 5:55 [PR PATCH] python3-jq: update to 1.3.0 RunningDroid
2022-09-24 7:56 ` [PR PATCH] [Updated] " RunningDroid
2022-09-25 6:45 ` RunningDroid
@ 2022-09-26 1:53 ` RunningDroid
2022-10-02 1:40 ` [PR PATCH] [Merged]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: RunningDroid @ 2022-09-26 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_python3-jq
https://github.com/void-linux/void-packages/pull/39441
python3-jq: update to 1.3.0.
I replaced the existing patch (which came from Arch) with FreeBSD's patch because Arch's patch no longer applies and I also added the `-X language_level=3` argument to `cython` to silence a warning
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_python3-jq-39441.patch --]
[-- Type: text/x-diff, Size: 7886 bytes --]
From 05424e94c579e90fffd86a27df2785de623f4c54 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sat, 24 Sep 2022 01:50:05 -0400
Subject: [PATCH] python3-jq: update to 1.3.0.
replace Arch's patch with FreeBSD's patch
---
srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 -------------------
srcpkgs/python3-jq/patches/setup.py.patch | 24 ++++
srcpkgs/python3-jq/template | 8 +-
3 files changed, 28 insertions(+), 147 deletions(-)
delete mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
create mode 100644 srcpkgs/python3-jq/patches/setup.py.patch
diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
deleted file mode 100644
index 1eb4f28e7aa9..000000000000
--- a/srcpkgs/python3-jq/patches/jq-py-setup.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
-From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
-Date: Fri, 7 May 2021 19:14:20 -0400
-Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
-
----
- setup.py | 98 +-------------------------------------------------------
- 1 file changed, 1 insertion(+), 97 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 663792c..3ebcabe 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,113 +1,19 @@
- #!/usr/bin/env python
-
- import os
--import subprocess
--import tarfile
--import shutil
--import sysconfig
-
--import requests
- from setuptools import setup
--from setuptools.command.build_ext import build_ext
- from setuptools.extension import Extension
-
-
--def urlretrieve(source_url, destination_path):
-- response = requests.get(source_url, stream=True)
-- if response.status_code != 200:
-- raise Exception("status code was: {}".format(response.status_code))
--
-- with open(destination_path, "wb") as fileobj:
-- for chunk in response.iter_content(chunk_size=128):
-- fileobj.write(chunk)
--
--def path_in_dir(relative_path):
-- return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
--
--def dependency_path(relative_path):
-- return os.path.join(path_in_dir("_deps"), relative_path)
--
- def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
--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))
--oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
--oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
--
--class jq_build_ext(build_ext):
-- def run(self):
-- if not os.path.exists(dependency_path(".")):
-- os.makedirs(dependency_path("."))
-- self._build_oniguruma()
-- self._build_libjq()
-- build_ext.run(self)
--
-- def _build_oniguruma(self):
-- self._build_lib(
-- source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
-- tarball_path=oniguruma_lib_tarball_path,
-- lib_dir=oniguruma_lib_build_dir,
-- commands=[
-- ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
-- ["make"],
-- ["make", "install"],
-- ])
--
--
-- def _build_libjq(self):
-- self._build_lib(
-- 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=[
-- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
-- ["make"],
-- ])
--
-- def _build_lib(self, source_url, tarball_path, lib_dir, commands):
-- self._download_tarball(
-- source_url=source_url,
-- tarball_path=tarball_path,
-- lib_dir=lib_dir,
-- )
--
-- macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
-- if macosx_deployment_target:
-- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
--
-- def run_command(args):
-- print("Executing: %s" % ' '.join(args))
-- subprocess.check_call(args, cwd=lib_dir)
--
-- for command in commands:
-- run_command(command)
--
-- def _download_tarball(self, source_url, tarball_path, lib_dir):
-- if os.path.exists(tarball_path):
-- os.unlink(tarball_path)
-- print("Downloading {}".format(source_url))
-- urlretrieve(source_url, tarball_path)
-- print("Downloaded {}".format(source_url))
--
-- if os.path.exists(lib_dir):
-- shutil.rmtree(lib_dir)
-- tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
--
--
- jq_extension = Extension(
- "jq",
- sources=["jq.c"],
-- include_dirs=[os.path.join(jq_lib_dir, "src")],
-- extra_link_args=["-lm"],
-- extra_objects=[
-- os.path.join(jq_lib_dir, ".libs/libjq.a"),
-- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
-- ],
-+ libraries=["jq"]
- )
-
- setup(
-@@ -120,7 +26,6 @@ setup(
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
- license='BSD 2-Clause',
- ext_modules = [jq_extension],
-- cmdclass={"build_ext": jq_build_ext},
- classifiers=[
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
-@@ -137,4 +42,3 @@ setup(
- 'Programming Language :: Python :: 3.9',
- ],
- )
--
---
-2.29.3
diff --git a/srcpkgs/python3-jq/patches/setup.py.patch b/srcpkgs/python3-jq/patches/setup.py.patch
new file mode 100644
index 000000000000..9ccffed61039
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/setup.py.patch
@@ -0,0 +1,24 @@
+--- a/setup.py.orig 2022-09-19 15:51:09 UTC
++++ b/setup.py
+@@ -36,8 +36,6 @@ class jq_build_ext(build_ext):
+ def run(self):
+ if not os.path.exists(_dep_build_path(".")):
+ os.makedirs(_dep_build_path("."))
+- self._build_oniguruma()
+- self._build_libjq()
+ build_ext.run(self)
+
+ def _build_oniguruma(self):
+@@ -87,11 +85,7 @@ jq_extension = Extension(
+ "jq",
+ sources=["jq.c"],
+ include_dirs=[os.path.join(jq_lib_dir, "src")],
+- extra_link_args=["-lm"],
+- extra_objects=[
+- os.path.join(jq_lib_dir, ".libs/libjq.a"),
+- os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+- ],
++ extra_link_args=["-lm", "-ljq", "-lonig"],
+ )
+
+ setup(
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
index 443318c6bbd7..1a91caae99cb 100644
--- a/srcpkgs/python3-jq/template
+++ b/srcpkgs/python3-jq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-jq'
pkgname=python3-jq
-version=1.2.3
+version=1.3.0
revision=1
wrksrc="${pkgname#*-}.py-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
-makedepends="python3-devel jq-devel"
+makedepends="python3-devel jq-devel oniguruma-devel"
depends="python3"
short_desc="Python bindings for jq"
maintainer="RunningDroid <runningdroid@zoho.com>"
@@ -13,10 +13,10 @@ license="BSD-2-Clause"
homepage="https://pypi.org/project/jq/"
changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst"
distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
-checksum=52392e001cd90769d68f4e46821c645e277b9c1db01528a6bbc9d1875b81fcf5
+checksum=736e0d42d719592189cdd9921eab19d5bb4b65a3ce41a8f8f13794153fc5a5b1
pre_build() {
- cython jq.pyx
+ cython -X language_level=3 jq.pyx
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: python3-jq: update to 1.3.0.
2022-09-24 5:55 [PR PATCH] python3-jq: update to 1.3.0 RunningDroid
` (2 preceding siblings ...)
2022-09-26 1:53 ` RunningDroid
@ 2022-10-02 1:40 ` classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2022-10-02 1:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
There's a merged pull request on the void-packages repository
python3-jq: update to 1.3.0.
https://github.com/void-linux/void-packages/pull/39441
Description:
I replaced the existing patch (which came from Arch) with FreeBSD's patch because Arch's patch no longer applies and I also added the `-X language_level=3` argument to `cython` to silence a warning
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-02 1:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-24 5:55 [PR PATCH] python3-jq: update to 1.3.0 RunningDroid
2022-09-24 7:56 ` [PR PATCH] [Updated] " RunningDroid
2022-09-25 6:45 ` RunningDroid
2022-09-26 1:53 ` RunningDroid
2022-10-02 1:40 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).