* Re: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
@ 2021-04-15 19:37 ` RunningDroid
2021-04-15 20:45 ` RunningDroid
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-15 19:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#issuecomment-820683341
Comment:
I forgot to run the tests, I'm fixing them now.
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
2021-04-15 19:37 ` RunningDroid
@ 2021-04-15 20:45 ` RunningDroid
2021-04-16 13:59 ` RunningDroid
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-15 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
New comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#issuecomment-820683341
Comment:
I forgot to run the tests, I'm fixing them now.
Edit: the tests are failing because urlwatch wants [jq.py](https://github.com/mwilliamson/jq.py) which wants to download and build jq and oniguruma. I'm not very familiar with the details of setup.py so there may be a simple way to tell it to use the system libs that I'm not seeing.
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
2021-04-15 19:37 ` RunningDroid
2021-04-15 20:45 ` RunningDroid
@ 2021-04-16 13:59 ` RunningDroid
2021-04-16 14:18 ` [PR REVIEW] " ericonr
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-16 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#issuecomment-821197628
Comment:
My computer died, so it might be a day or 2 before I can get back to this.
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR REVIEW] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (2 preceding siblings ...)
2021-04-16 13:59 ` RunningDroid
@ 2021-04-16 14:18 ` ericonr
2021-04-17 0:31 ` FollieHiyuki
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-04-16 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#discussion_r614874200
Comment:
Add `jq` here (or even in `depeds`) and that part should work.
https://urlwatch.readthedocs.io/en/latest/dependencies.html lists some other optional dependencies.
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR REVIEW] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (3 preceding siblings ...)
2021-04-16 14:18 ` [PR REVIEW] " ericonr
@ 2021-04-17 0:31 ` FollieHiyuki
2021-04-19 0:58 ` [PR PATCH] [Updated] " RunningDroid
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: FollieHiyuki @ 2021-04-17 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#discussion_r615178137
Comment:
That doesn't work though. What it needs is the jq Python bindings [jq.py](https://github.com/mwilliamson/jq.py), not `jq` itself. We can add it as a new package.
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Updated] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (4 preceding siblings ...)
2021-04-17 0:31 ` FollieHiyuki
@ 2021-04-19 0:58 ` RunningDroid
2021-04-19 1:03 ` RunningDroid
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-19 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_urlwatch
https://github.com/void-linux/void-packages/pull/30255
urlwatch: update to 2.23 and claim maintainership
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_urlwatch-30255.patch --]
[-- Type: text/x-diff, Size: 8657 bytes --]
From 8c0ece1a9fa66ac9f79dde195f5ff9959007bd5b Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 18 Apr 2021 20:33:13 -0400
Subject: [PATCH 1/2] New Package: python3-jq
---
.../python3-jq/patches/build-system-fix.patch | 143 ++++++++++++++++++
srcpkgs/python3-jq/template | 25 +++
2 files changed, 168 insertions(+)
create mode 100644 srcpkgs/python3-jq/patches/build-system-fix.patch
create mode 100644 srcpkgs/python3-jq/template
diff --git a/srcpkgs/python3-jq/patches/build-system-fix.patch b/srcpkgs/python3-jq/patches/build-system-fix.patch
new file mode 100644
index 000000000000..101555e15b21
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/build-system-fix.patch
@@ -0,0 +1,143 @@
+Common subdirectories: jq.py-1.1.2/.github and jq.py-1.1.2.new/.github
+diff --color -u jq.py-1.1.2/pyproject.toml jq.py-1.1.2.new/pyproject.toml
+--- jq.py-1.1.2/pyproject.toml 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/pyproject.toml 2021-04-18 13:30:37.287929598 -0400
+@@ -2,7 +2,6 @@
+ requires = [
+ "setuptools>=43",
+ "wheel",
+- "requests",
+- "certifi"
++ "Cython"
+ ]
+ build-backend = "setuptools.build_meta"
+diff --color -u jq.py-1.1.2/setup.py jq.py-1.1.2.new/setup.py
+--- jq.py-1.1.2/setup.py 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/setup.py 2021-04-18 13:29:53.042760038 -0400
+@@ -1,113 +1,20 @@
+ #!/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
++from Cython.Build import cythonize
+
+
+-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(
+@@ -119,8 +26,7 @@
+ url='http://github.com/mwilliamson/jq.py',
+ 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},
++ ext_modules=cythonize("jq.pyx", compiler_directives={'language_level': 3}),
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+Common subdirectories: jq.py-1.1.2/tests and jq.py-1.1.2.new/tests
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..7df94a32d6c4
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.1.2
+revision=1
+wrksrc="jq.py-${version}"
+build_style=python3-module
+hostmakedepends=""
+makedepends="jq-devel python3-Cython python3-devel"
+patch_args="-Np1"
+checkdepends="python3-nose"
+depends="jq-devel"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/mwilliamson/jq.py"
+distfiles="https://github.com/mwilliamson/jq.py/archive/refs/tags/${version}.tar.gz"
+checksum=55668335bc6b121a2c4e929b6332b2e6f6c3cea7a57f20cc364e1c5dc07d6fb5
+
+# fail at linktime so it doesn't fail at runtime
+LDFLAGS="${LDFLAGS}-Xlinker --require-defined=jv_object_iter_key"
+
+do_check() {
+ # the tests assume jq is available to import at this point
+ PYTHONPATH='build/lib.linux-x86_64-3.9/' nosetests3 tests
+}
From be6f2e661be1caa0d5ea1d8afd3443497032e125 Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH 2/2] urlwatch: update to 2.23 and claim maintainership
---
srcpkgs/urlwatch/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..016959b1c06f 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
# Template file for 'urlwatch'
pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,13 +9,13 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
# Check the Docs for optional packages:
# https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
do_check() {
# skip the tests that require python modules that aren't packaged
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Updated] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (5 preceding siblings ...)
2021-04-19 0:58 ` [PR PATCH] [Updated] " RunningDroid
@ 2021-04-19 1:03 ` RunningDroid
2021-04-19 1:06 ` RunningDroid
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-19 1:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_urlwatch
https://github.com/void-linux/void-packages/pull/30255
urlwatch: update to 2.23 and claim maintainership
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_urlwatch-30255.patch --]
[-- Type: text/x-diff, Size: 8678 bytes --]
From de6e8e3cd7568ad518db83a1f3f6bb12889d7e55 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 18 Apr 2021 20:33:13 -0400
Subject: [PATCH 1/2] New Package: python3-jq
---
.../python3-jq/patches/build-system-fix.patch | 143 ++++++++++++++++++
srcpkgs/python3-jq/template | 28 ++++
2 files changed, 171 insertions(+)
create mode 100644 srcpkgs/python3-jq/patches/build-system-fix.patch
create mode 100644 srcpkgs/python3-jq/template
diff --git a/srcpkgs/python3-jq/patches/build-system-fix.patch b/srcpkgs/python3-jq/patches/build-system-fix.patch
new file mode 100644
index 000000000000..101555e15b21
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/build-system-fix.patch
@@ -0,0 +1,143 @@
+Common subdirectories: jq.py-1.1.2/.github and jq.py-1.1.2.new/.github
+diff --color -u jq.py-1.1.2/pyproject.toml jq.py-1.1.2.new/pyproject.toml
+--- jq.py-1.1.2/pyproject.toml 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/pyproject.toml 2021-04-18 13:30:37.287929598 -0400
+@@ -2,7 +2,6 @@
+ requires = [
+ "setuptools>=43",
+ "wheel",
+- "requests",
+- "certifi"
++ "Cython"
+ ]
+ build-backend = "setuptools.build_meta"
+diff --color -u jq.py-1.1.2/setup.py jq.py-1.1.2.new/setup.py
+--- jq.py-1.1.2/setup.py 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/setup.py 2021-04-18 13:29:53.042760038 -0400
+@@ -1,113 +1,20 @@
+ #!/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
++from Cython.Build import cythonize
+
+
+-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(
+@@ -119,8 +26,7 @@
+ url='http://github.com/mwilliamson/jq.py',
+ 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},
++ ext_modules=cythonize("jq.pyx", compiler_directives={'language_level': 3}),
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+Common subdirectories: jq.py-1.1.2/tests and jq.py-1.1.2.new/tests
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..380e70ba7c57
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.1.2
+revision=1
+wrksrc="jq.py-${version}"
+build_style=python3-module
+makedepends="jq-devel python3-Cython python3-devel"
+checkdepends="python3-nose"
+depends="jq-devel"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/mwilliamson/jq.py"
+distfiles="https://github.com/mwilliamson/jq.py/archive/refs/tags/${version}.tar.gz"
+checksum=55668335bc6b121a2c4e929b6332b2e6f6c3cea7a57f20cc364e1c5dc07d6fb5
+patch_args="-Np1"
+
+# fail at linktime so it doesn't fail at runtime
+LDFLAGS="${LDFLAGS}-Xlinker --require-defined=jv_object_iter_key"
+
+post_build() {
+ vlicense LICENSE
+}
+
+do_check() {
+ # the tests assume jq is available to import at this point
+ PYTHONPATH='build/lib.linux-x86_64-3.9/' nosetests3 tests
+}
From 6fc3c3e3e9bab99e0aabddd53bcae5ff49fb989a Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH 2/2] urlwatch: update to 2.23 and claim maintainership
---
srcpkgs/urlwatch/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..016959b1c06f 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
# Template file for 'urlwatch'
pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,13 +9,13 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
# Check the Docs for optional packages:
# https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
do_check() {
# skip the tests that require python modules that aren't packaged
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Updated] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (6 preceding siblings ...)
2021-04-19 1:03 ` RunningDroid
@ 2021-04-19 1:06 ` RunningDroid
2021-04-19 1:48 ` RunningDroid
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-19 1:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_urlwatch
https://github.com/void-linux/void-packages/pull/30255
urlwatch: update to 2.23 and claim maintainership
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_urlwatch-30255.patch --]
[-- Type: text/x-diff, Size: 8678 bytes --]
From 03d20d384a193683741ecebb760efed087734a7a Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 18 Apr 2021 20:33:13 -0400
Subject: [PATCH 1/2] New Package: python3-jq
---
.../python3-jq/patches/build-system-fix.patch | 143 ++++++++++++++++++
srcpkgs/python3-jq/template | 28 ++++
2 files changed, 171 insertions(+)
create mode 100644 srcpkgs/python3-jq/patches/build-system-fix.patch
create mode 100644 srcpkgs/python3-jq/template
diff --git a/srcpkgs/python3-jq/patches/build-system-fix.patch b/srcpkgs/python3-jq/patches/build-system-fix.patch
new file mode 100644
index 000000000000..101555e15b21
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/build-system-fix.patch
@@ -0,0 +1,143 @@
+Common subdirectories: jq.py-1.1.2/.github and jq.py-1.1.2.new/.github
+diff --color -u jq.py-1.1.2/pyproject.toml jq.py-1.1.2.new/pyproject.toml
+--- jq.py-1.1.2/pyproject.toml 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/pyproject.toml 2021-04-18 13:30:37.287929598 -0400
+@@ -2,7 +2,6 @@
+ requires = [
+ "setuptools>=43",
+ "wheel",
+- "requests",
+- "certifi"
++ "Cython"
+ ]
+ build-backend = "setuptools.build_meta"
+diff --color -u jq.py-1.1.2/setup.py jq.py-1.1.2.new/setup.py
+--- jq.py-1.1.2/setup.py 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/setup.py 2021-04-18 13:29:53.042760038 -0400
+@@ -1,113 +1,20 @@
+ #!/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
++from Cython.Build import cythonize
+
+
+-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(
+@@ -119,8 +26,7 @@
+ url='http://github.com/mwilliamson/jq.py',
+ 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},
++ ext_modules=cythonize("jq.pyx", compiler_directives={'language_level': 3}),
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+Common subdirectories: jq.py-1.1.2/tests and jq.py-1.1.2.new/tests
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..82e1928f603a
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.1.2
+revision=1
+wrksrc="jq.py-${version}"
+build_style=python3-module
+makedepends="jq-devel python3-Cython python3-devel"
+depends="jq-devel"
+checkdepends="python3-nose"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/mwilliamson/jq.py"
+distfiles="https://github.com/mwilliamson/jq.py/archive/refs/tags/${version}.tar.gz"
+checksum=55668335bc6b121a2c4e929b6332b2e6f6c3cea7a57f20cc364e1c5dc07d6fb5
+patch_args="-Np1"
+
+# fail at linktime so it doesn't fail at runtime
+LDFLAGS="${LDFLAGS}-Xlinker --require-defined=jv_object_iter_key"
+
+post_build() {
+ vlicense LICENSE
+}
+
+do_check() {
+ # the tests assume jq is available to import at this point
+ PYTHONPATH='build/lib.linux-x86_64-3.9/' nosetests3 tests
+}
From 89d273e98e68cc69482a75ac8e53ba2826a435ca Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH 2/2] urlwatch: update to 2.23 and claim maintainership
---
srcpkgs/urlwatch/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..016959b1c06f 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
# Template file for 'urlwatch'
pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,13 +9,13 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
# Check the Docs for optional packages:
# https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
do_check() {
# skip the tests that require python modules that aren't packaged
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Updated] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (7 preceding siblings ...)
2021-04-19 1:06 ` RunningDroid
@ 2021-04-19 1:48 ` RunningDroid
2021-04-21 15:32 ` ericonr
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-19 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_urlwatch
https://github.com/void-linux/void-packages/pull/30255
urlwatch: update to 2.23 and claim maintainership
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_urlwatch-30255.patch --]
[-- Type: text/x-diff, Size: 8702 bytes --]
From 521779b5bc414601f3a53c0de92872f4a389f624 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 18 Apr 2021 20:33:13 -0400
Subject: [PATCH 1/2] New Package: python3-jq
---
.../python3-jq/patches/build-system-fix.patch | 143 ++++++++++++++++++
srcpkgs/python3-jq/template | 28 ++++
2 files changed, 171 insertions(+)
create mode 100644 srcpkgs/python3-jq/patches/build-system-fix.patch
create mode 100644 srcpkgs/python3-jq/template
diff --git a/srcpkgs/python3-jq/patches/build-system-fix.patch b/srcpkgs/python3-jq/patches/build-system-fix.patch
new file mode 100644
index 000000000000..101555e15b21
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/build-system-fix.patch
@@ -0,0 +1,143 @@
+Common subdirectories: jq.py-1.1.2/.github and jq.py-1.1.2.new/.github
+diff --color -u jq.py-1.1.2/pyproject.toml jq.py-1.1.2.new/pyproject.toml
+--- jq.py-1.1.2/pyproject.toml 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/pyproject.toml 2021-04-18 13:30:37.287929598 -0400
+@@ -2,7 +2,6 @@
+ requires = [
+ "setuptools>=43",
+ "wheel",
+- "requests",
+- "certifi"
++ "Cython"
+ ]
+ build-backend = "setuptools.build_meta"
+diff --color -u jq.py-1.1.2/setup.py jq.py-1.1.2.new/setup.py
+--- jq.py-1.1.2/setup.py 2021-01-27 09:56:50.000000000 -0500
++++ jq.py-1.1.2.new/setup.py 2021-04-18 13:29:53.042760038 -0400
+@@ -1,113 +1,20 @@
+ #!/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
++from Cython.Build import cythonize
+
+
+-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(
+@@ -119,8 +26,7 @@
+ url='http://github.com/mwilliamson/jq.py',
+ 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},
++ ext_modules=cythonize("jq.pyx", compiler_directives={'language_level': 3}),
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+Common subdirectories: jq.py-1.1.2/tests and jq.py-1.1.2.new/tests
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..f914cfb39f37
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,28 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.1.2
+revision=1
+wrksrc="jq.py-${version}"
+build_style=python3-module
+makedepends="jq-devel python3-Cython python3-devel"
+depends="jq-devel"
+checkdepends="python3-nose"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/mwilliamson/jq.py"
+distfiles="https://github.com/mwilliamson/jq.py/archive/refs/tags/${version}.tar.gz"
+checksum=55668335bc6b121a2c4e929b6332b2e6f6c3cea7a57f20cc364e1c5dc07d6fb5
+patch_args="-Np1"
+
+# fail at linktime if we haven't linked against libjq.so
+LDFLAGS="${LDFLAGS}-Xlinker --require-defined=jv_object_iter_key"
+
+post_build() {
+ vlicense LICENSE
+}
+
+do_check() {
+ # the tests assume jq is available to import at this point
+ PYTHONPATH="build/lib.linux-${XBPS_TARGET_MACHINE}-3.9/" nosetests3 tests
+}
From e98ff90ed9ecd4bce5b7e8b269a453de8f72020c Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH 2/2] urlwatch: update to 2.23 and claim maintainership
---
srcpkgs/urlwatch/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..016959b1c06f 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
# Template file for 'urlwatch'
pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,13 +9,13 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
# Check the Docs for optional packages:
# https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
do_check() {
# skip the tests that require python modules that aren't packaged
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (8 preceding siblings ...)
2021-04-19 1:48 ` RunningDroid
@ 2021-04-21 15:32 ` ericonr
2021-04-21 15:37 ` ericonr
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-04-21 15:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#issuecomment-824156648
Comment:
New packge commit message should include version: `New package: pkgname-version`
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (9 preceding siblings ...)
2021-04-21 15:32 ` ericonr
@ 2021-04-21 15:37 ` ericonr
2021-04-22 2:08 ` RunningDroid
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-04-21 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 420 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#issuecomment-824160098
Comment:
I think we should skip tests for urlwatch and not package `python-jq`, if you want to avoid dealing with the mess... I can try to look into it at some point, but I'm not sure it's worth it, because we'll always be fighting upstream to package it without bundling everything in...
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (10 preceding siblings ...)
2021-04-21 15:37 ` ericonr
@ 2021-04-22 2:08 ` RunningDroid
2021-04-22 2:10 ` [PR PATCH] [Updated] " RunningDroid
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-22 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
New comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/30255#issuecomment-824484358
Comment:
I'm gonna have to agree, I've basically hit a dead end with python3-jq and there aren't any other distro's packages that I can copy from: https://repology.org/project/python:jq/versions
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Updated] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (11 preceding siblings ...)
2021-04-22 2:08 ` RunningDroid
@ 2021-04-22 2:10 ` RunningDroid
2021-04-22 2:16 ` RunningDroid
2021-04-23 19:02 ` [PR PATCH] [Merged]: " ericonr
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-22 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_urlwatch
https://github.com/void-linux/void-packages/pull/30255
urlwatch: update to 2.23 and claim maintainership
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_urlwatch-30255.patch --]
[-- Type: text/x-diff, Size: 1738 bytes --]
From 9dc54e5b0b4de3fff3f9e5d801bdf0306593cb8c Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH] urlwatch: update to 2.23 and claim maintainership
---
srcpkgs/urlwatch/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..f14c0382d3c5 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
# Template file for 'urlwatch'
pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,18 +9,18 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
# Check the Docs for optional packages:
# https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
do_check() {
# skip the tests that require python modules that aren't packaged
# (pdftotext & pytesseract)
- pytest -k "not (pdf or ocr)" -v
+ pytest -k "not (pdf or ocr or json)" -v
}
post_install() {
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Updated] urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (12 preceding siblings ...)
2021-04-22 2:10 ` [PR PATCH] [Updated] " RunningDroid
@ 2021-04-22 2:16 ` RunningDroid
2021-04-23 19:02 ` [PR PATCH] [Merged]: " ericonr
14 siblings, 0 replies; 16+ messages in thread
From: RunningDroid @ 2021-04-22 2:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1608 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_urlwatch
https://github.com/void-linux/void-packages/pull/30255
urlwatch: update to 2.23 and claim maintainership
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/30255.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_urlwatch-30255.patch --]
[-- Type: text/x-diff, Size: 1574 bytes --]
From b8e6a68dce0ab9b897069665341325413bb9dde0 Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH] urlwatch: update to 2.23 and claim maintainership
---
srcpkgs/urlwatch/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..f6098a2707ce 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
# Template file for 'urlwatch'
pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -11,16 +11,16 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
checkdepends="python3-pytest python3-pycodestyle python3-docutils
python3-Pygments ${depends}"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
do_check() {
# skip the tests that require python modules that aren't packaged
# (pdftotext & pytesseract)
- pytest -k "not (pdf or ocr)" -v
+ pytest -k "not (pdf or ocr or json)" -v
}
post_install() {
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PR PATCH] [Merged]: urlwatch: update to 2.23 and claim maintainership
2021-04-15 19:26 [PR PATCH] urlwatch: update to 2.23 and claim maintainership RunningDroid
` (13 preceding siblings ...)
2021-04-22 2:16 ` RunningDroid
@ 2021-04-23 19:02 ` ericonr
14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-04-23 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]
There's a merged pull request on the void-packages repository
urlwatch: update to 2.23 and claim maintainership
https://github.com/void-linux/void-packages/pull/30255
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86-64 GLIBC)
- [x] I built this PR locally for these architectures (all crossbuilds):
- [x] aarch64-musl
- [x] armv7l
- [x] armv6l-musl
^ permalink raw reply [flat|nested] 16+ messages in thread