From d3f42ea05151064013a508c893d9513aa855183b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 22 Sep 2022 08:55:24 -0400 Subject: [PATCH 1/3] python3-matrix-common: update to 1.3.0. --- srcpkgs/python3-matrix-common/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-matrix-common/template b/srcpkgs/python3-matrix-common/template index 4ed002f4d2e6..0f71657b1a53 100644 --- a/srcpkgs/python3-matrix-common/template +++ b/srcpkgs/python3-matrix-common/template @@ -1,6 +1,6 @@ # Template file for 'python3-matrix-common' pkgname=python3-matrix-common -version=1.2.1 +version=1.3.0 revision=1 wrksrc="matrix-python-common-${version}" build_style=python3-pep517 @@ -11,5 +11,5 @@ maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/matrix-python-common" distfiles="https://github.com/matrix-org/matrix-python-common/archive/v${version}.tar.gz" -checksum=75ccb0de5b5cd551d81770addea1d2b227831f9cb83d46079ee0c74af0fb0a69 +checksum=9792a69b04904cb2da027890fe07229cc6610254268d2a5037e31aaeb7047104 make_check=no # requires unpackaged python3 module aiounittest From 009e72012672348ace37767d3aa4be377d410779 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 22 Sep 2022 10:06:13 -0400 Subject: [PATCH 2/3] common/build-style/python3-pep517.sh: use TMP instead of TMPDIR avoids side effects with setuptools_rust / rustc --- common/build-style/python3-pep517.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh index 1eeb4172492e..1d6478388a32 100644 --- a/common/build-style/python3-pep517.sh +++ b/common/build-style/python3-pep517.sh @@ -8,7 +8,7 @@ do_build() { : ${make_build_target:=.} mkdir -p build - TMPDIR=build python3 -m pip wheel --no-deps --use-pep517 --no-clean \ + TMP=build python3 -m pip wheel --no-deps --use-pep517 --no-clean \ --no-build-isolation ${make_build_args} ${make_build_target} } @@ -33,9 +33,9 @@ do_install() { make_install_target="${wheelbase//-/_}-${version}-*-*-*.whl" fi - # If do_build was overridden, make sure the TMPDIR exists + # If do_build was overridden, make sure the TMP exists mkdir -p build - TMPDIR=build python3 -m pip install --use-pep517 --prefix /usr \ + TMP=build python3 -m pip install --use-pep517 --prefix /usr \ --root ${DESTDIR} --no-deps --no-build-isolation \ --no-clean ${make_install_args} ${make_install_target} } From ce4c611288ef030e612c80d12d6be0e5e9e12fb2 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 20 Sep 2022 14:16:45 -0400 Subject: [PATCH 3/3] synapse: update to 1.68.0rc2, fix tests. --- srcpkgs/synapse/template | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 307d3d08ade8..f3e76898454a 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,11 +1,12 @@ # Template file for 'synapse' pkgname=synapse -version=1.67.0 +version=1.68.0rc2 revision=1 build_style=python3-pep517 +build_helper=rust make_check_target=tests make_install_target="matrix_synapse-${version}-*-*-*.whl" -hostmakedepends="python3-poetry-core" +hostmakedepends="python3-poetry-core python3-setuptools-rust cargo" depends="python3-jsonschema python3-frozendict python3-canonicaljson python3-signedjson python3-pynacl python3-service_identity python3-Twisted python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules @@ -14,7 +15,7 @@ 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 python3-matrix-common - python3-packaging python3-pydantic" + python3-packaging python3-pydantic python3-setuptools-rust" checkdepends="$depends python3-parameterized unzip" short_desc="Matrix reference homeserver" maintainer="Joel Beckmeyer " @@ -22,7 +23,11 @@ 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=85eeb24890c4b8e68f1e5ca4d5e69e1eb49e67cc33c450dc7c1fe7e70c023c68 +checksum=630f091860a33f6a7ef004fa1de311108a04ef41ab796d40205c0be22f8bbb99 + +if [ "$CROSS_BUILD" ]; then + makedepends+=" rust-std" +fi system_accounts="synapse" synapse_homedir="/var/lib/synapse" @@ -34,10 +39,15 @@ make_dirs=" pre_check() { unzip ${make_install_target} "*.dist-info/*" + cp -r tests "build/lib.linux-${XBPS_MACHINE/-*/}-cpython-${py3_ver/./}" } do_check() { - PYTHONPATH="." trial3 ${makejobs} tests + PYTHONPATH="$PWD/build/lib.linux-${XBPS_MACHINE/-*/}-cpython-${py3_ver/./}":"." trial3 ${makejobs} tests +} + +post_check() { + rm -r "build/lib.linux-${XBPS_MACHINE/-*/}-cpython-${py3_ver/./}/tests" } post_install() {