Update to v1.49.0
This commit is contained in:
parent
bb78e6f97b
commit
212fb80bb2
4 changed files with 49 additions and 4 deletions
|
@ -23,7 +23,7 @@ index 271c17c22..e8a71d477 100644
|
||||||
- # with the latest security patches.
|
- # with the latest security patches.
|
||||||
- "cryptography>=3.4.7",
|
- "cryptography>=3.4.7",
|
||||||
+ "cryptography>=3.4",
|
+ "cryptography>=3.4",
|
||||||
"ijson>=3.0",
|
"ijson>=3.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
--
|
--
|
||||||
|
|
42
0002-Remove-dependency-on-non-standard-mock.patch
Normal file
42
0002-Remove-dependency-on-non-standard-mock.patch
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
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
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
%{?python_enable_dependency_generator}
|
%{?python_enable_dependency_generator}
|
||||||
|
|
||||||
Name: matrix-%{srcname}
|
Name: matrix-%{srcname}
|
||||||
Version: 1.48.0
|
Version: 1.49.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A Matrix reference homeserver written in Python using Twisted
|
Summary: A Matrix reference homeserver written in Python using Twisted
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
@ -16,13 +16,13 @@ Source1: synapse.sysconfig
|
||||||
Source2: synapse.service
|
Source2: synapse.service
|
||||||
# non-upstreamable patch to accept any version of python-cryptography, see RHBZ#1978949
|
# non-upstreamable patch to accept any version of python-cryptography, see RHBZ#1978949
|
||||||
Patch1: 0001-relax-cryptography-dependency-version-requirement.patch
|
Patch1: 0001-relax-cryptography-dependency-version-requirement.patch
|
||||||
|
Patch2: 0002-Remove-dependency-on-non-standard-mock.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
|
|
||||||
# Test dependencies
|
# Test dependencies
|
||||||
BuildRequires: python3-mock >= 2.0
|
|
||||||
BuildRequires: python3-parameterized >= 0.7.0
|
BuildRequires: python3-parameterized >= 0.7.0
|
||||||
BuildRequires: /usr/bin/openssl
|
BuildRequires: /usr/bin/openssl
|
||||||
|
|
||||||
|
@ -140,6 +140,9 @@ exit 0
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 14 2021 Kai A. Hiller <V02460@gmail.com> - 1.49.0-1
|
||||||
|
- Update to v1.49.0
|
||||||
|
|
||||||
* Tue Nov 30 2021 Kai A. Hiller <V02460@gmail.com> - 1.48.0-1
|
* Tue Nov 30 2021 Kai A. Hiller <V02460@gmail.com> - 1.48.0-1
|
||||||
- Update to v1.48.0
|
- Update to v1.48.0
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (synapse-1.48.0.tar.gz) = d7005258f75d415c2172fba0842f9e7d493228d854af6de39a2e0e46e28ca19dd5542327e81e3f93082216f629b7b57e070fc4e36cf9c511688127e75aaae95b
|
SHA512 (synapse-1.49.0.tar.gz) = 461b769d3beda3c876394bfab499db71f20e406c03a25b1715621c6d9c837aa82618da1f54161a7a9975a56bde51f90d6ab7ab093512485a834df144a290fa3d
|
||||||
|
|
Loading…
Reference in a new issue