From f47163188071945a3bc46e56501483197af250d4 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 22 Sep 2022 08:55:24 -0400 Subject: [PATCH 1/4] 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 1a612da66789dabc04076ba3c3652e09a6af27e6 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 22 Sep 2022 10:06:13 -0400 Subject: [PATCH 2/4] common/build-style/python3-pep517.sh: use TMP to avoid side effects with setuptools_rust --- 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 c88346ff06044cadae90a82472ee295a2d2952d8 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 20 Sep 2022 14:16:42 -0400 Subject: [PATCH 3/4] New package: python3-setuptools_rust-1.5.2 --- srcpkgs/python3-setuptools_rust/template | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 srcpkgs/python3-setuptools_rust/template diff --git a/srcpkgs/python3-setuptools_rust/template b/srcpkgs/python3-setuptools_rust/template new file mode 100644 index 000000000000..49de1d92619e --- /dev/null +++ b/srcpkgs/python3-setuptools_rust/template @@ -0,0 +1,36 @@ +# Template file for 'python3-setuptools_rust' +pkgname=python3-setuptools_rust +version=1.5.2 +revision=1 +wrksrc="setuptools-rust-${version}" +build_style=python3-module +build_helper=rust # for do_check +hostmakedepends="python3-setuptools" +depends="python3-setuptools python3-semanticversion python3-typing_extensions" +checkdepends="${depends} cargo python3-pytest python3-BeautifulSoup4 + python3-cffi python3-devel" +short_desc="Setuptools Rust extension plugin" +maintainer="Joel Beckmeyer " +license="MIT" +homepage="https://github.com/PyO3/setuptools-rust" +changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/main/CHANGELOG.md" +distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz" +checksum=d8daccb14dc0eae1b6b6eb3ecef79675bd37b4065369f79c35393dd5c55652c7 + +do_check() { + # taken from + # https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-setuptools-rust/trunk/PKGBUILD + rm -rf examples/html-py-ever/tests + python setup.py egg_info + for dir in examples/*; do + pushd $dir + PYTHONPATH="$PWD/../.." python setup.py build + [[ -d tests ]] && PYTHONPATH="$PWD/build/lib:build/lib.linux-$XBPS_MACHINE-cpython-310" pytest -k "not bench" + popd + done + pytest --doctest-modules setuptools_rust +} + +post_install() { + vlicense LICENSE +} From bfc71eb4caa984e96a5522989a2c93a45f3625bd Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 20 Sep 2022 14:16:45 -0400 Subject: [PATCH 4/4] synapse: update to 1.68.0rc1. --- srcpkgs/synapse/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 307d3d08ade8..63edb37f113e 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.0rc1 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=a05f7ac82c8ee2bd7b7d24c01a040d234be2e7c2e1e24a1156b86d71a9352647 + +if [ "$CROSS_BUILD" ]; then + makedepends+=" rust-std" +fi system_accounts="synapse" synapse_homedir="/var/lib/synapse" @@ -37,7 +42,7 @@ pre_check() { } do_check() { - PYTHONPATH="." trial3 ${makejobs} tests + PYTHONPATH=. trial3 ${makejobs} tests } post_install() {