alex/copr-matrix-synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update to v1.51.0

Browse source
This commit is contained in:
Kai A. Hiller 2022-01-27 03:53:20 +01:00
parent a53ed73b6c
commit 6132902215
4 changed files with 12 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
0001-relax-cryptography-dependency-version-requirement.patch
View file

@ -1,4 +1,4 @@
From 4bdcf996757a5d13df63f7891a1dd4c7186c20dc Mon Sep 17 00:00:00 2001
From 3a65f800f75e11bd9c3a7db167644f9ebec444c1 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <djc@djc.id.au>
Date: Sun, 18 Jul 2021 13:18:10 +1000
Subject: [PATCH] relax cryptography dependency version requirement
@ -12,10 +12,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1978949
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 271c17c22..e8a71d477 100644
index d844fbb3b3..277bd043a9 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -82,9 +82,7 @@
@@ -84,9 +84,7 @@ REQUIREMENTS = [
"Jinja2>=2.9",
"bleach>=1.4.3",
"typing-extensions>=3.7.4",
@ -24,8 +24,8 @@ index 271c17c22..e8a71d477 100644
- "cryptography>=3.4.7",
+ "cryptography>=3.4",
"ijson>=3.1",
"matrix-common==1.0.0",
]
--
2.31.1
2.34.1

42
0002-Remove-dependency-on-non-standard-mock.patch
View file

@ -1,42 +0,0 @@
From 1b7558ed4060acd4ca34a88c7b14ce7da2baab13 Mon Sep 17 00:00:00 2001
From: "Kai A. Hiller" <V02460@gmail.com>
Date: Tue, 14 Dec 2021 18:16:37 +0100
Subject: [PATCH] Remove dependency on non-standard mock
---
setup.py | 4 +---
tests/storage/test_background_update.py | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index 2c6fb9aac..bfca16727 100755
--- a/setup.py
+++ b/setup.py
@@ -119,9 +119,7 @@ CONDITIONAL_REQUIREMENTS["mypy"] = [
# Tests assume that all optional dependencies are installed.
#
# parameterized_class decorator was introduced in parameterized 0.7.0
-#
-# We use `mock` library as that backports `AsyncMock` to Python 3.6
-CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0", "mock>=4.0.0"]
+CONDITIONAL_REQUIREMENTS["test"] = ["parameterized>=0.7.0"]
CONDITIONAL_REQUIREMENTS["dev"] = (
CONDITIONAL_REQUIREMENTS["lint"]
diff --git a/tests/storage/test_background_update.py b/tests/storage/test_background_update.py
index d77c00150..542b70a1e 100644
--- a/tests/storage/test_background_update.py
+++ b/tests/storage/test_background_update.py
@@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Use backported mock for AsyncMock support on Python 3.6.
-from mock import Mock
+from unittest.mock import Mock
from twisted.internet.defer import Deferred, ensureDeferred
--
2.33.1

9
matrix-synapse.spec
View file

@ -6,8 +6,8 @@
%{?python_enable_dependency_generator}
Name: matrix-%{srcname}
Version: 1.49.2
Release: 2%{?dist}
Version: 1.51.0
Release: 1%{?dist}
Summary: A Matrix reference homeserver written in Python using Twisted
License: ASL 2.0
URL: https://github.com/matrix-org/%{srcname}
@ -16,7 +16,6 @@ Source1: synapse.sysconfig
Source2: synapse.service
# non-upstreamable patch to accept any version of python-cryptography, see RHBZ#1978949
Patch1: 0001-relax-cryptography-dependency-version-requirement.patch
Patch2: 0002-Remove-dependency-on-non-standard-mock.patch
BuildArch: noarch
BuildRequires: python3-devel
@ -43,6 +42,7 @@ BuildRequires: python3-jinja2 >= 2.9
BuildRequires: python3-jsonschema
BuildRequires: python3-jwt
BuildRequires: python3-lxml >= 3.5.0
BuildRequires: python3-matrix-common
BuildRequires: python3-matrix-synapse-ldap3 >= 0.1
BuildRequires: python3-msgpack >= 0.5.2
BuildRequires: python3-netaddr >= 0.7.18
@ -140,6 +140,9 @@ exit 0
%changelog
* Thu Jan 27 2022 Kai A. Hiller <V02460@gmail.com> - 1.51.0-1
- Update to v1.51.0
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.49.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

2
sources
View file

@ -1 +1 @@
SHA512 (synapse-1.49.2.tar.gz) = dbeb0178628d9e7f4077d89674727582b08f039b1b4b5a2f9ce12ebf36535bbdd78bf5e51c80b0219ce5fb72c4811a4a3f8ce3eda4e4a4a1e0ee8bd26fcf2af9
SHA512 (synapse-1.51.0.tar.gz) = 52b96c4ee74894934fdaf683c8a3f0e9f4d6eb227ad916d94aaefd878c70cdc4fc0edbf44082dcbd5de5930fe279501207614a2bd6c28e2b2c64425ce74f137a