From 0fa4baddd65aca3215f4a695439e4ba8240d2745 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 31 Mar 2023 16:43:52 -0400 Subject: [PATCH 1/7] python3-txredisapi: update to 1.4.9. --- srcpkgs/python3-txredisapi/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-txredisapi/template b/srcpkgs/python3-txredisapi/template index b341e67829be..1e29673bf3be 100644 --- a/srcpkgs/python3-txredisapi/template +++ b/srcpkgs/python3-txredisapi/template @@ -1,7 +1,7 @@ # Template file for 'python3-txredisapi' pkgname=python3-txredisapi -version=1.4.7 -revision=2 +version=1.4.9 +revision=1 build_style=python3-module make_check_args="--ignore tests/test_basics.py --ignore tests/test_bitops.py @@ -36,4 +36,4 @@ license="Apache-2.0" homepage="https://github.com/IlyaSkriblovsky/txredisapi" changelog="https://raw.githubusercontent.com/IlyaSkriblovsky/txredisapi/master/CHANGELOG.md" distfiles="https://github.com/IlyaSkriblovsky/txredisapi/archive/refs/tags/${version}.tar.gz" -checksum=dfaf204ab547eeddfcf54c81734a8a06dadbbf079fd01d9c27a788c7d770376e +checksum=bb6af4eabe9b05afd4389516d41d60adfb24dcee01601be8a4808de2cb00d3a7 From 7461ef2cc16f31c1f1dc7f238eda7887e166831a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Mar 2023 14:23:11 -0400 Subject: [PATCH 2/7] python3-canonicaljson: update to 2.0.0. --- srcpkgs/python3-canonicaljson/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template index d050094a7d5e..5095f1fe17b5 100644 --- a/srcpkgs/python3-canonicaljson/template +++ b/srcpkgs/python3-canonicaljson/template @@ -1,16 +1,16 @@ # Template file for 'python3-canonicaljson' pkgname=python3-canonicaljson -version=1.6.5 +version=2.0.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" -depends="python3-simplejson python3-frozendict" -checkdepends="${depends} python3-pytest" +depends="python3" +checkdepends="python3-pytest" 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=68dfc157b011e07d94bf74b5d4ccc01958584ed942d9dfd5fdd706609e81cd4b +checksum=e2fdaef1d7fadc5d9cb59bd3d0d41b064ddda697809ac4325dced721d12f113f make_check_pre="env PYTHONPATH=src" From a13f7b8a8092a30e25647ac27f0a0ca8334916e1 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 31 Mar 2023 16:40:36 -0400 Subject: [PATCH 3/7] python3-simplejson: orphan. --- srcpkgs/python3-simplejson/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-simplejson/template b/srcpkgs/python3-simplejson/template index 45dbc20e5a8c..5d6e03ef2a59 100644 --- a/srcpkgs/python3-simplejson/template +++ b/srcpkgs/python3-simplejson/template @@ -8,7 +8,7 @@ makedepends="python3-devel" depends="python3" checkdepends="python3-pytest" short_desc="Simple, fast, extensible JSON encoder/decoder for Python3" -maintainer="Joel Beckmeyer " +maintainer="Orphaned " license="MIT, AFL-2.1" homepage="https://github.com/simplejson/simplejson" changelog="https://raw.githubusercontent.com/simplejson/simplejson/master/CHANGES.txt" From efdd05e8205016a96442ddc19501d7c0a151015b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Mar 2023 14:20:14 -0400 Subject: [PATCH 4/7] New package: python3-immutabledict-2.2.4 --- srcpkgs/python3-immutabledict/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-immutabledict/template diff --git a/srcpkgs/python3-immutabledict/template b/srcpkgs/python3-immutabledict/template new file mode 100644 index 000000000000..d8eaced0c483 --- /dev/null +++ b/srcpkgs/python3-immutabledict/template @@ -0,0 +1,20 @@ +# Template file for 'python3-immutabledict' +pkgname=python3-immutabledict +version=2.2.4 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" +makedepends="python3-devel" +depends="python3" +checkdepends="python3-pytest" +short_desc="Immutable wrapper around dictionaries" +maintainer="Joel Beckmeyer " +license="MIT" +homepage="https://github.com/corenting/immutabledict" +changelog="https://raw.githubusercontent.com/corenting/immutabledict/master/CHANGELOG.md" +distfiles="${PYPI_SITE}/i/immutabledict/immutabledict-${version}.tar.gz" +checksum=3bedc0741faaa2846f6edf5c29183f993da3abaff6a5961bb70a5659bb9e68ab + +post_install() { + vlicense LICENSE +} From d505723ea6d21e5679cdf75da438024bdf8d30fd Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 28 Mar 2023 14:23:58 -0400 Subject: [PATCH 5/7] python3-frozendict: orphan. --- srcpkgs/python3-frozendict/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template index 84845fc1b836..4741561aad60 100644 --- a/srcpkgs/python3-frozendict/template +++ b/srcpkgs/python3-frozendict/template @@ -9,7 +9,7 @@ makedepends="python3-devel" depends="python3" checkdepends="python3-pytest" short_desc="Immutable mapping for Python3" -maintainer="Joel Beckmeyer " +maintainer="Orphaned " license="LGPL-3.0-only" homepage="https://github.com/Marco-Sulla/python-frozendict" distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz" From fdcc8f7599c595089c87584739759f5629368658 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 11 Apr 2023 11:58:09 -0400 Subject: [PATCH 6/7] python3-pydantic: update to 1.10.7. --- srcpkgs/python3-pydantic/template | 8 +++++--- srcpkgs/python3-pydantic/update | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/python3-pydantic/update diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template index 4c9eed98405a..80e94fdb4813 100644 --- a/srcpkgs/python3-pydantic/template +++ b/srcpkgs/python3-pydantic/template @@ -1,8 +1,10 @@ # Template file for 'python3-pydantic' pkgname=python3-pydantic -version=1.10.2 -revision=2 +version=1.10.7 +revision=1 build_style=python3-module +# added to stop test failing due to DeprecationWarning on pkg_resources import +make_check_args="-p no:warnings" hostmakedepends="python3-setuptools" depends="python3-typing_extensions" checkdepends="${depends} python3-pytest python3-pytest-mock" @@ -12,7 +14,7 @@ license="MIT" homepage="https://github.com/pydantic/pydantic" changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md" distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz" -checksum=91b8e218852ef6007c2b98cd861601c6a09f1aa32bbbb74fab5b1c33d4a1e410 +checksum=cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pydantic/update b/srcpkgs/python3-pydantic/update new file mode 100644 index 000000000000..2c857beffb29 --- /dev/null +++ b/srcpkgs/python3-pydantic/update @@ -0,0 +1 @@ +ignore="*a*" From f4f26adda5b5dcd396be74a48d26c39607d67578 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 11 Apr 2023 12:07:52 -0400 Subject: [PATCH 7/7] synapse: update to 1.81.0. --- .../patches/revert_frozendict_upperbound.patch | 13 ------------- srcpkgs/synapse/template | 6 +++--- 2 files changed, 3 insertions(+), 16 deletions(-) delete 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 deleted file mode 100644 index 4a5e068a828b..000000000000 --- a/srcpkgs/synapse/patches/revert_frozendict_upperbound.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 9fd2a9018d9c..7c0538696649 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,13 +1,13 @@ # Template file for 'synapse' pkgname=synapse -version=1.80.0 +version=1.81.0 revision=1 build_style=python3-pep517 build_helper=rust make_check_target=tests make_install_target="dist/matrix_synapse-${version}-*-*-*.whl" hostmakedepends="python3-poetry-core python3-setuptools-rust cargo" -depends="python3-jsonschema python3-frozendict python3-unpaddedbase64 +depends="python3-jsonschema python3-immutabledict python3-unpaddedbase64 python3-canonicaljson python3-signedjson python3-pynacl python3-service_identity python3-Twisted python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules python3-bcrypt python3-Pillow @@ -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=7835d4790fb340269595fd792a6f7d6e49b004698634eca3c2453b8adc21b9f9 +checksum=2d9753961772d385464b9c6ebfc20fc42adc27e883689014994c1c42cbdf1456 if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std"