Hello community,
here is the log from the commit of package python-matrix-synapse-ldap3 for
openSUSE:Leap:15.2 checked in at 2020-03-09 18:08:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-matrix-synapse-ldap3 (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-matrix-synapse-ldap3.new.26092
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-matrix-synapse-ldap3"
Mon Mar 9 18:08:40 2020 rev:11 rq:776786 version:0.1.4
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/python-matrix-synapse-ldap3/python-matrix-synapse-ldap3.changes
2020-01-15 15:50:33.575498728 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-matrix-synapse-ldap3.new.26092/python-matrix-synapse-ldap3.changes
2020-03-09 18:08:40.736965530 +0100
@@ -1,0 +2,21 @@
+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
+
+-------------------------------------------------------------------
+Tue Nov 5 09:09:25 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Add patch to fix py3 testsuite execution:
+ * py3compat.patch
+- Disable python3 package as the thing can't work with py3
+
+-------------------------------------------------------------------
+Wed Sep 11 13:22:08 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 0.1.3:
+ * various bugfixes
+- Enable tests (fail with py3)
+
+-------------------------------------------------------------------
Old:
----
_service
python-matrix-synapse-ldap3-0.1.2.tar.gz
New:
----
matrix-synapse-ldap3-0.1.4.tar.gz
py3compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-matrix-synapse-ldap3.spec ++++++
--- /var/tmp/diff_new_pack.hiPs5C/_old 2020-03-09 18:08:41.008965919 +0100
+++ /var/tmp/diff_new_pack.hiPs5C/_new 2020-03-09 18:08:41.012965925 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-matrix-synapse-ldap3
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,34 +12,39 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-
+# 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.2
+Version: 0.1.4
Release: 0
-License: Apache-2.0
Summary: An LDAP3 auth provider for Synapse
-Url: https://github.com/%{github_user}/%{short_name}
-Group: Development/Languages/Python
-Source:
https://github.com/%{github_user}/%{short_name}/archive/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires: %{python_module base}
+License: Apache-2.0
+URL: https://github.com/matrix-org/matrix-synapse-ldap3
+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}
+BuildRequires: %{python_module service_identity}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-BuildRequires: %{python_module Twisted}
-BuildRequires: %{python_module ldap3}
-BuildRequires: %{python_module pydenticon}
-Requires: python-Twisted
-Requires: python-ldap3
+Requires: python-Twisted >= 15.1
+Requires: python-ldap3 >= 0.9.5
Requires: python-pydenticon
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: python-service_identity
BuildArch: noarch
-
%python_subpackages
%description
@@ -49,17 +54,21 @@
%prep
%setup -q -n %{short_name}-%{version}
+%patch0 -p1
%build
%python_build
%install
%python_install
-%fdupes %{buildroot}%{_prefix}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
+
+%check
+%python_exec setup.py test
%files %{python_files}
-%defattr(-,root,root,-)
-%doc LICENSE README.rst
+%license LICENSE
+%doc README.rst
%{python_sitelib}/*
%changelog
++++++ py3compat.patch ++++++
>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 as BytesIO
+except ImportError:
+ 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)
