Hello community,
here is the log from the commit of package python-matrix-synapse-ldap3 for
openSUSE:Factory checked in at 2020-01-31 23:55:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-matrix-synapse-ldap3 (Old)
and /work/SRC/openSUSE:Factory/.python-matrix-synapse-ldap3.new.26092
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-matrix-synapse-ldap3"
Fri Jan 31 23:55:29 2020 rev:3 rq:768544 version:0.1.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-matrix-synapse-ldap3/python-matrix-synapse-ldap3.changes
2019-11-27 13:51:44.452449835 +0100
+++
/work/SRC/openSUSE:Factory/.python-matrix-synapse-ldap3.new.26092/python-matrix-synapse-ldap3.changes
2020-01-31 23:56:19.623621614 +0100
@@ -1,0 +2,7 @@
+Wed Jan 29 13:43:29 UTC 2020 - Stasiek Michalski <[email protected]>
+
+- Update to 0.1.4
+- Fix the tests for py3 further (patch submitted upstream)
+- Only build for py3, since upstream marked this as py3 compatible
+
+-------------------------------------------------------------------
Old:
----
python-matrix-synapse-ldap3-0.1.3.tar.gz
New:
----
matrix-synapse-ldap3-0.1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-matrix-synapse-ldap3.spec ++++++
--- /var/tmp/diff_new_pack.OVy2xr/_old 2020-01-31 23:56:20.811622229 +0100
+++ /var/tmp/diff_new_pack.OVy2xr/_new 2020-01-31 23:56:20.815622231 +0100
@@ -17,20 +17,22 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python3 1
+# There is no longer python2-matrix-synapse, skip python2
+%define skip_python2 1
%define github_user matrix-org
%define short_name matrix-synapse-ldap3
Name: python-%{short_name}
-Version: 0.1.3
+Version: 0.1.4
Release: 0
Summary: An LDAP3 auth provider for Synapse
License: Apache-2.0
URL: https://github.com/matrix-org/matrix-synapse-ldap3
-Source:
https://github.com/%{github_user}/%{short_name}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source:
https://github.com/%{github_user}/%{short_name}/archive/v%{version}/%{short_name}-%{version}.tar.gz
# https://github.com/matrix-org/matrix-synapse-ldap3/issues/73
Patch0: py3compat.patch
BuildRequires: %{python_module Twisted >= 15.1}
BuildRequires: %{python_module ldap3 >= 0.9.5}
+BuildRequires: %{python_module matrix-synapse}
BuildRequires: %{python_module ldaptor}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pydenticon}
++++++ py3compat.patch ++++++
--- /var/tmp/diff_new_pack.OVy2xr/_old 2020-01-31 23:56:20.827622237 +0100
+++ /var/tmp/diff_new_pack.OVy2xr/_new 2020-01-31 23:56:20.827622237 +0100
@@ -1,16 +1,40 @@
-Index: matrix-synapse-ldap3-0.1.3/tests/__init__.py
-===================================================================
---- matrix-synapse-ldap3-0.1.3.orig/tests/__init__.py
-+++ matrix-synapse-ldap3-0.1.3/tests/__init__.py
-@@ -5,7 +5,10 @@ from twisted.python.components import re
+From da7389b0dda73db54c9614e7f5ae9cecb4b2d19a Mon Sep 17 00:00:00 2001
+From: Stasiek Michalski <[email protected]>
+Date: Wed, 29 Jan 2020 14:34:50 +0100
+Subject: [PATCH] Fix tests on Python 3
+
+---
+ tests/__init__.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/__init__.py b/tests/__init__.py
+index e9e8987..111d651 100644
+--- a/tests/__init__.py
++++ b/tests/__init__.py
+@@ -5,12 +5,15 @@
from ldaptor.inmemory import fromLDIFFile
from ldaptor.interfaces import IConnectedLDAPEntry
from ldaptor.protocols.ldap.ldapserver import LDAPServer
-from cStringIO import StringIO
+try:
-+ from cStringIO import StringIO
++ from cStringIO import StringIO as BytesIO
+except ImportError:
-+ from io import StringIO
++ from io import BytesIO
from ldap_auth_provider import LdapAuthProvider
+
+-LDIF = """\
++LDIF = b"""\
+ dn: dc=org
+ dc: org
+ objectClass: dcObject
+@@ -51,7 +54,7 @@
+
+ @defer.inlineCallbacks
+ def _create_db():
+- f = StringIO(LDIF)
++ f = BytesIO(LDIF)
+ db = yield fromLDIFFile(f)
+ f.close()
+ defer.returnValue(db)
