From 887adc128a5bab896df79bfa8307f6455d1a42bf Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 10 Nov 2021 08:48:47 -0500 Subject: [PATCH 1/7] python3-canonicaljson: update to 1.5.0, adopt. --- srcpkgs/python3-canonicaljson/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template index 88ffaede6ebd..7dbdf1adb9d0 100644 --- a/srcpkgs/python3-canonicaljson/template +++ b/srcpkgs/python3-canonicaljson/template @@ -1,14 +1,15 @@ # Template file for 'python3-canonicaljson' pkgname=python3-canonicaljson -version=1.4.0 -revision=2 +version=1.5.0 +revision=1 wrksrc="canonicaljson-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-simplejson python3-frozendict" +checkdepends="${depends} python3-pytest" short_desc="Canonical JSON" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/python-canonicaljson" distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz" -checksum=899b7604f5a6a8a92109115d9250142cdf0b1dfdcb62cdb21d8fb5bf37780631 +checksum=5ebddcd74c5b066ee68ecca56465338e9b1380467e0a906f4797697c9fb381e2 From 2daab3e5e02cc7ebf0ec60b3f1b7c5c0a7be7fb7 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 10 Nov 2021 09:15:30 -0500 Subject: [PATCH 2/7] python3-unpaddedbase64: update to 2.1.0, adopt. --- srcpkgs/python3-unpaddedbase64/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template index dab9eac87fe6..e751848ad4b2 100644 --- a/srcpkgs/python3-unpaddedbase64/template +++ b/srcpkgs/python3-unpaddedbase64/template @@ -1,15 +1,15 @@ # Template file for 'python3-unpaddedbase64' pkgname=python3-unpaddedbase64 -version=1.1.0 -revision=4 +version=2.1.0 +revision=1 wrksrc="python-unpaddedbase64-${version}" -build_style=python3-module -pycompile_module="unpaddedbase64.py" -hostmakedepends="python3-setuptools" +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" depends="python3" +checkdepends="python3-pytest" short_desc="Encode and decode Base64 without '=' padding" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="Apache-2.0" -homepage="https://pypi.org/project/unpaddedbase64/" +homepage="https://github.com/matrix-org/python-unpaddedbase64" distfiles="https://github.com/matrix-org/python-unpaddedbase64/archive/v${version}.tar.gz" -checksum=4e3fc1883e75f70380e903e858ffdcb77b85624213ab9559c5f1e5917491bb73 +checksum=8f3aeae62aad49ee385c15c37bb64b625c96bb85a820aeab149c21970843ba68 From 23ff2f0bb86084f22b963862118fb8f97a0ac467 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 10 Nov 2021 09:25:13 -0500 Subject: [PATCH 3/7] python3-phonenumbers: update to 8.12.37, adopt. --- srcpkgs/python3-phonenumbers/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template index 4242d2623783..70699dac90eb 100644 --- a/srcpkgs/python3-phonenumbers/template +++ b/srcpkgs/python3-phonenumbers/template @@ -1,14 +1,15 @@ # Template file for 'python3-phonenumbers' pkgname=python3-phonenumbers -version=8.12.13 -revision=2 +version=8.12.37 +revision=1 wrksrc="phonenumbers-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" short_desc="Library for dealing with international phone numbers" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/daviddrysdale/python-phonenumbers" +changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md" distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz" -checksum=96d02120a3481e22d8a8eb5e4595ceec1930855749f6e4a06ef931881f59f562 +checksum=dbc560992844a059f56c7c0c6a587904e65d956740bbfb7e39589980bc9055b8 From c001978bea0e96304f745a8bb90df03a2ee557ea Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 10 Nov 2021 09:40:07 -0500 Subject: [PATCH 4/7] python3-saml2: update to 7.1.0, adopt. --- srcpkgs/python3-saml2/template | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template index 355d99a85c68..c506b92e2486 100644 --- a/srcpkgs/python3-saml2/template +++ b/srcpkgs/python3-saml2/template @@ -1,7 +1,7 @@ # Template file for 'python3-saml2' pkgname=python3-saml2 -version=6.5.1 -revision=2 +version=7.1.0 +revision=1 wrksrc="pysaml2-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,20 +10,12 @@ depends="python3-cryptography python3-openssl python3-dateutil python3-xmlschema" checkdepends="python3-pytest python3-mock xmlsec1-devel $depends" short_desc="Python3 implementation of SAML Version 2 Standard" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/IdentityPython/pysaml2" +changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md" distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz" -checksum=3940f4b7da41f42d4155a21d50d28145b5bfec4724300553f09e4fe647f76cf9 - -post_patch() { - # importlib_resources just delegate to importlib.resources - # in Python 3.9 - vsed -i -e 's/importlib_resources/importlib.resources/' \ - src/saml2/xml/schema/__init__.py \ - src/saml2/sigver.py - vsed -i -e '/importlib_resources/d' setup.cfg -} +checksum=2c5224cd52525d92000c0a5a2f732718fa9935de98c1c42e6dbea322aeffdd6d do_check() { # Ignore tests that depend on packages not provided by Void From d55b2daf482ce4bf974c071d4696cb054256e1c2 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 10 Nov 2021 10:00:02 -0500 Subject: [PATCH 5/7] python3-treq: update to 21.5.0, adopt. --- srcpkgs/python3-treq/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template index d312d6beb046..281981f220af 100644 --- a/srcpkgs/python3-treq/template +++ b/srcpkgs/python3-treq/template @@ -1,18 +1,22 @@ # Template file for 'python3-treq' pkgname=python3-treq -version=20.3.0 -revision=4 +version=21.5.0 +revision=1 wrksrc="treq-${version}" build_style=python3-module +make_check_args="--ignore=src/treq/test/local_httpbin \ + --ignore=src/treq/test/test_treq_integration.py" hostmakedepends="python3-setuptools python3-incremental" -depends="python3-incremental python3-requests python3-six +depends="python3-incremental python3-requests python3-hyperlink python3-Twisted python3-attrs" +checkdepends="${depends} python3-pytest" short_desc="Requests-like API built on top of twisted.web's Agent" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="MIT" homepage="https://github.com/twisted/treq" +changelog="https://raw.githubusercontent.com/twisted/treq/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/t/treq/treq-${version}.tar.gz" -checksum=a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 +checksum=02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8 post_install() { vlicense LICENSE From 2390e39fef7533781f0a8f112a21f8f72f69e4c0 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 10 Nov 2021 08:51:35 -0500 Subject: [PATCH 6/7] python3-signedjson: update to 1.1.1, adopt. --- .../patches/importlib_metadata.patch | 39 +++++++++++++++++++ srcpkgs/python3-signedjson/template | 19 ++++----- 2 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch new file mode 100644 index 000000000000..d7553958cc15 --- /dev/null +++ b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch @@ -0,0 +1,39 @@ +From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001 +From: MeggyCal +Date: Tue, 21 Apr 2020 18:55:37 +0200 +Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9) + +--- + setup.py | 2 +- + signedjson/__init__.py | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9c09760..c1cc299 100755 +--- a/setup.py ++++ b/setup.py +@@ -41,7 +41,7 @@ def read_file(path_segments): + "pynacl>=0.3.0", + "typing_extensions>=3.5", + 'typing>=3.5;python_version<"3.5"', +- "importlib_metadata", ++ 'importlib_metadata;python_version<"3.8"', + ], + long_description=read_file(("README.rst",)), + keywords="json", +diff --git a/signedjson/__init__.py b/signedjson/__init__.py +index 6641e64..62faa5e 100644 +--- a/signedjson/__init__.py ++++ b/signedjson/__init__.py +@@ -12,7 +12,10 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-from importlib_metadata import version, PackageNotFoundError ++try: ++ from importlib.metadata import version, PackageNotFoundError ++except ImportError: # pragma: nocover ++ from importlib_metadata import version, PackageNotFoundError + + try: + __version__ = version(__name__) diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template index 60616a1791dc..bf9a8ddc1255 100644 --- a/srcpkgs/python3-signedjson/template +++ b/srcpkgs/python3-signedjson/template @@ -1,15 +1,16 @@ # Template file for 'python3-signedjson' pkgname=python3-signedjson -version=1.1.0 -revision=4 -wrksrc="python-signedjson-${version}" +version=1.1.1 +revision=1 +wrksrc="signedjson-${version}" build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1 - python3-pynacl" +hostmakedepends="python3-setuptools_scm" +depends="python3-canonicaljson python3-unpaddedbase64 python3-pynacl + python3-typing_extensions" +checkdepends="${depends} python3-pytest" short_desc="Sign JSON with Ed25519 signatures" -maintainer="Orphaned " +maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/python-signedjson" -distfiles="https://github.com/matrix-org/python-signedjson/archive/v${version}.tar.gz" -checksum=1daf71f476245f7e5c2b06a1e0b617e800d7a39bbc943263e99f00536dbe9347 +distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz" +checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009 From e0ecce7a84bb62f9f0f1770cd0f43fba32cda7f4 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 3 Nov 2021 10:16:56 -0400 Subject: [PATCH 7/7] synapse: update to 1.47.0, adopt. --- srcpkgs/synapse/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 57f8a3b06822..360be0e7b8a6 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.46.0 +version=1.47.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,13 +12,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml python3-saml2 python3-treq python3-macaroons python3-sortedcontainers python3-typing_extensions python3-ijson" +checkdepends="$depends python3-parameterized" short_desc="Matrix reference homeserver" -maintainer="Pete " +maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=5f730958e57b8196ee9352b8abc32da612296f8febf675dec76e0b9d3a322ec5 +checksum=329e5f075fd68835f36a2aa960e6c5fd7e9f82d79797350870f581a2c47f3a42 system_accounts="synapse" synapse_homedir="/var/lib/synapse" @@ -27,6 +28,10 @@ make_dirs=" /var/lib/synapse 0700 synapse synapse /etc/synapse 0755 synapse synapse" +do_check() { + PYTHONPATH="." trial3 tests +} + post_install() { vsv synapse }