[arch-commits] Commit in matrix-synapse/trunk (PKGBUILD use-mock-from-unittest.patch)

[Alexander Epaneshnikov]

    Date: Wednesday, December 15, 2021 @ 11:03:31
  Author: alex19ep
Revision: 1072962

upgpkg: matrix-synapse 1.49.0-1 upstream release

Added:
  matrix-synapse/trunk/use-mock-from-unittest.patch
Modified:
  matrix-synapse/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   17 ++++++++++++-----
 use-mock-from-unittest.patch |   14 ++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-15 10:17:18 UTC (rev 1072961)
+++ PKGBUILD	2021-12-15 11:03:31 UTC (rev 1072962)
@@ -3,8 +3,8 @@
 # Contributor: Ivan Shapovalov <intelfx at intelfx.name>
 
 pkgname=matrix-synapse
-pkgver=1.48.0
-pkgrel=2
+pkgver=1.49.0
+pkgrel=1
 pkgdesc="Matrix reference homeserver"
 url="https://github.com/matrix-org/synapse"
 arch=('any')
@@ -37,8 +37,9 @@
         'synapse-worker at .service'
         'sysusers-synapse.conf'
         'tmpfiles-synapse.conf'
-        'override-hardened.conf')
-sha256sums=('182facc856f8d0c0d2d0dd4105fae4f851297167c0ee95c202a3aad9ed86c486'
+        'override-hardened.conf'
+        'use-mock-from-unittest.patch')
+sha256sums=('3c1b73eb36ec3af00868707b929f9b9d1faae9ccc4022c2c46bdb025ef0ead8e'
             'f67334856609997eac26939d77cfc520e78e98d3755543ab730d83a0f362a35e'
             '74af0bc2f57e5ced1a44f2438922d420cbb7defedae784cac02ef125f276a2ed'
             '408527271e1250beb20531f140b91201ed464e42f7eb3f47f02967a2ac23a661'
@@ -45,10 +46,16 @@
             'c9657c201ad89985c8c915bfa0ea7517a412071736b4d9545d8f6474fddc44e2'
             'aadfdd78fe73e6eb325ee4299b8db8b97bfa2f4e7df953aa8477f442598a7ec5'
             '65588c8c64dfb84cab831cd8d028a295d753cf7322dd63053e8488466047b45f'
-            'd8e6b2a43a8a7d8f09c643f32e789a7ffeeb2d20bb07ee88ddc6923e1ab3b0e6')
+            'd8e6b2a43a8a7d8f09c643f32e789a7ffeeb2d20bb07ee88ddc6923e1ab3b0e6'
+            '84b5e9b32ace497f40d0facd27eec3552924a8384130cb70caa9b0db9a13de3c')
 backup=('etc/synapse/log_config.yaml')
 install=synapse.install
 
+prepare() {
+	cd synapse-$pkgver
+	patch -Np1 -i ../use-mock-from-unittest.patch
+}
+
 build() {
 	cd synapse-$pkgver
 	python setup.py build

Added: use-mock-from-unittest.patch
===================================================================
--- use-mock-from-unittest.patch	                        (rev 0)
+++ use-mock-from-unittest.patch	2021-12-15 11:03:31 UTC (rev 1072962)
@@ -0,0 +1,14 @@
+diff --git a/tests/storage/test_background_update.py b/tests/storage/test_background_update.py
+index d77c001506c..542b70a1ee6 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
+