Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 55 insertions, 58 deletions

diff --git a/python3-matrix-nio/.footprint b/python3-matrix-nio/.footprint
index 5fe7b0633..cc15d5152 100644
--- a/python3-matrix-nio/.footprint
+++ b/python3-matrix-nio/.footprint
@@ -2,51 +2,50 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0.dist-info/LICENSE.md
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix_nio-0.19.0.dist-info/WHEEL
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/_compat.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/api.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/exceptions.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/http.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/log.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/monitors.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/responses.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/rooms.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/schemas.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/_compat.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/api.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/exceptions.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/http.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/log.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/monitors.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/responses.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/rooms.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/__pycache__/schemas.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/_compat.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/api.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/client/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/async_client.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/base_client.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/http_client.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/async_client.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/base_client.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/__pycache__/http_client.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/async_client.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/base_client.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/client/http_client.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/crypto/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/async_attachments.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/attachments.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/device.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/key_export.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/key_request.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/log.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/memorystores.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/olm_machine.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/sas.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/sessions.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/async_attachments.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/attachments.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/device.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/key_export.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/key_request.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/log.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/memorystores.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/olm_machine.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/sas.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/sessions.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/async_attachments.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/attachments.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/crypto/device.py
@@ -60,25 +59,25 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/crypto/__pycache__/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/event_builders/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/direct_messages.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/event_builder.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/state_events.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/direct_messages.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/event_builder.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/__pycache__/state_events.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/direct_messages.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/event_builder.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/event_builders/state_events.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/events/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/account_data.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/common.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/ephemeral.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/invite_events.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/misc.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/presence.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/room_events.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/to_device.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/account_data.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/common.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/ephemeral.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/invite_events.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/misc.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/presence.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/room_events.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/to_device.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/account_data.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/common.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/events/ephemeral.py
@@ -97,11 +96,11 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/events/__pycache__/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/store/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/database.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/file_trustdb.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/log.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/models.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/database.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/file_trustdb.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/log.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/__pycache__/models.cpython-310.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/database.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/file_trustdb.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/nio/store/log.py
diff --git a/python3-matrix-nio/.signature b/python3-matrix-nio/.signature
index 8a83a8881..4cca36b60 100644
--- a/python3-matrix-nio/.signature
+++ b/python3-matrix-nio/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31qjLl1dAeQIYFLWpX7W/pxw9t8v/so54Ra7HPNq35t2JB/kNUxM7GbBVd2KHFg+WkxuwHFBVQGLeQfUC/D1IwI=
-SHA256 (Pkgfile) = 68166aa9ca9cdb942dc1b2ec3faf2275841f554ac0ca24cfd6d2e223cf249d43
-SHA256 (.footprint) = 83df0278ddcbbf87ccfaac11a3020b82f2ae7adb85d3b9fd0081dca707932227
+RWSagIOpLGJF38ynguisrtkA1J/6yb+5n5RiJTlCCdo6U0rJ8knWoVtwAo8u83iCHMhiN6ZqhERLRR5Qd43mzAqyi3YoIuz78Qo=
+SHA256 (Pkgfile) = 9953e33289f8ec703a1a5b8ec503e8a129c3f962989ac1c5b62f4e14eebc71f3
+SHA256 (.footprint) = 4a0ad486238326353681ea506eaafc99f50b2d89d03f9a6f4ff149feaf4f67f8
 SHA256 (python3-matrix-nio-0.19.0.tar.gz) = 4fa242dad1fa7e84ddc95e7f2f7faac5b48cf45a32c7e4dba6dd60fcec9664d9
diff --git a/python3-matrix-nio/Pkgfile b/python3-matrix-nio/Pkgfile
index 87c54064a..171b3b76d 100644
--- a/python3-matrix-nio/Pkgfile
+++ b/python3-matrix-nio/Pkgfile
@@ -5,14 +5,12 @@
 
 name=python3-matrix-nio
 version=0.19.0
-release=1
+release=2
 source=(https://github.com/poljar/matrix-nio/archive/$version/$name-$version.tar.gz)
 
 build() {
   cd matrix-nio-$version
-  dephell deps convert --from pyproject.toml --to setup.py
-  /usr/bin/python3 setup.py build
-  /usr/bin/python3 setup.py install --prefix=/usr \
-    --root=$PKG \
-    --skip-build
+
+  /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
+  /usr/bin/python3 -m install --optimize=1 --destdir=$PKG dist/*.whl
 }