* [PR PATCH] synapse: update to 1.71.0.
@ 2022-11-10 16:59 TinfoilSubmarine
2022-11-10 17:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 16:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2276 bytes --]
There is a new pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/40446
synapse: update to 1.71.0.
also enable more tests
#### Testing the changes
- I tested the changes in this PR: **YES**
Had to bump several different dependencies. Here's where they need to be tested
as well:
python-attrs:
- [ ] python-automat
- [ ] python-hypothesis
- [ ] python-pytest
- [ ] python-service_identity
python3-attrs:
- [ ] coursera-dl
- [ ] pantalaimon
- [ ] pycp
- [ ] pysolfc
- [x] python3-Twisted
- [ ] python3-aiohttp
- [ ] python3-aiohttp-sse-client
- [ ] python3-aiohttp2
- [ ] python3-aiorpcx
- [x] python3-automat
- [ ] python3-gogs-client
- [x] python3-hypothesis
- [x] python3-jsonschema
- [x] python3-matrix-common
- [ ] python3-parver
- [x] python3-pytest
- [x] python3-service_identity
- [x] python3-treq
- [ ] python3-trio
- [ ] python3-txacme
- [x] synapse
- [ ] ueberzug
python-automat:
- [ ] python-Twisted
python3-automat:
- [x] python3-Twisted
- [ ] python3-txtorcon
python3-PyHamcrest (checkdepends):
- [x] python3-Twisted
- [ ] rtags
python3-Twisted:
- [ ] alot
- [ ] deluge
- [ ] python3-TxSNI
- [ ] python3-autobahn
- [x] python3-treq
- [ ] python3-txacme
- [x] python3-txredisapi
- [ ] python3-txtorcon
- [x] synapse
- [ ] syncplay
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-40446.patch --]
[-- Type: text/x-diff, Size: 21712 bytes --]
From d30aa17458de67bb2dbd96f0fbb49bd46f49a2ad Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 09:23:03 -0500
Subject: [PATCH 1/6] python-attrs: update to 22.1.0.
---
srcpkgs/python-attrs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index ce8321736d4e..2a9cf80f1ceb 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,7 +1,7 @@
# Template file for 'python-attrs'
pkgname=python-attrs
-version=21.2.0
-revision=3
+version=22.1.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://attrs.readthedocs.io/"
distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
+checksum=29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6
do_check() {
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
From 9eb78cb8191e41a836f94ba9e17273957f10adfe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 10:11:11 -0500
Subject: [PATCH 2/6] python-automat: update to 22.10.0.
drop python3-Twisted in checkdepends as it was a cyclic dependency.
---
srcpkgs/python-automat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 8b3f99f1961f..865b70d6a4b3 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,17 +1,17 @@
# Template file for 'python-automat'
pkgname=python-automat
-version=20.2.0
-revision=5
+version=22.10.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
short_desc="Finite-state machines in Python (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/glyph/Automat"
distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
pre_build() {
@@ -22,7 +22,8 @@ pre_build() {
}
do_check() {
- python3 setup.py test
+ PYTHONPATH="$(cd build/lib* && pwd)" \
+ python3 -m pytest ${testjobs} automat/_test
}
post_install() {
From 852628a39a817722509f30c36464486a0ae01cbb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 11:22:30 -0500
Subject: [PATCH 3/6] python3-PyHamcrest: update to 2.0.4.
split from python-PyHamcrest as python2 is no longer supported
---
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
create mode 100644 srcpkgs/python3-PyHamcrest/template
diff --git a/srcpkgs/python3-PyHamcrest b/srcpkgs/python3-PyHamcrest
deleted file mode 120000
index 88738b03cdbf..000000000000
--- a/srcpkgs/python3-PyHamcrest
+++ /dev/null
@@ -1 +0,0 @@
-python-PyHamcrest
\ No newline at end of file
diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
new file mode 100644
index 000000000000..eea18c290618
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-PyHamcrest
+version=2.0.4
+revision=1
+make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
+build_style=python3-pep517
+hostmakedepends="hatch-vcs"
+depends="python3"
+checkdepends="python3-pytest python3-numpy"
+short_desc="Hamcrest framework for matcher objects (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
+distfiles="${PYPI_SITE}/p/pyhamcrest/pyhamcrest-${version}.tar.gz"
+checksum=b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
+make_check_pre="env PYTHONPATH=src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 61c299d5848ad0629c2d82c3decfbc1bb0270b4a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:50:08 -0500
Subject: [PATCH 4/6] python3-Twisted: update to 22.10.0.
---
.../python3-Twisted/patches/python3.11.patch | 258 ++++++++++++++++++
.../patches/sendmail_getargspec.patch | 32 +++
srcpkgs/python3-Twisted/template | 9 +-
3 files changed, 295 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-Twisted/patches/python3.11.patch
create mode 100644 srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
diff --git a/srcpkgs/python3-Twisted/patches/python3.11.patch b/srcpkgs/python3-Twisted/patches/python3.11.patch
new file mode 100644
index 000000000000..d4f2de447b0f
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/python3.11.patch
@@ -0,0 +1,258 @@
+From 4f6d7fb0749429b092fe7538a7d2b11fe58319a6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 20:35:55 -0500
+Subject: [PATCH 02/12] fix twisted.persisted tests
+
+---
+ src/twisted/persisted/aot.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/persisted/aot.py b/src/twisted/persisted/aot.py
+index 0daeb3b4c85..204728058cd 100644
+--- a/src/twisted/persisted/aot.py
++++ b/src/twisted/persisted/aot.py
+@@ -399,8 +399,10 @@ def unjellyAO(self, ao):
+ inst = klass.__new__(klass)
+ if hasattr(klass, "__setstate__"):
+ self.callAfter(inst.__setstate__, state)
+- else:
++ elif isinstance(state, dict):
+ inst.__dict__ = state
++ else:
++ inst.__dict__ = state.__getstate__()
+ return inst
+
+ elif c is Ref:
+
+From 525377178adfa987ed56be753aec0fce35d721dc Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 21:35:58 -0500
+Subject: [PATCH 03/12] fix tests for twisted.spread
+
+---
+ src/twisted/spread/flavors.py | 2 ++
+ src/twisted/spread/jelly.py | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/spread/flavors.py b/src/twisted/spread/flavors.py
+index 77c974195aa..a4fcd2126b6 100644
+--- a/src/twisted/spread/flavors.py
++++ b/src/twisted/spread/flavors.py
+@@ -398,6 +398,8 @@ def setCopyableState(self, state):
+ object's dictionary (or a filtered approximation of it depending
+ on my peer's perspective).
+ """
++ if not state:
++ state = {}
+ state = {
+ x.decode("utf8") if isinstance(x, bytes) else x: y for x, y in state.items()
+ }
+diff --git a/src/twisted/spread/jelly.py b/src/twisted/spread/jelly.py
+index 7e1b4d254bd..46cda178448 100644
+--- a/src/twisted/spread/jelly.py
++++ b/src/twisted/spread/jelly.py
+@@ -154,7 +154,8 @@ def _newInstance(cls, state):
+ instance = _createBlank(cls)
+
+ def defaultSetter(state):
+- instance.__dict__ = state
++ if isinstance(state, dict):
++ instance.__dict__ = state or {}
+
+ setter = getattr(instance, "__setstate__", defaultSetter)
+ setter(state)
+
+From afcc224a02f72e5d12fa35d223bd753e8086b135 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 21:12:31 -0500
+Subject: [PATCH 04/12] fix test for twisted.web
+
+---
+ src/twisted/web/test/test_flatten.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index e10eb06c22f..ad8c58576c3 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -706,9 +706,10 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ Exception while flattening:
+ \\[<unrenderable>\\]
+ <unrenderable>
+- .*
++ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+ element = await element
++ .*
+ RuntimeError: example
+ """
+ ),
+
+From 4b5ab38b09b326cec7967e04bd4cae8a84bb6784 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 22:05:54 -0500
+Subject: [PATCH 05/12] fix persisted tests in twisted.test
+
+---
+ src/twisted/test/test_persisted.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/twisted/test/test_persisted.py b/src/twisted/test/test_persisted.py
+index eedbbdac647..72354b33f38 100644
+--- a/src/twisted/test/test_persisted.py
++++ b/src/twisted/test/test_persisted.py
+@@ -378,6 +378,10 @@ class UnknownType:
+ def __dict__(self):
+ raise AttributeError()
+
++ @property
++ def __getstate__(self):
++ raise AttributeError()
++
+ self.assertRaises(TypeError, aot.jellyToSource, UnknownType())
+
+ def test_basicIdentity(self):
+
+From f8f56d45113e5f2467a5e8375186e5db6309dfc6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:09:15 -0500
+Subject: [PATCH 06/12] fix twisted.trial tests
+
+---
+ src/twisted/trial/test/test_pyunitcompat.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/trial/test/test_pyunitcompat.py b/src/twisted/trial/test/test_pyunitcompat.py
+index e8321c9cc6c..1ad4b5ebcf3 100644
+--- a/src/twisted/trial/test/test_pyunitcompat.py
++++ b/src/twisted/trial/test/test_pyunitcompat.py
+@@ -218,8 +218,10 @@ def test_tracebackFromCleanFailure(self):
+ pyresult = pyunit.TestResult()
+ result = PyUnitResultAdapter(pyresult)
+ result.addError(self, f)
++ tback = "".join(traceback.format_exception(*exc_info))
+ self.assertEqual(
+- pyresult.errors[0][1], "".join(traceback.format_exception(*exc_info))
++ pyresult.errors[0][1].endswith("ZeroDivisionError: division by zero\n"),
++ tback.endswith("ZeroDivisionError: division by zero\n"),
+ )
+
+ def test_trialSkip(self):
+
+From d91675ac5ffe907fcdbb3d1cedb1240008d81fd1 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:15:55 -0500
+Subject: [PATCH 07/12] make test_flatten backwards-compatible
+
+---
+ src/twisted/web/test/test_flatten.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ad8c58576c3..1070f767563 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -708,9 +708,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ <unrenderable>
+ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+- element = await element
+- .*
+- RuntimeError: example
++ element = await element.*
+ """
+ ),
+ flags=re.MULTILINE,
+
+From 603c61978ff18920ce7a133d9a0e5761ad8fcc19 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:23:15 -0500
+Subject: [PATCH 08/12] add newsfragment
+
+---
+ src/twisted/newsfragments/10343.misc | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 src/twisted/newsfragments/10343.misc
+
+diff --git a/src/twisted/newsfragments/10343.misc b/src/twisted/newsfragments/10343.misc
+new file mode 100644
+index 00000000000..3930e5bd729
+--- /dev/null
++++ b/src/twisted/newsfragments/10343.misc
+@@ -0,0 +1 @@
++Enable Python 3.11 for CI and fix the remaining broken tests.
+
+From 800f9e9372b993356e22104d8295a89d4ee5fac4 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:16:05 -0500
+Subject: [PATCH 09/12] PR feedback
+
+---
+ .github/workflows/test.yaml | 13 -------------
+ src/twisted/newsfragments/10343.feature | 1 +
+ src/twisted/newsfragments/10343.misc | 1 -
+ src/twisted/web/test/test_flatten.py | 1 +
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+ create mode 100644 src/twisted/newsfragments/10343.feature
+ delete mode 100644 src/twisted/newsfragments/10343.misc
+
+@@ -1 +0,0 @@
+-Enable Python 3.11 for CI and fix the remaining broken tests.
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 1070f767563..ea6aa4a966a 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,6 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
++ self.assertTrue('RuntimeError: example' in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From 6b069e1de60d00b658c04b8d330ab399c912a6d7 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:36:26 -0500
+Subject: [PATCH 10/12] run linter
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ea6aa4a966a..8c0d14be8f4 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue('RuntimeError: example' in str(failure.value))
++ self.assertTrue("RuntimeError: example" in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From fe8e9565e6dbcfea5258a69b098001ddd1479e4f Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 19:10:20 -0500
+Subject: [PATCH 11/12] use assertIn vs assertTrue
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 8c0d14be8f4..ad431312edb 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue("RuntimeError: example" in str(failure.value))
++ self.assertIn("RuntimeError: example", str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
diff --git a/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
new file mode 100644
index 000000000000..9a601544d4ba
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
@@ -0,0 +1,32 @@
+From 00bf5be704bee022ba4d9b24eb6c2c768b4a1921 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 26 Oct 2022 19:49:33 -0500
+Subject: [PATCH] fix sendmail tests for python 3.11
+
+---
+ src/twisted/mail/test/test_smtp.py | 3 ++-
+ src/twisted/newsfragments/10345.misc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 src/twisted/newsfragments/10345.misc
+
+diff --git a/src/twisted/mail/test/test_smtp.py b/src/twisted/mail/test/test_smtp.py
+index 906eeaad410..4c1885935e4 100644
+--- a/src/twisted/mail/test/test_smtp.py
++++ b/src/twisted/mail/test/test_smtp.py
+@@ -1771,7 +1771,8 @@ def test_defaultReactorIsGlobalReactor(self):
+ The default C{reactor} parameter of L{twisted.mail.smtp.sendmail} is
+ L{twisted.internet.reactor}.
+ """
+- args, varArgs, keywords, defaults = inspect.getargspec(smtp.sendmail)
++ fullSpec = inspect.getfullargspec(smtp.sendmail)
++ defaults = fullSpec[3]
+ self.assertEqual(reactor, defaults[2])
+
+ def _honorsESMTPArguments(self, username, password):
+diff --git a/src/twisted/newsfragments/10345.misc b/src/twisted/newsfragments/10345.misc
+new file mode 100644
+index 00000000000..2d51e2a7002
+--- /dev/null
++++ b/src/twisted/newsfragments/10345.misc
+@@ -0,0 +1 @@
++Fix SendmailTests for python 3.11.
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
index a02ec071038b..d0405e113fd3 100644
--- a/srcpkgs/python3-Twisted/template
+++ b/srcpkgs/python3-Twisted/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Twisted'
pkgname=python3-Twisted
-version=22.1.0
-revision=2
+version=22.10.0
+revision=1
build_style=python3-module
make_check_target=src/twisted
hostmakedepends="python3-setuptools python3-incremental"
@@ -10,14 +10,15 @@ depends="python3-zope.interface python3-constantly python3-incremental
python3-automat python3-hyperlink python3-attrs python3-typing_extensions
python3-openssl python3-service_identity python3-pyasn1"
checkdepends="python3-bcrypt python3-PyHamcrest git python3-h2
- python3-hyperframe python3-priority python3-hpack python3-appdirs $depends"
+ python3-hyperframe python3-priority python3-hpack python3-appdirs
+ python3-hypothesis $depends"
short_desc="Asynchronous networking framework written in Python (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://twistedmatrix.com/"
changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
-checksum=b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61
+checksum=32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
make_check=ci-skip # some tests fail when running as root
alternatives="
From 9727d93463c46127b1df717fff8a76431f734aa9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:04:49 -0500
Subject: [PATCH 5/6] python3-phonenumbers: update to 8.13.0.
---
srcpkgs/python3-phonenumbers/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 2edf6c95f570..c81e215afc1d 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,7 +1,7 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.57
-revision=2
+version=8.13.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -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=057d1966962fb86b3dc447bfac2c8e25ceed774509e49b180926a13a99910318
+checksum=93745d7afd38e246660bb601b07deac54eeb76c8e5e43f5e83333b0383a0a1e4
From 4f68b96240b1505e58a27247cfc2e9c2ae785768 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 09:43:48 -0500
Subject: [PATCH 6/6] synapse: update to 1.71.0.
also enable more tests
---
srcpkgs/synapse/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 982806af7cdc..5496e6575476 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.70.1
-revision=2
+version=1.71.0
+revision=1
build_style=python3-pep517
build_helper=rust
make_check_target=tests
@@ -15,15 +15,15 @@ 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"
-checkdepends="$depends python3-parameterized unzip"
+ python3-packaging python3-pydantic python3-automat"
+checkdepends="$depends python3-parameterized python3-hiredis xmlsec1 unzip"
short_desc="Matrix reference homeserver"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
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=9dc9c530b15f44a9916de5a049eb71072261d54dfb727db7c35c77c7e5882859
+checksum=b382e86012d5d3fec194f508138ec7fa7915f5fe853fa63be5ca0dc6848de501
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
@ 2022-11-10 17:04 ` TinfoilSubmarine
2022-11-10 18:56 ` icp1994
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 17:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2324 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/40446
synapse: update to 1.71.0.
also enable more tests
#### Testing the changes
- I tested the changes in this PR: **YES**
Had to bump several different dependencies. Here's where they need to be tested
as well:
python-attrs:
- [ ] python-automat
- [ ] python-hypothesis
- [ ] python-pytest
- [ ] python-service_identity
python3-attrs:
- [ ] coursera-dl
- [ ] pantalaimon
- [ ] pycp
- [ ] pysolfc
- [x] python3-Twisted
- [ ] python3-aiohttp
- [ ] python3-aiohttp-sse-client
- [ ] python3-aiohttp2
- [ ] python3-aiorpcx
- [x] python3-automat
- [ ] python3-gogs-client
- [x] python3-hypothesis
- [x] python3-jsonschema
- [x] python3-matrix-common
- [ ] python3-parver
- [x] python3-pytest
- [x] python3-service_identity
- [x] python3-treq
- [ ] python3-trio
- [ ] python3-txacme
- [x] synapse
- [ ] ueberzug
python-automat:
- [ ] python-Twisted
python3-automat:
- [x] python3-Twisted
- [ ] python3-txtorcon
python3-PyHamcrest (checkdepends):
- [x] python3-Twisted
- [ ] rtags
python3-Twisted:
- [ ] alot
- [ ] deluge
- [ ] python3-TxSNI
- [ ] python3-autobahn
- [x] python3-treq
- [ ] python3-txacme
- [x] python3-txredisapi
- [ ] python3-txtorcon
- [x] synapse
- [ ] syncplay
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-40446.patch --]
[-- Type: text/x-diff, Size: 21712 bytes --]
From d30aa17458de67bb2dbd96f0fbb49bd46f49a2ad Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 09:23:03 -0500
Subject: [PATCH 1/6] python-attrs: update to 22.1.0.
---
srcpkgs/python-attrs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index ce8321736d4e..2a9cf80f1ceb 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,7 +1,7 @@
# Template file for 'python-attrs'
pkgname=python-attrs
-version=21.2.0
-revision=3
+version=22.1.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://attrs.readthedocs.io/"
distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
+checksum=29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6
do_check() {
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
From 9eb78cb8191e41a836f94ba9e17273957f10adfe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 10:11:11 -0500
Subject: [PATCH 2/6] python-automat: update to 22.10.0.
drop python3-Twisted in checkdepends as it was a cyclic dependency.
---
srcpkgs/python-automat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 8b3f99f1961f..865b70d6a4b3 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,17 +1,17 @@
# Template file for 'python-automat'
pkgname=python-automat
-version=20.2.0
-revision=5
+version=22.10.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
short_desc="Finite-state machines in Python (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/glyph/Automat"
distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
pre_build() {
@@ -22,7 +22,8 @@ pre_build() {
}
do_check() {
- python3 setup.py test
+ PYTHONPATH="$(cd build/lib* && pwd)" \
+ python3 -m pytest ${testjobs} automat/_test
}
post_install() {
From 13ce564c20e1274eb68ae0176c417aa15087fe7c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 11:22:30 -0500
Subject: [PATCH 3/6] python3-PyHamcrest: update to 2.0.4.
split from python-PyHamcrest as python2 is no longer supported
---
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
create mode 100644 srcpkgs/python3-PyHamcrest/template
diff --git a/srcpkgs/python3-PyHamcrest b/srcpkgs/python3-PyHamcrest
deleted file mode 120000
index 88738b03cdbf..000000000000
--- a/srcpkgs/python3-PyHamcrest
+++ /dev/null
@@ -1 +0,0 @@
-python-PyHamcrest
\ No newline at end of file
diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
new file mode 100644
index 000000000000..87d1c80c4bb6
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-PyHamcrest
+version=2.0.4
+revision=1
+build_style=python3-pep517
+make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
+hostmakedepends="hatch-vcs"
+depends="python3"
+checkdepends="python3-pytest python3-numpy"
+short_desc="Hamcrest framework for matcher objects (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
+distfiles="${PYPI_SITE}/p/pyhamcrest/pyhamcrest-${version}.tar.gz"
+checksum=b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
+make_check_pre="env PYTHONPATH=src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 1401a6960aeffeff4d57e330f9d94f3fa9b436d7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:50:08 -0500
Subject: [PATCH 4/6] python3-Twisted: update to 22.10.0.
---
.../python3-Twisted/patches/python3.11.patch | 258 ++++++++++++++++++
.../patches/sendmail_getargspec.patch | 32 +++
srcpkgs/python3-Twisted/template | 9 +-
3 files changed, 295 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-Twisted/patches/python3.11.patch
create mode 100644 srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
diff --git a/srcpkgs/python3-Twisted/patches/python3.11.patch b/srcpkgs/python3-Twisted/patches/python3.11.patch
new file mode 100644
index 000000000000..d4f2de447b0f
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/python3.11.patch
@@ -0,0 +1,258 @@
+From 4f6d7fb0749429b092fe7538a7d2b11fe58319a6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 20:35:55 -0500
+Subject: [PATCH 02/12] fix twisted.persisted tests
+
+---
+ src/twisted/persisted/aot.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/persisted/aot.py b/src/twisted/persisted/aot.py
+index 0daeb3b4c85..204728058cd 100644
+--- a/src/twisted/persisted/aot.py
++++ b/src/twisted/persisted/aot.py
+@@ -399,8 +399,10 @@ def unjellyAO(self, ao):
+ inst = klass.__new__(klass)
+ if hasattr(klass, "__setstate__"):
+ self.callAfter(inst.__setstate__, state)
+- else:
++ elif isinstance(state, dict):
+ inst.__dict__ = state
++ else:
++ inst.__dict__ = state.__getstate__()
+ return inst
+
+ elif c is Ref:
+
+From 525377178adfa987ed56be753aec0fce35d721dc Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 21:35:58 -0500
+Subject: [PATCH 03/12] fix tests for twisted.spread
+
+---
+ src/twisted/spread/flavors.py | 2 ++
+ src/twisted/spread/jelly.py | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/spread/flavors.py b/src/twisted/spread/flavors.py
+index 77c974195aa..a4fcd2126b6 100644
+--- a/src/twisted/spread/flavors.py
++++ b/src/twisted/spread/flavors.py
+@@ -398,6 +398,8 @@ def setCopyableState(self, state):
+ object's dictionary (or a filtered approximation of it depending
+ on my peer's perspective).
+ """
++ if not state:
++ state = {}
+ state = {
+ x.decode("utf8") if isinstance(x, bytes) else x: y for x, y in state.items()
+ }
+diff --git a/src/twisted/spread/jelly.py b/src/twisted/spread/jelly.py
+index 7e1b4d254bd..46cda178448 100644
+--- a/src/twisted/spread/jelly.py
++++ b/src/twisted/spread/jelly.py
+@@ -154,7 +154,8 @@ def _newInstance(cls, state):
+ instance = _createBlank(cls)
+
+ def defaultSetter(state):
+- instance.__dict__ = state
++ if isinstance(state, dict):
++ instance.__dict__ = state or {}
+
+ setter = getattr(instance, "__setstate__", defaultSetter)
+ setter(state)
+
+From afcc224a02f72e5d12fa35d223bd753e8086b135 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 21:12:31 -0500
+Subject: [PATCH 04/12] fix test for twisted.web
+
+---
+ src/twisted/web/test/test_flatten.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index e10eb06c22f..ad8c58576c3 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -706,9 +706,10 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ Exception while flattening:
+ \\[<unrenderable>\\]
+ <unrenderable>
+- .*
++ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+ element = await element
++ .*
+ RuntimeError: example
+ """
+ ),
+
+From 4b5ab38b09b326cec7967e04bd4cae8a84bb6784 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 22:05:54 -0500
+Subject: [PATCH 05/12] fix persisted tests in twisted.test
+
+---
+ src/twisted/test/test_persisted.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/twisted/test/test_persisted.py b/src/twisted/test/test_persisted.py
+index eedbbdac647..72354b33f38 100644
+--- a/src/twisted/test/test_persisted.py
++++ b/src/twisted/test/test_persisted.py
+@@ -378,6 +378,10 @@ class UnknownType:
+ def __dict__(self):
+ raise AttributeError()
+
++ @property
++ def __getstate__(self):
++ raise AttributeError()
++
+ self.assertRaises(TypeError, aot.jellyToSource, UnknownType())
+
+ def test_basicIdentity(self):
+
+From f8f56d45113e5f2467a5e8375186e5db6309dfc6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:09:15 -0500
+Subject: [PATCH 06/12] fix twisted.trial tests
+
+---
+ src/twisted/trial/test/test_pyunitcompat.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/trial/test/test_pyunitcompat.py b/src/twisted/trial/test/test_pyunitcompat.py
+index e8321c9cc6c..1ad4b5ebcf3 100644
+--- a/src/twisted/trial/test/test_pyunitcompat.py
++++ b/src/twisted/trial/test/test_pyunitcompat.py
+@@ -218,8 +218,10 @@ def test_tracebackFromCleanFailure(self):
+ pyresult = pyunit.TestResult()
+ result = PyUnitResultAdapter(pyresult)
+ result.addError(self, f)
++ tback = "".join(traceback.format_exception(*exc_info))
+ self.assertEqual(
+- pyresult.errors[0][1], "".join(traceback.format_exception(*exc_info))
++ pyresult.errors[0][1].endswith("ZeroDivisionError: division by zero\n"),
++ tback.endswith("ZeroDivisionError: division by zero\n"),
+ )
+
+ def test_trialSkip(self):
+
+From d91675ac5ffe907fcdbb3d1cedb1240008d81fd1 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:15:55 -0500
+Subject: [PATCH 07/12] make test_flatten backwards-compatible
+
+---
+ src/twisted/web/test/test_flatten.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ad8c58576c3..1070f767563 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -708,9 +708,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ <unrenderable>
+ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+- element = await element
+- .*
+- RuntimeError: example
++ element = await element.*
+ """
+ ),
+ flags=re.MULTILINE,
+
+From 603c61978ff18920ce7a133d9a0e5761ad8fcc19 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:23:15 -0500
+Subject: [PATCH 08/12] add newsfragment
+
+---
+ src/twisted/newsfragments/10343.misc | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 src/twisted/newsfragments/10343.misc
+
+diff --git a/src/twisted/newsfragments/10343.misc b/src/twisted/newsfragments/10343.misc
+new file mode 100644
+index 00000000000..3930e5bd729
+--- /dev/null
++++ b/src/twisted/newsfragments/10343.misc
+@@ -0,0 +1 @@
++Enable Python 3.11 for CI and fix the remaining broken tests.
+
+From 800f9e9372b993356e22104d8295a89d4ee5fac4 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:16:05 -0500
+Subject: [PATCH 09/12] PR feedback
+
+---
+ .github/workflows/test.yaml | 13 -------------
+ src/twisted/newsfragments/10343.feature | 1 +
+ src/twisted/newsfragments/10343.misc | 1 -
+ src/twisted/web/test/test_flatten.py | 1 +
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+ create mode 100644 src/twisted/newsfragments/10343.feature
+ delete mode 100644 src/twisted/newsfragments/10343.misc
+
+@@ -1 +0,0 @@
+-Enable Python 3.11 for CI and fix the remaining broken tests.
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 1070f767563..ea6aa4a966a 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,6 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
++ self.assertTrue('RuntimeError: example' in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From 6b069e1de60d00b658c04b8d330ab399c912a6d7 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:36:26 -0500
+Subject: [PATCH 10/12] run linter
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ea6aa4a966a..8c0d14be8f4 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue('RuntimeError: example' in str(failure.value))
++ self.assertTrue("RuntimeError: example" in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From fe8e9565e6dbcfea5258a69b098001ddd1479e4f Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 19:10:20 -0500
+Subject: [PATCH 11/12] use assertIn vs assertTrue
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 8c0d14be8f4..ad431312edb 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue("RuntimeError: example" in str(failure.value))
++ self.assertIn("RuntimeError: example", str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
diff --git a/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
new file mode 100644
index 000000000000..9a601544d4ba
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
@@ -0,0 +1,32 @@
+From 00bf5be704bee022ba4d9b24eb6c2c768b4a1921 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 26 Oct 2022 19:49:33 -0500
+Subject: [PATCH] fix sendmail tests for python 3.11
+
+---
+ src/twisted/mail/test/test_smtp.py | 3 ++-
+ src/twisted/newsfragments/10345.misc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 src/twisted/newsfragments/10345.misc
+
+diff --git a/src/twisted/mail/test/test_smtp.py b/src/twisted/mail/test/test_smtp.py
+index 906eeaad410..4c1885935e4 100644
+--- a/src/twisted/mail/test/test_smtp.py
++++ b/src/twisted/mail/test/test_smtp.py
+@@ -1771,7 +1771,8 @@ def test_defaultReactorIsGlobalReactor(self):
+ The default C{reactor} parameter of L{twisted.mail.smtp.sendmail} is
+ L{twisted.internet.reactor}.
+ """
+- args, varArgs, keywords, defaults = inspect.getargspec(smtp.sendmail)
++ fullSpec = inspect.getfullargspec(smtp.sendmail)
++ defaults = fullSpec[3]
+ self.assertEqual(reactor, defaults[2])
+
+ def _honorsESMTPArguments(self, username, password):
+diff --git a/src/twisted/newsfragments/10345.misc b/src/twisted/newsfragments/10345.misc
+new file mode 100644
+index 00000000000..2d51e2a7002
+--- /dev/null
++++ b/src/twisted/newsfragments/10345.misc
+@@ -0,0 +1 @@
++Fix SendmailTests for python 3.11.
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
index a02ec071038b..d0405e113fd3 100644
--- a/srcpkgs/python3-Twisted/template
+++ b/srcpkgs/python3-Twisted/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Twisted'
pkgname=python3-Twisted
-version=22.1.0
-revision=2
+version=22.10.0
+revision=1
build_style=python3-module
make_check_target=src/twisted
hostmakedepends="python3-setuptools python3-incremental"
@@ -10,14 +10,15 @@ depends="python3-zope.interface python3-constantly python3-incremental
python3-automat python3-hyperlink python3-attrs python3-typing_extensions
python3-openssl python3-service_identity python3-pyasn1"
checkdepends="python3-bcrypt python3-PyHamcrest git python3-h2
- python3-hyperframe python3-priority python3-hpack python3-appdirs $depends"
+ python3-hyperframe python3-priority python3-hpack python3-appdirs
+ python3-hypothesis $depends"
short_desc="Asynchronous networking framework written in Python (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://twistedmatrix.com/"
changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
-checksum=b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61
+checksum=32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
make_check=ci-skip # some tests fail when running as root
alternatives="
From 908c7089ff6aa9f6194979b24aea86b3569ac13d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:04:49 -0500
Subject: [PATCH 5/6] python3-phonenumbers: update to 8.13.0.
---
srcpkgs/python3-phonenumbers/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 2edf6c95f570..c81e215afc1d 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,7 +1,7 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.57
-revision=2
+version=8.13.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -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=057d1966962fb86b3dc447bfac2c8e25ceed774509e49b180926a13a99910318
+checksum=93745d7afd38e246660bb601b07deac54eeb76c8e5e43f5e83333b0383a0a1e4
From 113c999c6b64e582be37131d9698c9f2c278d85a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 09:43:48 -0500
Subject: [PATCH 6/6] synapse: update to 1.71.0.
also enable more tests
---
srcpkgs/synapse/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 982806af7cdc..5496e6575476 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.70.1
-revision=2
+version=1.71.0
+revision=1
build_style=python3-pep517
build_helper=rust
make_check_target=tests
@@ -15,15 +15,15 @@ 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"
-checkdepends="$depends python3-parameterized unzip"
+ python3-packaging python3-pydantic python3-automat"
+checkdepends="$depends python3-parameterized python3-hiredis xmlsec1 unzip"
short_desc="Matrix reference homeserver"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
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=9dc9c530b15f44a9916de5a049eb71072261d54dfb727db7c35c77c7e5882859
+checksum=b382e86012d5d3fec194f508138ec7fa7915f5fe853fa63be5ca0dc6848de501
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
2022-11-10 17:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-11-10 18:56 ` icp1994
2022-11-10 20:15 ` [PR PATCH] [Updated] " TinfoilSubmarine
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: icp1994 @ 2022-11-10 18:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/40446#issuecomment-1310758430
Comment:
Looks like you have to split [attrs](https://github.com/python-attrs/attrs/releases/tag/22.1.0) too.
I don't know if these are getting pulled in via transitive dependencies but I noticed `unpaddedbase64` & `cryptography` mentioned in synapse's [pyproject.toml](https://github.com/matrix-org/synapse/blob/v1.71.0/pyproject.toml) which could be included in the template.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
2022-11-10 17:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-11-10 18:56 ` icp1994
@ 2022-11-10 20:15 ` TinfoilSubmarine
2022-11-10 20:32 ` TinfoilSubmarine
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2320 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/40446
synapse: update to 1.71.0.
also enable more tests
#### Testing the changes
- I tested the changes in this PR: **YES**
Had to bump several different dependencies. Here's where they need to be tested
as well:
python-attrs (really just need to test python-Twisted):
- [ ] python-automat
- [ ] python-service_identity
python3-attrs:
- [ ] coursera-dl
- [ ] pantalaimon
- [ ] pycp
- [ ] pysolfc
- [x] python3-Twisted
- [x] python3-aiohttp
- [ ] python3-aiohttp-sse-client
- [ ] python3-aiohttp2
- [ ] python3-aiorpcx
- [x] python3-automat
- [ ] python3-gogs-client
- [x] python3-hypothesis
- [x] python3-jsonschema
- [x] python3-matrix-common
- [ ] python3-parver
- [x] python3-pytest
- [x] python3-service_identity
- [x] python3-treq
- [ ] python3-trio
- [ ] python3-txacme
- [x] synapse
- [ ] ueberzug
python-automat:
- [ ] python-Twisted
python3-automat:
- [x] python3-Twisted
- [ ] python3-txtorcon
python3-PyHamcrest (checkdepends):
- [x] python3-Twisted
- [x] rtags
python3-Twisted:
- [ ] alot
- [ ] deluge
- [ ] python3-TxSNI
- [ ] python3-autobahn
- [x] python3-treq
- [ ] python3-txacme
- [x] python3-txredisapi
- [ ] python3-txtorcon
- [x] synapse
- [ ] syncplay
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-40446.patch --]
[-- Type: text/x-diff, Size: 21712 bytes --]
From dbd3f7fa33375a0c96dd56a92704fee73fcb6ac6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 09:23:03 -0500
Subject: [PATCH 1/6] python-attrs: update to 22.1.0.
---
srcpkgs/python-attrs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index ce8321736d4e..2a9cf80f1ceb 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -1,7 +1,7 @@
# Template file for 'python-attrs'
pkgname=python-attrs
-version=21.2.0
-revision=3
+version=22.1.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
@@ -11,7 +11,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://attrs.readthedocs.io/"
distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
-checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
+checksum=29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6
do_check() {
PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
From 14a47eb53d37206a366dc6d5bc4168ceceba1d6f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 10:11:11 -0500
Subject: [PATCH 2/6] python-automat: update to 22.10.0.
drop python3-Twisted in checkdepends as it was a cyclic dependency.
---
srcpkgs/python-automat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 8b3f99f1961f..865b70d6a4b3 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,17 +1,17 @@
# Template file for 'python-automat'
pkgname=python-automat
-version=20.2.0
-revision=5
+version=22.10.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
short_desc="Finite-state machines in Python (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/glyph/Automat"
distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
pre_build() {
@@ -22,7 +22,8 @@ pre_build() {
}
do_check() {
- python3 setup.py test
+ PYTHONPATH="$(cd build/lib* && pwd)" \
+ python3 -m pytest ${testjobs} automat/_test
}
post_install() {
From 4387e2474212f7bc40277f0444e000ec92a2597a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 11:22:30 -0500
Subject: [PATCH 3/6] python3-PyHamcrest: update to 2.0.4.
split from python-PyHamcrest as python2 is no longer supported
---
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
create mode 100644 srcpkgs/python3-PyHamcrest/template
diff --git a/srcpkgs/python3-PyHamcrest b/srcpkgs/python3-PyHamcrest
deleted file mode 120000
index 88738b03cdbf..000000000000
--- a/srcpkgs/python3-PyHamcrest
+++ /dev/null
@@ -1 +0,0 @@
-python-PyHamcrest
\ No newline at end of file
diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
new file mode 100644
index 000000000000..87d1c80c4bb6
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-PyHamcrest
+version=2.0.4
+revision=1
+build_style=python3-pep517
+make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
+hostmakedepends="hatch-vcs"
+depends="python3"
+checkdepends="python3-pytest python3-numpy"
+short_desc="Hamcrest framework for matcher objects (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
+distfiles="${PYPI_SITE}/p/pyhamcrest/pyhamcrest-${version}.tar.gz"
+checksum=b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
+make_check_pre="env PYTHONPATH=src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 0280439626ce9671200d18123d33bec1b6e62e9e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:50:08 -0500
Subject: [PATCH 4/6] python3-Twisted: update to 22.10.0.
---
.../python3-Twisted/patches/python3.11.patch | 258 ++++++++++++++++++
.../patches/sendmail_getargspec.patch | 32 +++
srcpkgs/python3-Twisted/template | 9 +-
3 files changed, 295 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-Twisted/patches/python3.11.patch
create mode 100644 srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
diff --git a/srcpkgs/python3-Twisted/patches/python3.11.patch b/srcpkgs/python3-Twisted/patches/python3.11.patch
new file mode 100644
index 000000000000..d4f2de447b0f
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/python3.11.patch
@@ -0,0 +1,258 @@
+From 4f6d7fb0749429b092fe7538a7d2b11fe58319a6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 20:35:55 -0500
+Subject: [PATCH 02/12] fix twisted.persisted tests
+
+---
+ src/twisted/persisted/aot.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/persisted/aot.py b/src/twisted/persisted/aot.py
+index 0daeb3b4c85..204728058cd 100644
+--- a/src/twisted/persisted/aot.py
++++ b/src/twisted/persisted/aot.py
+@@ -399,8 +399,10 @@ def unjellyAO(self, ao):
+ inst = klass.__new__(klass)
+ if hasattr(klass, "__setstate__"):
+ self.callAfter(inst.__setstate__, state)
+- else:
++ elif isinstance(state, dict):
+ inst.__dict__ = state
++ else:
++ inst.__dict__ = state.__getstate__()
+ return inst
+
+ elif c is Ref:
+
+From 525377178adfa987ed56be753aec0fce35d721dc Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 21:35:58 -0500
+Subject: [PATCH 03/12] fix tests for twisted.spread
+
+---
+ src/twisted/spread/flavors.py | 2 ++
+ src/twisted/spread/jelly.py | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/spread/flavors.py b/src/twisted/spread/flavors.py
+index 77c974195aa..a4fcd2126b6 100644
+--- a/src/twisted/spread/flavors.py
++++ b/src/twisted/spread/flavors.py
+@@ -398,6 +398,8 @@ def setCopyableState(self, state):
+ object's dictionary (or a filtered approximation of it depending
+ on my peer's perspective).
+ """
++ if not state:
++ state = {}
+ state = {
+ x.decode("utf8") if isinstance(x, bytes) else x: y for x, y in state.items()
+ }
+diff --git a/src/twisted/spread/jelly.py b/src/twisted/spread/jelly.py
+index 7e1b4d254bd..46cda178448 100644
+--- a/src/twisted/spread/jelly.py
++++ b/src/twisted/spread/jelly.py
+@@ -154,7 +154,8 @@ def _newInstance(cls, state):
+ instance = _createBlank(cls)
+
+ def defaultSetter(state):
+- instance.__dict__ = state
++ if isinstance(state, dict):
++ instance.__dict__ = state or {}
+
+ setter = getattr(instance, "__setstate__", defaultSetter)
+ setter(state)
+
+From afcc224a02f72e5d12fa35d223bd753e8086b135 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 21:12:31 -0500
+Subject: [PATCH 04/12] fix test for twisted.web
+
+---
+ src/twisted/web/test/test_flatten.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index e10eb06c22f..ad8c58576c3 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -706,9 +706,10 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ Exception while flattening:
+ \\[<unrenderable>\\]
+ <unrenderable>
+- .*
++ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+ element = await element
++ .*
+ RuntimeError: example
+ """
+ ),
+
+From 4b5ab38b09b326cec7967e04bd4cae8a84bb6784 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 22:05:54 -0500
+Subject: [PATCH 05/12] fix persisted tests in twisted.test
+
+---
+ src/twisted/test/test_persisted.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/twisted/test/test_persisted.py b/src/twisted/test/test_persisted.py
+index eedbbdac647..72354b33f38 100644
+--- a/src/twisted/test/test_persisted.py
++++ b/src/twisted/test/test_persisted.py
+@@ -378,6 +378,10 @@ class UnknownType:
+ def __dict__(self):
+ raise AttributeError()
+
++ @property
++ def __getstate__(self):
++ raise AttributeError()
++
+ self.assertRaises(TypeError, aot.jellyToSource, UnknownType())
+
+ def test_basicIdentity(self):
+
+From f8f56d45113e5f2467a5e8375186e5db6309dfc6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:09:15 -0500
+Subject: [PATCH 06/12] fix twisted.trial tests
+
+---
+ src/twisted/trial/test/test_pyunitcompat.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/trial/test/test_pyunitcompat.py b/src/twisted/trial/test/test_pyunitcompat.py
+index e8321c9cc6c..1ad4b5ebcf3 100644
+--- a/src/twisted/trial/test/test_pyunitcompat.py
++++ b/src/twisted/trial/test/test_pyunitcompat.py
+@@ -218,8 +218,10 @@ def test_tracebackFromCleanFailure(self):
+ pyresult = pyunit.TestResult()
+ result = PyUnitResultAdapter(pyresult)
+ result.addError(self, f)
++ tback = "".join(traceback.format_exception(*exc_info))
+ self.assertEqual(
+- pyresult.errors[0][1], "".join(traceback.format_exception(*exc_info))
++ pyresult.errors[0][1].endswith("ZeroDivisionError: division by zero\n"),
++ tback.endswith("ZeroDivisionError: division by zero\n"),
+ )
+
+ def test_trialSkip(self):
+
+From d91675ac5ffe907fcdbb3d1cedb1240008d81fd1 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:15:55 -0500
+Subject: [PATCH 07/12] make test_flatten backwards-compatible
+
+---
+ src/twisted/web/test/test_flatten.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ad8c58576c3..1070f767563 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -708,9 +708,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ <unrenderable>
+ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+- element = await element
+- .*
+- RuntimeError: example
++ element = await element.*
+ """
+ ),
+ flags=re.MULTILINE,
+
+From 603c61978ff18920ce7a133d9a0e5761ad8fcc19 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:23:15 -0500
+Subject: [PATCH 08/12] add newsfragment
+
+---
+ src/twisted/newsfragments/10343.misc | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 src/twisted/newsfragments/10343.misc
+
+diff --git a/src/twisted/newsfragments/10343.misc b/src/twisted/newsfragments/10343.misc
+new file mode 100644
+index 00000000000..3930e5bd729
+--- /dev/null
++++ b/src/twisted/newsfragments/10343.misc
+@@ -0,0 +1 @@
++Enable Python 3.11 for CI and fix the remaining broken tests.
+
+From 800f9e9372b993356e22104d8295a89d4ee5fac4 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:16:05 -0500
+Subject: [PATCH 09/12] PR feedback
+
+---
+ .github/workflows/test.yaml | 13 -------------
+ src/twisted/newsfragments/10343.feature | 1 +
+ src/twisted/newsfragments/10343.misc | 1 -
+ src/twisted/web/test/test_flatten.py | 1 +
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+ create mode 100644 src/twisted/newsfragments/10343.feature
+ delete mode 100644 src/twisted/newsfragments/10343.misc
+
+@@ -1 +0,0 @@
+-Enable Python 3.11 for CI and fix the remaining broken tests.
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 1070f767563..ea6aa4a966a 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,6 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
++ self.assertTrue('RuntimeError: example' in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From 6b069e1de60d00b658c04b8d330ab399c912a6d7 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:36:26 -0500
+Subject: [PATCH 10/12] run linter
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ea6aa4a966a..8c0d14be8f4 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue('RuntimeError: example' in str(failure.value))
++ self.assertTrue("RuntimeError: example" in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From fe8e9565e6dbcfea5258a69b098001ddd1479e4f Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 19:10:20 -0500
+Subject: [PATCH 11/12] use assertIn vs assertTrue
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 8c0d14be8f4..ad431312edb 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue("RuntimeError: example" in str(failure.value))
++ self.assertIn("RuntimeError: example", str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
diff --git a/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
new file mode 100644
index 000000000000..9a601544d4ba
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
@@ -0,0 +1,32 @@
+From 00bf5be704bee022ba4d9b24eb6c2c768b4a1921 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 26 Oct 2022 19:49:33 -0500
+Subject: [PATCH] fix sendmail tests for python 3.11
+
+---
+ src/twisted/mail/test/test_smtp.py | 3 ++-
+ src/twisted/newsfragments/10345.misc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 src/twisted/newsfragments/10345.misc
+
+diff --git a/src/twisted/mail/test/test_smtp.py b/src/twisted/mail/test/test_smtp.py
+index 906eeaad410..4c1885935e4 100644
+--- a/src/twisted/mail/test/test_smtp.py
++++ b/src/twisted/mail/test/test_smtp.py
+@@ -1771,7 +1771,8 @@ def test_defaultReactorIsGlobalReactor(self):
+ The default C{reactor} parameter of L{twisted.mail.smtp.sendmail} is
+ L{twisted.internet.reactor}.
+ """
+- args, varArgs, keywords, defaults = inspect.getargspec(smtp.sendmail)
++ fullSpec = inspect.getfullargspec(smtp.sendmail)
++ defaults = fullSpec[3]
+ self.assertEqual(reactor, defaults[2])
+
+ def _honorsESMTPArguments(self, username, password):
+diff --git a/src/twisted/newsfragments/10345.misc b/src/twisted/newsfragments/10345.misc
+new file mode 100644
+index 00000000000..2d51e2a7002
+--- /dev/null
++++ b/src/twisted/newsfragments/10345.misc
+@@ -0,0 +1 @@
++Fix SendmailTests for python 3.11.
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
index a02ec071038b..d0405e113fd3 100644
--- a/srcpkgs/python3-Twisted/template
+++ b/srcpkgs/python3-Twisted/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Twisted'
pkgname=python3-Twisted
-version=22.1.0
-revision=2
+version=22.10.0
+revision=1
build_style=python3-module
make_check_target=src/twisted
hostmakedepends="python3-setuptools python3-incremental"
@@ -10,14 +10,15 @@ depends="python3-zope.interface python3-constantly python3-incremental
python3-automat python3-hyperlink python3-attrs python3-typing_extensions
python3-openssl python3-service_identity python3-pyasn1"
checkdepends="python3-bcrypt python3-PyHamcrest git python3-h2
- python3-hyperframe python3-priority python3-hpack python3-appdirs $depends"
+ python3-hyperframe python3-priority python3-hpack python3-appdirs
+ python3-hypothesis $depends"
short_desc="Asynchronous networking framework written in Python (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://twistedmatrix.com/"
changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
-checksum=b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61
+checksum=32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
make_check=ci-skip # some tests fail when running as root
alternatives="
From 0dcfb4525dec8275b985630b1e6942dfbb69b126 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:04:49 -0500
Subject: [PATCH 5/6] python3-phonenumbers: update to 8.13.0.
---
srcpkgs/python3-phonenumbers/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 2edf6c95f570..c81e215afc1d 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,7 +1,7 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.57
-revision=2
+version=8.13.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -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=057d1966962fb86b3dc447bfac2c8e25ceed774509e49b180926a13a99910318
+checksum=93745d7afd38e246660bb601b07deac54eeb76c8e5e43f5e83333b0383a0a1e4
From 8315b3a79eb0df7a80ee8ead38d57e895a77f01e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 09:43:48 -0500
Subject: [PATCH 6/6] synapse: update to 1.71.0.
also enable more tests
---
srcpkgs/synapse/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 982806af7cdc..5496e6575476 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.70.1
-revision=2
+version=1.71.0
+revision=1
build_style=python3-pep517
build_helper=rust
make_check_target=tests
@@ -15,15 +15,15 @@ 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"
-checkdepends="$depends python3-parameterized unzip"
+ python3-packaging python3-pydantic python3-automat"
+checkdepends="$depends python3-parameterized python3-hiredis xmlsec1 unzip"
short_desc="Matrix reference homeserver"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
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=9dc9c530b15f44a9916de5a049eb71072261d54dfb727db7c35c77c7e5882859
+checksum=b382e86012d5d3fec194f508138ec7fa7915f5fe853fa63be5ca0dc6848de501
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
` (2 preceding siblings ...)
2022-11-10 20:15 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-11-10 20:32 ` TinfoilSubmarine
2022-11-10 20:35 ` TinfoilSubmarine
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2375 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/40446
synapse: update to 1.71.0.
also enable more tests
#### Testing the changes
- I tested the changes in this PR: **YES**
Had to bump several different dependencies. Here's where they need to be tested
as well:
python-attrs (really just need to test python-Twisted):
- [ ] python-automat
- [ ] python-service_identity
python3-attrs:
- [ ] coursera-dl
- [ ] pantalaimon
- [ ] pycp
- [ ] pysolfc
- [x] python3-Twisted
- [x] python3-aiohttp
- [ ] python3-aiohttp-sse-client
- [ ] python3-aiohttp2
- [ ] python3-aiorpcx
- [x] python3-automat
- [ ] python3-gogs-client
- [x] python3-hypothesis
- [x] python3-jsonschema
- [x] python3-matrix-common
- [ ] python3-parver
- [x] python3-pytest
- [x] python3-service_identity
- [x] python3-treq
- [ ] python3-trio
- [ ] python3-txacme
- [x] synapse
- [ ] ueberzug
python-automat:
- [ ] python-Twisted
python3-automat:
- [x] python3-Twisted
- [ ] python3-txtorcon
python3-PyHamcrest (checkdepends):
- [x] python3-Twisted
- [x] rtags
python3-Twisted:
- [ ] alot
- [ ] deluge https://github.com/void-linux/void-packages/pull/40453
- [ ] python3-TxSNI
- [ ] python3-autobahn
- [x] python3-treq
- [ ] python3-txacme
- [x] python3-txredisapi
- [ ] python3-txtorcon
- [x] synapse
- [ ] syncplay
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-40446.patch --]
[-- Type: text/x-diff, Size: 24616 bytes --]
From a9176a7e885a13829479768861c0d1c34e9ad0c9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 15:27:01 -0500
Subject: [PATCH 1/6] python3-attrs: update to 22.1.0.
split from python-attrs as python2 is no longer supported
---
srcpkgs/python-attrs/template | 18 ++----------------
srcpkgs/python3-attrs | 1 -
srcpkgs/python3-attrs/template | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-attrs
create mode 100644 srcpkgs/python3-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index ce8321736d4e..8af143a18f62 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -2,10 +2,9 @@
pkgname=python-attrs
version=21.2.0
revision=3
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -13,19 +12,6 @@ homepage="https://attrs.readthedocs.io/"
distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-do_check() {
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
-
-python3-attrs_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-attrs b/srcpkgs/python3-attrs
deleted file mode 120000
index f6d04198f695..000000000000
--- a/srcpkgs/python3-attrs
+++ /dev/null
@@ -1 +0,0 @@
-python-attrs
\ No newline at end of file
diff --git a/srcpkgs/python3-attrs/template b/srcpkgs/python3-attrs/template
new file mode 100644
index 000000000000..64aaacfbecd2
--- /dev/null
+++ b/srcpkgs/python3-attrs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-attrs'
+pkgname=python3-attrs
+version=22.1.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-zope.interface python3-six
+ python3-hypothesis"
+short_desc="Attributes without boilerplate (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://attrs.readthedocs.io/"
+distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
+checksum=29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6
+
+post_install() {
+ vlicense LICENSE
+}
From 4deeca5974397892d27a9d96bf6a3ab8c1b3e868 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 10:11:11 -0500
Subject: [PATCH 2/6] python-automat: update to 22.10.0.
drop python3-Twisted in checkdepends as it was a cyclic dependency.
---
srcpkgs/python-automat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 8b3f99f1961f..865b70d6a4b3 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,17 +1,17 @@
# Template file for 'python-automat'
pkgname=python-automat
-version=20.2.0
-revision=5
+version=22.10.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
short_desc="Finite-state machines in Python (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/glyph/Automat"
distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
pre_build() {
@@ -22,7 +22,8 @@ pre_build() {
}
do_check() {
- python3 setup.py test
+ PYTHONPATH="$(cd build/lib* && pwd)" \
+ python3 -m pytest ${testjobs} automat/_test
}
post_install() {
From 5945bc71a9d9f51559c62cb80ac93b62f45370e1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 11:22:30 -0500
Subject: [PATCH 3/6] python3-PyHamcrest: update to 2.0.4.
split from python-PyHamcrest as python2 is no longer supported
---
srcpkgs/python-PyHamcrest/template | 20 +++++---------------
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 20 ++++++++++++++++++++
3 files changed, 25 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
create mode 100644 srcpkgs/python3-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
index fc382336ff00..cf34cb06db26 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python-PyHamcrest/template
@@ -2,31 +2,21 @@
pkgname=python-PyHamcrest
version=1.9.0
revision=6
-build_style=python-module
-pycompile_module="hamcrest"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six"
short_desc="Hamcrest framework for matcher objects (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
pre_build() {
# drop setuptools from runtime requires
- sed -i "/install_requires=/s|'setuptools',||" setup.py
+ vsed -i "/install_requires=/s|'setuptools',||" setup.py
}
+
post_install() {
vlicense LICENSE.txt
}
-
-python3-PyHamcrest_package() {
- depends="python3-six"
- pycompile_module="hamcrest"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-PyHamcrest b/srcpkgs/python3-PyHamcrest
deleted file mode 120000
index 88738b03cdbf..000000000000
--- a/srcpkgs/python3-PyHamcrest
+++ /dev/null
@@ -1 +0,0 @@
-python-PyHamcrest
\ No newline at end of file
diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
new file mode 100644
index 000000000000..87d1c80c4bb6
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-PyHamcrest
+version=2.0.4
+revision=1
+build_style=python3-pep517
+make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
+hostmakedepends="hatch-vcs"
+depends="python3"
+checkdepends="python3-pytest python3-numpy"
+short_desc="Hamcrest framework for matcher objects (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
+distfiles="${PYPI_SITE}/p/pyhamcrest/pyhamcrest-${version}.tar.gz"
+checksum=b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
+make_check_pre="env PYTHONPATH=src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 7badfcba59d2256cfcb12a2cc824f4b5e77726b6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:50:08 -0500
Subject: [PATCH 4/6] python3-Twisted: update to 22.10.0.
---
.../python3-Twisted/patches/python3.11.patch | 258 ++++++++++++++++++
.../patches/sendmail_getargspec.patch | 32 +++
srcpkgs/python3-Twisted/template | 9 +-
3 files changed, 295 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-Twisted/patches/python3.11.patch
create mode 100644 srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
diff --git a/srcpkgs/python3-Twisted/patches/python3.11.patch b/srcpkgs/python3-Twisted/patches/python3.11.patch
new file mode 100644
index 000000000000..d4f2de447b0f
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/python3.11.patch
@@ -0,0 +1,258 @@
+From 4f6d7fb0749429b092fe7538a7d2b11fe58319a6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 20:35:55 -0500
+Subject: [PATCH 02/12] fix twisted.persisted tests
+
+---
+ src/twisted/persisted/aot.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/persisted/aot.py b/src/twisted/persisted/aot.py
+index 0daeb3b4c85..204728058cd 100644
+--- a/src/twisted/persisted/aot.py
++++ b/src/twisted/persisted/aot.py
+@@ -399,8 +399,10 @@ def unjellyAO(self, ao):
+ inst = klass.__new__(klass)
+ if hasattr(klass, "__setstate__"):
+ self.callAfter(inst.__setstate__, state)
+- else:
++ elif isinstance(state, dict):
+ inst.__dict__ = state
++ else:
++ inst.__dict__ = state.__getstate__()
+ return inst
+
+ elif c is Ref:
+
+From 525377178adfa987ed56be753aec0fce35d721dc Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 21:35:58 -0500
+Subject: [PATCH 03/12] fix tests for twisted.spread
+
+---
+ src/twisted/spread/flavors.py | 2 ++
+ src/twisted/spread/jelly.py | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/spread/flavors.py b/src/twisted/spread/flavors.py
+index 77c974195aa..a4fcd2126b6 100644
+--- a/src/twisted/spread/flavors.py
++++ b/src/twisted/spread/flavors.py
+@@ -398,6 +398,8 @@ def setCopyableState(self, state):
+ object's dictionary (or a filtered approximation of it depending
+ on my peer's perspective).
+ """
++ if not state:
++ state = {}
+ state = {
+ x.decode("utf8") if isinstance(x, bytes) else x: y for x, y in state.items()
+ }
+diff --git a/src/twisted/spread/jelly.py b/src/twisted/spread/jelly.py
+index 7e1b4d254bd..46cda178448 100644
+--- a/src/twisted/spread/jelly.py
++++ b/src/twisted/spread/jelly.py
+@@ -154,7 +154,8 @@ def _newInstance(cls, state):
+ instance = _createBlank(cls)
+
+ def defaultSetter(state):
+- instance.__dict__ = state
++ if isinstance(state, dict):
++ instance.__dict__ = state or {}
+
+ setter = getattr(instance, "__setstate__", defaultSetter)
+ setter(state)
+
+From afcc224a02f72e5d12fa35d223bd753e8086b135 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 21:12:31 -0500
+Subject: [PATCH 04/12] fix test for twisted.web
+
+---
+ src/twisted/web/test/test_flatten.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index e10eb06c22f..ad8c58576c3 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -706,9 +706,10 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ Exception while flattening:
+ \\[<unrenderable>\\]
+ <unrenderable>
+- .*
++ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+ element = await element
++ .*
+ RuntimeError: example
+ """
+ ),
+
+From 4b5ab38b09b326cec7967e04bd4cae8a84bb6784 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 22:05:54 -0500
+Subject: [PATCH 05/12] fix persisted tests in twisted.test
+
+---
+ src/twisted/test/test_persisted.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/twisted/test/test_persisted.py b/src/twisted/test/test_persisted.py
+index eedbbdac647..72354b33f38 100644
+--- a/src/twisted/test/test_persisted.py
++++ b/src/twisted/test/test_persisted.py
+@@ -378,6 +378,10 @@ class UnknownType:
+ def __dict__(self):
+ raise AttributeError()
+
++ @property
++ def __getstate__(self):
++ raise AttributeError()
++
+ self.assertRaises(TypeError, aot.jellyToSource, UnknownType())
+
+ def test_basicIdentity(self):
+
+From f8f56d45113e5f2467a5e8375186e5db6309dfc6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:09:15 -0500
+Subject: [PATCH 06/12] fix twisted.trial tests
+
+---
+ src/twisted/trial/test/test_pyunitcompat.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/trial/test/test_pyunitcompat.py b/src/twisted/trial/test/test_pyunitcompat.py
+index e8321c9cc6c..1ad4b5ebcf3 100644
+--- a/src/twisted/trial/test/test_pyunitcompat.py
++++ b/src/twisted/trial/test/test_pyunitcompat.py
+@@ -218,8 +218,10 @@ def test_tracebackFromCleanFailure(self):
+ pyresult = pyunit.TestResult()
+ result = PyUnitResultAdapter(pyresult)
+ result.addError(self, f)
++ tback = "".join(traceback.format_exception(*exc_info))
+ self.assertEqual(
+- pyresult.errors[0][1], "".join(traceback.format_exception(*exc_info))
++ pyresult.errors[0][1].endswith("ZeroDivisionError: division by zero\n"),
++ tback.endswith("ZeroDivisionError: division by zero\n"),
+ )
+
+ def test_trialSkip(self):
+
+From d91675ac5ffe907fcdbb3d1cedb1240008d81fd1 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:15:55 -0500
+Subject: [PATCH 07/12] make test_flatten backwards-compatible
+
+---
+ src/twisted/web/test/test_flatten.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ad8c58576c3..1070f767563 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -708,9 +708,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ <unrenderable>
+ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+- element = await element
+- .*
+- RuntimeError: example
++ element = await element.*
+ """
+ ),
+ flags=re.MULTILINE,
+
+From 603c61978ff18920ce7a133d9a0e5761ad8fcc19 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:23:15 -0500
+Subject: [PATCH 08/12] add newsfragment
+
+---
+ src/twisted/newsfragments/10343.misc | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 src/twisted/newsfragments/10343.misc
+
+diff --git a/src/twisted/newsfragments/10343.misc b/src/twisted/newsfragments/10343.misc
+new file mode 100644
+index 00000000000..3930e5bd729
+--- /dev/null
++++ b/src/twisted/newsfragments/10343.misc
+@@ -0,0 +1 @@
++Enable Python 3.11 for CI and fix the remaining broken tests.
+
+From 800f9e9372b993356e22104d8295a89d4ee5fac4 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:16:05 -0500
+Subject: [PATCH 09/12] PR feedback
+
+---
+ .github/workflows/test.yaml | 13 -------------
+ src/twisted/newsfragments/10343.feature | 1 +
+ src/twisted/newsfragments/10343.misc | 1 -
+ src/twisted/web/test/test_flatten.py | 1 +
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+ create mode 100644 src/twisted/newsfragments/10343.feature
+ delete mode 100644 src/twisted/newsfragments/10343.misc
+
+@@ -1 +0,0 @@
+-Enable Python 3.11 for CI and fix the remaining broken tests.
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 1070f767563..ea6aa4a966a 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,6 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
++ self.assertTrue('RuntimeError: example' in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From 6b069e1de60d00b658c04b8d330ab399c912a6d7 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:36:26 -0500
+Subject: [PATCH 10/12] run linter
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ea6aa4a966a..8c0d14be8f4 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue('RuntimeError: example' in str(failure.value))
++ self.assertTrue("RuntimeError: example" in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From fe8e9565e6dbcfea5258a69b098001ddd1479e4f Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 19:10:20 -0500
+Subject: [PATCH 11/12] use assertIn vs assertTrue
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 8c0d14be8f4..ad431312edb 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue("RuntimeError: example" in str(failure.value))
++ self.assertIn("RuntimeError: example", str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
diff --git a/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
new file mode 100644
index 000000000000..9a601544d4ba
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
@@ -0,0 +1,32 @@
+From 00bf5be704bee022ba4d9b24eb6c2c768b4a1921 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 26 Oct 2022 19:49:33 -0500
+Subject: [PATCH] fix sendmail tests for python 3.11
+
+---
+ src/twisted/mail/test/test_smtp.py | 3 ++-
+ src/twisted/newsfragments/10345.misc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 src/twisted/newsfragments/10345.misc
+
+diff --git a/src/twisted/mail/test/test_smtp.py b/src/twisted/mail/test/test_smtp.py
+index 906eeaad410..4c1885935e4 100644
+--- a/src/twisted/mail/test/test_smtp.py
++++ b/src/twisted/mail/test/test_smtp.py
+@@ -1771,7 +1771,8 @@ def test_defaultReactorIsGlobalReactor(self):
+ The default C{reactor} parameter of L{twisted.mail.smtp.sendmail} is
+ L{twisted.internet.reactor}.
+ """
+- args, varArgs, keywords, defaults = inspect.getargspec(smtp.sendmail)
++ fullSpec = inspect.getfullargspec(smtp.sendmail)
++ defaults = fullSpec[3]
+ self.assertEqual(reactor, defaults[2])
+
+ def _honorsESMTPArguments(self, username, password):
+diff --git a/src/twisted/newsfragments/10345.misc b/src/twisted/newsfragments/10345.misc
+new file mode 100644
+index 00000000000..2d51e2a7002
+--- /dev/null
++++ b/src/twisted/newsfragments/10345.misc
+@@ -0,0 +1 @@
++Fix SendmailTests for python 3.11.
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
index a02ec071038b..d0405e113fd3 100644
--- a/srcpkgs/python3-Twisted/template
+++ b/srcpkgs/python3-Twisted/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Twisted'
pkgname=python3-Twisted
-version=22.1.0
-revision=2
+version=22.10.0
+revision=1
build_style=python3-module
make_check_target=src/twisted
hostmakedepends="python3-setuptools python3-incremental"
@@ -10,14 +10,15 @@ depends="python3-zope.interface python3-constantly python3-incremental
python3-automat python3-hyperlink python3-attrs python3-typing_extensions
python3-openssl python3-service_identity python3-pyasn1"
checkdepends="python3-bcrypt python3-PyHamcrest git python3-h2
- python3-hyperframe python3-priority python3-hpack python3-appdirs $depends"
+ python3-hyperframe python3-priority python3-hpack python3-appdirs
+ python3-hypothesis $depends"
short_desc="Asynchronous networking framework written in Python (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://twistedmatrix.com/"
changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
-checksum=b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61
+checksum=32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
make_check=ci-skip # some tests fail when running as root
alternatives="
From 1f2c3dd8f511c312b04704f88fd91bb94437675e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:04:49 -0500
Subject: [PATCH 5/6] python3-phonenumbers: update to 8.13.0.
---
srcpkgs/python3-phonenumbers/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 2edf6c95f570..c81e215afc1d 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,7 +1,7 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.57
-revision=2
+version=8.13.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -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=057d1966962fb86b3dc447bfac2c8e25ceed774509e49b180926a13a99910318
+checksum=93745d7afd38e246660bb601b07deac54eeb76c8e5e43f5e83333b0383a0a1e4
From f33ff80feff03cdc4f0a21644713ff69642d1079 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 09:43:48 -0500
Subject: [PATCH 6/6] synapse: update to 1.71.0.
also enable more tests
---
srcpkgs/synapse/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 982806af7cdc..5496e6575476 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,7 +1,7 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.70.1
-revision=2
+version=1.71.0
+revision=1
build_style=python3-pep517
build_helper=rust
make_check_target=tests
@@ -15,15 +15,15 @@ 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"
-checkdepends="$depends python3-parameterized unzip"
+ python3-packaging python3-pydantic python3-automat"
+checkdepends="$depends python3-parameterized python3-hiredis xmlsec1 unzip"
short_desc="Matrix reference homeserver"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
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=9dc9c530b15f44a9916de5a049eb71072261d54dfb727db7c35c77c7e5882859
+checksum=b382e86012d5d3fec194f508138ec7fa7915f5fe853fa63be5ca0dc6848de501
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
` (3 preceding siblings ...)
2022-11-10 20:32 ` TinfoilSubmarine
@ 2022-11-10 20:35 ` TinfoilSubmarine
2022-11-10 20:37 ` TinfoilSubmarine
2022-11-12 21:36 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 20:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2263 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/synapse
https://github.com/void-linux/void-packages/pull/40446
synapse: update to 1.71.0.
also enable more tests
#### Testing the changes
- I tested the changes in this PR: **YES**
Had to bump several different dependencies. Here's where they need to be tested
as well:
python3-attrs:
- [ ] coursera-dl
- [ ] pantalaimon
- [ ] pycp
- [ ] pysolfc
- [x] python3-Twisted
- [x] python3-aiohttp
- [ ] python3-aiohttp-sse-client
- [ ] python3-aiohttp2
- [ ] python3-aiorpcx
- [x] python3-automat
- [ ] python3-gogs-client
- [x] python3-hypothesis
- [x] python3-jsonschema
- [x] python3-matrix-common
- [ ] python3-parver
- [x] python3-pytest
- [x] python3-service_identity
- [x] python3-treq
- [ ] python3-trio
- [ ] python3-txacme
- [x] synapse
- [ ] ueberzug
python-automat:
- [ ] python-Twisted
python3-automat:
- [x] python3-Twisted
- [ ] python3-txtorcon
python3-PyHamcrest (checkdepends):
- [x] python3-Twisted
- [x] rtags
python3-Twisted:
- [ ] alot
- [ ] deluge https://github.com/void-linux/void-packages/pull/40453
- [ ] python3-TxSNI
- [ ] python3-autobahn
- [x] python3-treq
- [ ] python3-txacme
- [x] python3-txredisapi
- [ ] python3-txtorcon
- [x] synapse
- [ ] syncplay
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40446.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/synapse-40446.patch --]
[-- Type: text/x-diff, Size: 25660 bytes --]
From a9176a7e885a13829479768861c0d1c34e9ad0c9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 15:27:01 -0500
Subject: [PATCH 1/6] python3-attrs: update to 22.1.0.
split from python-attrs as python2 is no longer supported
---
srcpkgs/python-attrs/template | 18 ++----------------
srcpkgs/python3-attrs | 1 -
srcpkgs/python3-attrs/template | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-attrs
create mode 100644 srcpkgs/python3-attrs/template
diff --git a/srcpkgs/python-attrs/template b/srcpkgs/python-attrs/template
index ce8321736d4e..8af143a18f62 100644
--- a/srcpkgs/python-attrs/template
+++ b/srcpkgs/python-attrs/template
@@ -2,10 +2,9 @@
pkgname=python-attrs
version=21.2.0
revision=3
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python"
-checkdepends="python3-pytest python3-zope.interface python3-six python3-hypothesis"
short_desc="Attributes without boilerplate (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
@@ -13,19 +12,6 @@ homepage="https://attrs.readthedocs.io/"
distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
checksum=ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
-do_check() {
- PYTHONPATH="$(cd build-${py3_ver}/lib* && pwd)" python3 -m pytest
-}
-
post_install() {
vlicense LICENSE
}
-
-python3-attrs_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-attrs b/srcpkgs/python3-attrs
deleted file mode 120000
index f6d04198f695..000000000000
--- a/srcpkgs/python3-attrs
+++ /dev/null
@@ -1 +0,0 @@
-python-attrs
\ No newline at end of file
diff --git a/srcpkgs/python3-attrs/template b/srcpkgs/python3-attrs/template
new file mode 100644
index 000000000000..64aaacfbecd2
--- /dev/null
+++ b/srcpkgs/python3-attrs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-attrs'
+pkgname=python3-attrs
+version=22.1.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest python3-zope.interface python3-six
+ python3-hypothesis"
+short_desc="Attributes without boilerplate (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="MIT"
+homepage="https://attrs.readthedocs.io/"
+distfiles="${PYPI_SITE}/a/attrs/attrs-${version}.tar.gz"
+checksum=29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6
+
+post_install() {
+ vlicense LICENSE
+}
From 4deeca5974397892d27a9d96bf6a3ab8c1b3e868 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 10:11:11 -0500
Subject: [PATCH 2/6] python-automat: update to 22.10.0.
drop python3-Twisted in checkdepends as it was a cyclic dependency.
---
srcpkgs/python-automat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python-automat/template b/srcpkgs/python-automat/template
index 8b3f99f1961f..865b70d6a4b3 100644
--- a/srcpkgs/python-automat/template
+++ b/srcpkgs/python-automat/template
@@ -1,17 +1,17 @@
# Template file for 'python-automat'
pkgname=python-automat
-version=20.2.0
-revision=5
+version=22.10.0
+revision=1
build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-setuptools python-attrs python-six"
-checkdepends="python3-attrs python3-six python3-Twisted python3-graphviz"
+checkdepends="python3-pytest python3-attrs python3-six python3-graphviz"
short_desc="Finite-state machines in Python (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
license="MIT"
homepage="https://github.com/glyph/Automat"
distfiles="${PYPI_SITE}/A/Automat/Automat-${version}.tar.gz"
-checksum=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+checksum=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
alternatives="automat:automat-visualize:/usr/bin/automat-visualize2"
pre_build() {
@@ -22,7 +22,8 @@ pre_build() {
}
do_check() {
- python3 setup.py test
+ PYTHONPATH="$(cd build/lib* && pwd)" \
+ python3 -m pytest ${testjobs} automat/_test
}
post_install() {
From 5945bc71a9d9f51559c62cb80ac93b62f45370e1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 11:22:30 -0500
Subject: [PATCH 3/6] python3-PyHamcrest: update to 2.0.4.
split from python-PyHamcrest as python2 is no longer supported
---
srcpkgs/python-PyHamcrest/template | 20 +++++---------------
srcpkgs/python3-PyHamcrest | 1 -
srcpkgs/python3-PyHamcrest/template | 20 ++++++++++++++++++++
3 files changed, 25 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-PyHamcrest
create mode 100644 srcpkgs/python3-PyHamcrest/template
diff --git a/srcpkgs/python-PyHamcrest/template b/srcpkgs/python-PyHamcrest/template
index fc382336ff00..cf34cb06db26 100644
--- a/srcpkgs/python-PyHamcrest/template
+++ b/srcpkgs/python-PyHamcrest/template
@@ -2,31 +2,21 @@
pkgname=python-PyHamcrest
version=1.9.0
revision=6
-build_style=python-module
-pycompile_module="hamcrest"
-hostmakedepends="python-setuptools python3-setuptools"
+build_style=python2-module
+hostmakedepends="python-setuptools"
depends="python-six"
short_desc="Hamcrest framework for matcher objects (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/hamcrest/PyHamcrest"
license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
distfiles="${PYPI_SITE}/P/PyHamcrest/PyHamcrest-${version}.tar.gz"
checksum=8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd
pre_build() {
# drop setuptools from runtime requires
- sed -i "/install_requires=/s|'setuptools',||" setup.py
+ vsed -i "/install_requires=/s|'setuptools',||" setup.py
}
+
post_install() {
vlicense LICENSE.txt
}
-
-python3-PyHamcrest_package() {
- depends="python3-six"
- pycompile_module="hamcrest"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-PyHamcrest b/srcpkgs/python3-PyHamcrest
deleted file mode 120000
index 88738b03cdbf..000000000000
--- a/srcpkgs/python3-PyHamcrest
+++ /dev/null
@@ -1 +0,0 @@
-python-PyHamcrest
\ No newline at end of file
diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template
new file mode 100644
index 000000000000..87d1c80c4bb6
--- /dev/null
+++ b/srcpkgs/python3-PyHamcrest/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-PyHamcrest'
+pkgname=python3-PyHamcrest
+version=2.0.4
+revision=1
+build_style=python3-pep517
+make_install_target="dist/pyhamcrest-${version}-*-*-*.whl"
+hostmakedepends="hatch-vcs"
+depends="python3"
+checkdepends="python3-pytest python3-numpy"
+short_desc="Hamcrest framework for matcher objects (Python3)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/hamcrest/PyHamcrest"
+distfiles="${PYPI_SITE}/p/pyhamcrest/pyhamcrest-${version}.tar.gz"
+checksum=b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1
+make_check_pre="env PYTHONPATH=src"
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 7badfcba59d2256cfcb12a2cc824f4b5e77726b6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:50:08 -0500
Subject: [PATCH 4/6] python3-Twisted: update to 22.10.0.
---
.../python3-Twisted/patches/python3.11.patch | 258 ++++++++++++++++++
.../patches/sendmail_getargspec.patch | 32 +++
srcpkgs/python3-Twisted/template | 9 +-
3 files changed, 295 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-Twisted/patches/python3.11.patch
create mode 100644 srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
diff --git a/srcpkgs/python3-Twisted/patches/python3.11.patch b/srcpkgs/python3-Twisted/patches/python3.11.patch
new file mode 100644
index 000000000000..d4f2de447b0f
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/python3.11.patch
@@ -0,0 +1,258 @@
+From 4f6d7fb0749429b092fe7538a7d2b11fe58319a6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 20:35:55 -0500
+Subject: [PATCH 02/12] fix twisted.persisted tests
+
+---
+ src/twisted/persisted/aot.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/persisted/aot.py b/src/twisted/persisted/aot.py
+index 0daeb3b4c85..204728058cd 100644
+--- a/src/twisted/persisted/aot.py
++++ b/src/twisted/persisted/aot.py
+@@ -399,8 +399,10 @@ def unjellyAO(self, ao):
+ inst = klass.__new__(klass)
+ if hasattr(klass, "__setstate__"):
+ self.callAfter(inst.__setstate__, state)
+- else:
++ elif isinstance(state, dict):
+ inst.__dict__ = state
++ else:
++ inst.__dict__ = state.__getstate__()
+ return inst
+
+ elif c is Ref:
+
+From 525377178adfa987ed56be753aec0fce35d721dc Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 2 Nov 2022 21:35:58 -0500
+Subject: [PATCH 03/12] fix tests for twisted.spread
+
+---
+ src/twisted/spread/flavors.py | 2 ++
+ src/twisted/spread/jelly.py | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/spread/flavors.py b/src/twisted/spread/flavors.py
+index 77c974195aa..a4fcd2126b6 100644
+--- a/src/twisted/spread/flavors.py
++++ b/src/twisted/spread/flavors.py
+@@ -398,6 +398,8 @@ def setCopyableState(self, state):
+ object's dictionary (or a filtered approximation of it depending
+ on my peer's perspective).
+ """
++ if not state:
++ state = {}
+ state = {
+ x.decode("utf8") if isinstance(x, bytes) else x: y for x, y in state.items()
+ }
+diff --git a/src/twisted/spread/jelly.py b/src/twisted/spread/jelly.py
+index 7e1b4d254bd..46cda178448 100644
+--- a/src/twisted/spread/jelly.py
++++ b/src/twisted/spread/jelly.py
+@@ -154,7 +154,8 @@ def _newInstance(cls, state):
+ instance = _createBlank(cls)
+
+ def defaultSetter(state):
+- instance.__dict__ = state
++ if isinstance(state, dict):
++ instance.__dict__ = state or {}
+
+ setter = getattr(instance, "__setstate__", defaultSetter)
+ setter(state)
+
+From afcc224a02f72e5d12fa35d223bd753e8086b135 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 21:12:31 -0500
+Subject: [PATCH 04/12] fix test for twisted.web
+
+---
+ src/twisted/web/test/test_flatten.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index e10eb06c22f..ad8c58576c3 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -706,9 +706,10 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ Exception while flattening:
+ \\[<unrenderable>\\]
+ <unrenderable>
+- .*
++ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+ element = await element
++ .*
+ RuntimeError: example
+ """
+ ),
+
+From 4b5ab38b09b326cec7967e04bd4cae8a84bb6784 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 22:05:54 -0500
+Subject: [PATCH 05/12] fix persisted tests in twisted.test
+
+---
+ src/twisted/test/test_persisted.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/twisted/test/test_persisted.py b/src/twisted/test/test_persisted.py
+index eedbbdac647..72354b33f38 100644
+--- a/src/twisted/test/test_persisted.py
++++ b/src/twisted/test/test_persisted.py
+@@ -378,6 +378,10 @@ class UnknownType:
+ def __dict__(self):
+ raise AttributeError()
+
++ @property
++ def __getstate__(self):
++ raise AttributeError()
++
+ self.assertRaises(TypeError, aot.jellyToSource, UnknownType())
+
+ def test_basicIdentity(self):
+
+From f8f56d45113e5f2467a5e8375186e5db6309dfc6 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:09:15 -0500
+Subject: [PATCH 06/12] fix twisted.trial tests
+
+---
+ src/twisted/trial/test/test_pyunitcompat.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/trial/test/test_pyunitcompat.py b/src/twisted/trial/test/test_pyunitcompat.py
+index e8321c9cc6c..1ad4b5ebcf3 100644
+--- a/src/twisted/trial/test/test_pyunitcompat.py
++++ b/src/twisted/trial/test/test_pyunitcompat.py
+@@ -218,8 +218,10 @@ def test_tracebackFromCleanFailure(self):
+ pyresult = pyunit.TestResult()
+ result = PyUnitResultAdapter(pyresult)
+ result.addError(self, f)
++ tback = "".join(traceback.format_exception(*exc_info))
+ self.assertEqual(
+- pyresult.errors[0][1], "".join(traceback.format_exception(*exc_info))
++ pyresult.errors[0][1].endswith("ZeroDivisionError: division by zero\n"),
++ tback.endswith("ZeroDivisionError: division by zero\n"),
+ )
+
+ def test_trialSkip(self):
+
+From d91675ac5ffe907fcdbb3d1cedb1240008d81fd1 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:15:55 -0500
+Subject: [PATCH 07/12] make test_flatten backwards-compatible
+
+---
+ src/twisted/web/test/test_flatten.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ad8c58576c3..1070f767563 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -708,9 +708,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ <unrenderable>
+ <Deferred at .* current result: <twisted.python.failure.Failure builtins.RuntimeError: example>>
+ File ".*", line \\d*, in _flattenTree
+- element = await element
+- .*
+- RuntimeError: example
++ element = await element.*
+ """
+ ),
+ flags=re.MULTILINE,
+
+From 603c61978ff18920ce7a133d9a0e5761ad8fcc19 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Thu, 3 Nov 2022 23:23:15 -0500
+Subject: [PATCH 08/12] add newsfragment
+
+---
+ src/twisted/newsfragments/10343.misc | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 src/twisted/newsfragments/10343.misc
+
+diff --git a/src/twisted/newsfragments/10343.misc b/src/twisted/newsfragments/10343.misc
+new file mode 100644
+index 00000000000..3930e5bd729
+--- /dev/null
++++ b/src/twisted/newsfragments/10343.misc
+@@ -0,0 +1 @@
++Enable Python 3.11 for CI and fix the remaining broken tests.
+
+From 800f9e9372b993356e22104d8295a89d4ee5fac4 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:16:05 -0500
+Subject: [PATCH 09/12] PR feedback
+
+---
+ .github/workflows/test.yaml | 13 -------------
+ src/twisted/newsfragments/10343.feature | 1 +
+ src/twisted/newsfragments/10343.misc | 1 -
+ src/twisted/web/test/test_flatten.py | 1 +
+ 4 files changed, 2 insertions(+), 14 deletions(-)
+ create mode 100644 src/twisted/newsfragments/10343.feature
+ delete mode 100644 src/twisted/newsfragments/10343.misc
+
+@@ -1 +0,0 @@
+-Enable Python 3.11 for CI and fix the remaining broken tests.
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 1070f767563..ea6aa4a966a 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,6 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
++ self.assertTrue('RuntimeError: example' in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From 6b069e1de60d00b658c04b8d330ab399c912a6d7 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 15:36:26 -0500
+Subject: [PATCH 10/12] run linter
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index ea6aa4a966a..8c0d14be8f4 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue('RuntimeError: example' in str(failure.value))
++ self.assertTrue("RuntimeError: example" in str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
+
+From fe8e9565e6dbcfea5258a69b098001ddd1479e4f Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Fri, 4 Nov 2022 19:10:20 -0500
+Subject: [PATCH 11/12] use assertIn vs assertTrue
+
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 8c0d14be8f4..ad431312edb 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -714,7 +714,7 @@ def render(self, request: Optional[IRequest]) -> Flattenable:
+ flags=re.MULTILINE,
+ ),
+ )
+- self.assertTrue("RuntimeError: example" in str(failure.value))
++ self.assertIn("RuntimeError: example", str(failure.value))
+ # The original exception is unmodified and will be logged separately if
+ # unhandled.
+ self.failureResultOf(failing, RuntimeError)
diff --git a/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
new file mode 100644
index 000000000000..9a601544d4ba
--- /dev/null
+++ b/srcpkgs/python3-Twisted/patches/sendmail_getargspec.patch
@@ -0,0 +1,32 @@
+From 00bf5be704bee022ba4d9b24eb6c2c768b4a1921 Mon Sep 17 00:00:00 2001
+From: eevel <eevel@weezel3.weezelnet>
+Date: Wed, 26 Oct 2022 19:49:33 -0500
+Subject: [PATCH] fix sendmail tests for python 3.11
+
+---
+ src/twisted/mail/test/test_smtp.py | 3 ++-
+ src/twisted/newsfragments/10345.misc | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 src/twisted/newsfragments/10345.misc
+
+diff --git a/src/twisted/mail/test/test_smtp.py b/src/twisted/mail/test/test_smtp.py
+index 906eeaad410..4c1885935e4 100644
+--- a/src/twisted/mail/test/test_smtp.py
++++ b/src/twisted/mail/test/test_smtp.py
+@@ -1771,7 +1771,8 @@ def test_defaultReactorIsGlobalReactor(self):
+ The default C{reactor} parameter of L{twisted.mail.smtp.sendmail} is
+ L{twisted.internet.reactor}.
+ """
+- args, varArgs, keywords, defaults = inspect.getargspec(smtp.sendmail)
++ fullSpec = inspect.getfullargspec(smtp.sendmail)
++ defaults = fullSpec[3]
+ self.assertEqual(reactor, defaults[2])
+
+ def _honorsESMTPArguments(self, username, password):
+diff --git a/src/twisted/newsfragments/10345.misc b/src/twisted/newsfragments/10345.misc
+new file mode 100644
+index 00000000000..2d51e2a7002
+--- /dev/null
++++ b/src/twisted/newsfragments/10345.misc
+@@ -0,0 +1 @@
++Fix SendmailTests for python 3.11.
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
index a02ec071038b..d0405e113fd3 100644
--- a/srcpkgs/python3-Twisted/template
+++ b/srcpkgs/python3-Twisted/template
@@ -1,7 +1,7 @@
# Template file for 'python3-Twisted'
pkgname=python3-Twisted
-version=22.1.0
-revision=2
+version=22.10.0
+revision=1
build_style=python3-module
make_check_target=src/twisted
hostmakedepends="python3-setuptools python3-incremental"
@@ -10,14 +10,15 @@ depends="python3-zope.interface python3-constantly python3-incremental
python3-automat python3-hyperlink python3-attrs python3-typing_extensions
python3-openssl python3-service_identity python3-pyasn1"
checkdepends="python3-bcrypt python3-PyHamcrest git python3-h2
- python3-hyperframe python3-priority python3-hpack python3-appdirs $depends"
+ python3-hyperframe python3-priority python3-hpack python3-appdirs
+ python3-hypothesis $depends"
short_desc="Asynchronous networking framework written in Python (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://twistedmatrix.com/"
changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
-checksum=b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61
+checksum=32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
make_check=ci-skip # some tests fail when running as root
alternatives="
From 1f2c3dd8f511c312b04704f88fd91bb94437675e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 10 Nov 2022 08:04:49 -0500
Subject: [PATCH 5/6] python3-phonenumbers: update to 8.13.0.
---
srcpkgs/python3-phonenumbers/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 2edf6c95f570..c81e215afc1d 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,7 +1,7 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.12.57
-revision=2
+version=8.13.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -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=057d1966962fb86b3dc447bfac2c8e25ceed774509e49b180926a13a99910318
+checksum=93745d7afd38e246660bb601b07deac54eeb76c8e5e43f5e83333b0383a0a1e4
From ba58c8e788f595a6455722ae9a8511388381672c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Nov 2022 09:43:48 -0500
Subject: [PATCH 6/6] synapse: update to 1.71.0.
also enable more tests
---
srcpkgs/synapse/template | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 982806af7cdc..2b052bdbfe70 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,29 +1,30 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.70.1
-revision=2
+version=1.71.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-canonicaljson
- python3-signedjson python3-pynacl python3-service_identity python3-Twisted
- python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
- python3-bcrypt python3-Pillow python3-psutil python3-msgpack
- python3-phonenumbers python3-prometheus_client python3-attrs python3-netaddr
- 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"
-checkdepends="$depends python3-parameterized unzip"
+depends="python3-jsonschema python3-frozendict 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
+ python3-psutil python3-msgpack python3-phonenumbers python3-prometheus_client
+ python3-attrs python3-netaddr python3-setuptools python3-bleach python3-Jinja2
+ python3-psycopg2 python3-lxml python3-saml2 python3-treq python3-macaroons
+ python3-sortedcontainers python3-typing_extensions python3-cryptography
+ python3-ijson python3-matrix-common python3-packaging python3-pydantic
+ python3-automat"
+checkdepends="$depends python3-parameterized python3-hiredis xmlsec1 unzip"
short_desc="Matrix reference homeserver"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
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=9dc9c530b15f44a9916de5a049eb71072261d54dfb727db7c35c77c7e5882859
+checksum=b382e86012d5d3fec194f508138ec7fa7915f5fe853fa63be5ca0dc6848de501
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
` (4 preceding siblings ...)
2022-11-10 20:35 ` TinfoilSubmarine
@ 2022-11-10 20:37 ` TinfoilSubmarine
2022-11-12 21:36 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: TinfoilSubmarine @ 2022-11-10 20:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
New comment by TinfoilSubmarine on void-packages repository
https://github.com/void-linux/void-packages/pull/40446#issuecomment-1310864918
Comment:
> Looks like you have to split [attrs](https://github.com/python-attrs/attrs/releases/tag/22.1.0)
>
> I don't know if these are getting pulled in via transitive dependencies but I noticed `unpaddedbase64` & `cryptography` mentioned in synapse's [pyproject.toml](https://github.com/matrix-org/synapse/blob/v1.71.0/pyproject.toml) which could be included in the template.
Thanks, updated both.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: synapse: update to 1.71.0.
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
` (5 preceding siblings ...)
2022-11-10 20:37 ` TinfoilSubmarine
@ 2022-11-12 21:36 ` paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-11-12 21:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2070 bytes --]
There's a merged pull request on the void-packages repository
synapse: update to 1.71.0.
https://github.com/void-linux/void-packages/pull/40446
Description:
also enable more tests
#### Testing the changes
- I tested the changes in this PR: **YES**
Had to bump several different dependencies. Here's where they need to be tested
as well:
python3-attrs:
- [x] coursera-dl
- [x] pantalaimon
- [x] pycp
- [x] pysolfc
- [x] python3-Twisted
- [x] python3-aiohttp
- [x] python3-aiohttp-sse-client
- [x] python3-aiorpcx
- [x] python3-automat
- [x] python3-gogs-client https://github.com/void-linux/void-packages/pull/40461
- [x] python3-hypothesis
- [x] python3-jsonschema
- [x] python3-matrix-common
- [x] python3-parver
- [x] python3-pytest
- [x] python3-service_identity
- [x] python3-treq
- [x] python3-trio
- [x] synapse
- [x] ueberzug
python-automat:
- [x] python-Twisted
python3-automat:
- [x] python3-Twisted
- [x] python3-txtorcon
python3-PyHamcrest (checkdepends):
- [x] python3-Twisted
- [x] rtags
python3-Twisted:
- [x] alot
- [x] deluge https://github.com/void-linux/void-packages/pull/40453
- [x] python3-TxSNI
- [x] python3-autobahn
- [x] python3-treq
- [x] python3-txredisapi
- [x] python3-txtorcon
- [x] synapse
- [x] syncplay
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-11-12 21:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-10 16:59 [PR PATCH] synapse: update to 1.71.0 TinfoilSubmarine
2022-11-10 17:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-11-10 18:56 ` icp1994
2022-11-10 20:15 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-11-10 20:32 ` TinfoilSubmarine
2022-11-10 20:35 ` TinfoilSubmarine
2022-11-10 20:37 ` TinfoilSubmarine
2022-11-12 21:36 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).