From ac57a2056bf295ab88090cf8f21c8e184f587548 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 15 Feb 2023 14:49:33 -0500 Subject: [PATCH 1/6] python3-saml2: update to 7.4.1. --- srcpkgs/python3-saml2/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template index f805b568071c..0a386d5c2ae1 100644 --- a/srcpkgs/python3-saml2/template +++ b/srcpkgs/python3-saml2/template @@ -1,12 +1,13 @@ # Template file for 'python3-saml2' pkgname=python3-saml2 -version=7.2.1 -revision=2 -build_style=python3-module +version=7.4.1 +revision=1 +build_style=python3-pep517 make_check_args="--ignore=tests/test_36_mdbcache.py \ --ignore=tests/test_75_mongodb.py \ --ignore=tests/test_76_metadata_in_mdb.py" -hostmakedepends="python3-setuptools" +make_install_target="dist/pysaml2-${version}-*-*-*.whl" +hostmakedepends="python3-poetry-core unzip" depends="python3-cryptography python3-openssl python3-dateutil python3-pytz python3-requests python3-six python3-defusedxml python3-xmlschema" checkdepends="python3-pytest python3-mock xmlsec1-devel python3-responses @@ -17,5 +18,9 @@ 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=c6f5e36c0df040ebeccc0acc0be65960a2f12aaba1d77bbdae29cc3c475b0cdc +checksum=33afba452544662887f6eb8c6405aeebfa4017dc7762e414ab4318f2f9d9bb6d make_check_pre="env PYTHONPATH=src" + +pre_check() { + unzip ${make_install_target} "*.dist-info/*" +} From 0d40d8d2285edc0385d8541182dd2ccfcd41a94c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Wed, 15 Feb 2023 15:04:32 -0500 Subject: [PATCH 2/6] python3-prometheus_client: update to 0.16.0. --- srcpkgs/python3-prometheus_client/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template index 7ce3f8fd4f70..4dc4c5551208 100644 --- a/srcpkgs/python3-prometheus_client/template +++ b/srcpkgs/python3-prometheus_client/template @@ -1,7 +1,7 @@ # Template file for 'python3-prometheus_client' pkgname=python3-prometheus_client -version=0.15.0 -revision=2 +version=0.16.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" @@ -11,4 +11,4 @@ maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/prometheus/client_python" distfiles="${PYPI_SITE}/p/prometheus_client/prometheus_client-${version}.tar.gz" -checksum=be26aa452490cfcf6da953f9436e95a9f2b4d578ca80094b4458930e5f584ab1 +checksum=a03e35b359f14dd1630898543e2120addfdeacd1a6069c1367ae90fd93ad3f48 From 330100946dcdbce7a5f48425f94f37e05d15c2ec Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Feb 2023 13:01:40 -0500 Subject: [PATCH 3/6] python3-simplejson: update to 3.18.3. --- srcpkgs/python3-simplejson/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-simplejson/template b/srcpkgs/python3-simplejson/template index a9e633934894..45dbc20e5a8c 100644 --- a/srcpkgs/python3-simplejson/template +++ b/srcpkgs/python3-simplejson/template @@ -1,6 +1,6 @@ # Template file for 'python3-simplejson' pkgname=python3-simplejson -version=3.18.1 +version=3.18.3 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ license="MIT, AFL-2.1" homepage="https://github.com/simplejson/simplejson" changelog="https://raw.githubusercontent.com/simplejson/simplejson/master/CHANGES.txt" distfiles="https://github.com/simplejson/simplejson/archive/refs/tags/v${version}.tar.gz" -checksum=a31ab0eff7847cf2d0ed0d3fe5ae10f5c8551370d5c072921688b5a2f62e93b1 +checksum=366d567166a38e8de28fd08bb5e374cad6d9c4ab57ce326c97fc761b3c5b0e4d post_install() { vlicense LICENSE.txt LICENSE From b80a20631924880c53a4e5fda42bfa5bc37d040f Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Mar 2023 14:25:09 -0400 Subject: [PATCH 4/6] python3-phonenumbers: update to 8.13.8. --- srcpkgs/python3-phonenumbers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template index f9b99499d502..a8d9ee962a77 100644 --- a/srcpkgs/python3-phonenumbers/template +++ b/srcpkgs/python3-phonenumbers/template @@ -1,6 +1,6 @@ # Template file for 'python3-phonenumbers' pkgname=python3-phonenumbers -version=8.13.6 +version=8.13.8 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ 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=f8bd92975ba7463b7828ae2f95e1037b7e0ab8f023e9e8ffb7c560fd7f5d66d7 +checksum=4ba92a917fb8f6e3fe33fd04b9d84299852ce237289129ee4eda47a043a5c6c4 From 336c589e6febf8b028adb1939f40fce4a787e7a4 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Mar 2023 14:57:34 -0400 Subject: [PATCH 5/6] python3-canonicaljson: update to 1.6.5. --- srcpkgs/python3-canonicaljson/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template index b0d08e1ed59c..d050094a7d5e 100644 --- a/srcpkgs/python3-canonicaljson/template +++ b/srcpkgs/python3-canonicaljson/template @@ -1,6 +1,6 @@ # Template file for 'python3-canonicaljson' pkgname=python3-canonicaljson -version=1.6.4 +version=1.6.5 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -10,6 +10,7 @@ short_desc="Canonical JSON" maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/python-canonicaljson" +changelog="https://raw.githubusercontent.com/matrix-org/python-canonicaljson/main/CHANGES.md" distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz" -checksum=6c09b2119511f30eb1126cfcd973a10824e20f1cfd25039cde3d1218dd9c8d8f +checksum=68dfc157b011e07d94bf74b5d4ccc01958584ed942d9dfd5fdd706609e81cd4b make_check_pre="env PYTHONPATH=src" From f1aa5083d20aae158b6f610e1dae9ef094580ce7 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Feb 2023 13:00:32 -0500 Subject: [PATCH 6/6] synapse: update to 1.80.0. --- .../patches/revert_frozendict_upperbound.patch | 13 +++++++++++++ srcpkgs/synapse/template | 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/synapse/patches/revert_frozendict_upperbound.patch diff --git a/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch b/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch new file mode 100644 index 000000000000..4a5e068a828b --- /dev/null +++ b/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch @@ -0,0 +1,13 @@ +--- b/pyproject.toml ++++ a/pyproject.toml +@@ -154,9 +154,7 @@ + # we use the TYPE_CHECKER.redefine method added in jsonschema 3.0.0 + jsonschema = ">=3.0.0" + # frozendict 2.1.2 is broken on Debian 10: https://github.com/Marco-Sulla/python-frozendict/issues/41 ++frozendict = ">=1,!=2.1.2" +-# We cannot test our wheels against the 2.3.5 release in CI. Putting in an upper bound for this +-# because frozendict has been more trouble than it's worth; we would like to move to immutabledict. +-frozendict = ">=1,!=2.1.2,<2.3.5" + # We require 2.1.0 or higher for type hints. Previous guard was >= 1.1.0 + unpaddedbase64 = ">=2.1.0" + # We require 1.5.0 to work around an issue when running against the C implementation of diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index fb46570d8059..9fd2a9018d9c 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.77.0 +version=1.80.0 revision=1 build_style=python3-pep517 build_helper=rust @@ -24,7 +24,7 @@ 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=d84eceb807ed03e6d580990008bc82e29d20cd62bd11a8b73a559c0fb2797504 +checksum=7835d4790fb340269595fd792a6f7d6e49b004698634eca3c2453b8adc21b9f9 if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" @@ -39,7 +39,7 @@ make_dirs=" /var/log/synapse 0755 synapse synapse" pre_check() { - unzip ${make_install_target} "*.dist-info/*" + yes | unzip ${make_install_target} "*.dist-info/*" [ -d build/lib* ] && cp -r tests build/lib* }