From 0d22f923cc2debfb4cb29a2b3790831c6d3cec8c Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 12 Apr 2022 11:04:22 -0400 Subject: [PATCH 1/2] python3-signedjson: update to 1.1.4. --- .../patches/importlib_metadata.patch | 39 ------------------- srcpkgs/python3-signedjson/template | 4 +- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch deleted file mode 100644 index d7553958cc15..000000000000 --- a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001 -From: MeggyCal -Date: Tue, 21 Apr 2020 18:55:37 +0200 -Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9) - ---- - setup.py | 2 +- - signedjson/__init__.py | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9c09760..c1cc299 100755 ---- a/setup.py -+++ b/setup.py -@@ -41,7 +41,7 @@ def read_file(path_segments): - "pynacl>=0.3.0", - "typing_extensions>=3.5", - 'typing>=3.5;python_version<"3.5"', -- "importlib_metadata", -+ 'importlib_metadata;python_version<"3.8"', - ], - long_description=read_file(("README.rst",)), - keywords="json", -diff --git a/signedjson/__init__.py b/signedjson/__init__.py -index 6641e64..62faa5e 100644 ---- a/signedjson/__init__.py -+++ b/signedjson/__init__.py -@@ -12,7 +12,10 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --from importlib_metadata import version, PackageNotFoundError -+try: -+ from importlib.metadata import version, PackageNotFoundError -+except ImportError: # pragma: nocover -+ from importlib_metadata import version, PackageNotFoundError - - try: - __version__ = version(__name__) diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template index bf9a8ddc1255..8acbaa32ab11 100644 --- a/srcpkgs/python3-signedjson/template +++ b/srcpkgs/python3-signedjson/template @@ -1,6 +1,6 @@ # Template file for 'python3-signedjson' pkgname=python3-signedjson -version=1.1.1 +version=1.1.4 revision=1 wrksrc="signedjson-${version}" build_style=python3-module @@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer " license="Apache-2.0" homepage="https://github.com/matrix-org/python-signedjson" distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz" -checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009 +checksum=cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492 From 6e0adea53a45023d8844b5c7e2517658b5e45222 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 12 Apr 2022 11:02:53 -0400 Subject: [PATCH 2/2] synapse: update to 1.57.0. --- srcpkgs/synapse/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 984ad56e0a8a..22ad01847677 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,6 +1,6 @@ # Template file for 'synapse' pkgname=synapse -version=1.56.0 +version=1.57.0 revision=1 build_style=python3-module make_check_target=tests @@ -21,7 +21,7 @@ license="Apache-2.0" homepage="https://github.com/matrix-org/synapse" changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md" distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz" -checksum=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373 +checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a system_accounts="synapse" synapse_homedir="/var/lib/synapse"