[tryton-debian-vcs] tryton-modules-ldap-authentication branch debian updated. debian/3.8.0-2-5-g261c053
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:19:54 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=debian/3.8.0-2-5-g261c053
commit 261c05320775b5cf0882f24a44242c1de4f3cdf0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:23 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 9369cae..95be6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-ldap-authentication (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:28:58 +0200
+
tryton-modules-ldap-authentication (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 22429d33f3658ebe9bc338e3b393b0f60e181351
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 64734b2..e11b63b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2006-2015 Cédric Krier
+Copyright: 2006-2016 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2015 B2CK SPRL
+ 2009-2016 B2CK SPRL
2008-2012 Udo Spallek
2008-2011 virtual things
License: GPL-3+
@@ -11,7 +11,7 @@ License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit f1fa7282a61bccc488a0135eda37ac2f81d00a7f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:23 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 28a2d98..5d97560 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index bff4ff7..112c748 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index a28cfa2..ecc1a7e 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
-msgstr ""
+msgstr "ທ່ານບໍ່ສາມາດກຳນົດລະຫັດຜ່ານ ໃຫ້ກັບຜູ້ໃຊ້ງານ \"%s\" ນີ້ໄດ້."
diff --git a/tryton.cfg b/tryton.cfg
index dc77d03..e6a46b1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
res
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 4697b96..ae7129d 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-ldap-authentication
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index ff64957..c31a8a6 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -22,11 +22,13 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/test_ldap_authentication.py
doc/index.rst
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index d07fddf..39ad98e 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 6aaf243e36532f5b3c6335cf5049e4f4d78b88be
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:05 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 24941a8..28a2d98 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 1e8c07c..458b81c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2015 Cédric Krier.
+Copyright (C) 2006-2016 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-2016 B2CK SPRL.
Copyright (C) 2008-2012 Udo Spallek.
Copyright (C) 2008-2011 virtual things.
diff --git a/PKG-INFO b/PKG-INFO
index f98ff56..bff4ff7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_ldap_authentication
===========================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..a28cfa2
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..a28cfa2
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:res.user:"
+msgid "You can not set the password of ldap user \"%s\"."
+msgstr ""
diff --git a/setup.py b/setup.py
index 05252ec..c09cd96 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ if minor_version % 2:
requires = ['python-ldap']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -77,6 +77,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
index 222459e..740b7ed 100644
--- a/tests/test_ldap_authentication.py
+++ b/tests/test_ldap_authentication.py
@@ -6,10 +6,9 @@ from mock import patch
import ldap
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
from trytond.config import config
+from trytond.pool import Pool
from trytond.modules.ldap_authentication.res import parse_ldap_url
@@ -28,43 +27,45 @@ class LDAPAuthenticationTestCase(ModuleTestCase):
def tearDown(self):
config.remove_section(section)
+ @with_transaction()
def test_user_get_login(self):
'Test User.get_login'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- User = POOL.get('res.user')
-
- @patch.object(ldap, 'initialize')
- @patch.object(User, 'ldap_search_user')
- def get_login(login, password, find, ldap_search_user, initialize):
- con = initialize.return_value
- con.simple_bind_s.return_value = True
- if find:
- ldap_search_user.return_value = [('dn', {'uid': [find]})]
- else:
- ldap_search_user.return_value = None
- return User.get_login(login, password)
-
- # Test existing user
- self.assertEqual(get_login('admin', 'admin', None), USER)
- self.assertEqual(get_login('admin', 'admin', 'admin'), USER)
- self.assertEqual(get_login('AdMiN', 'admin', 'admin'), USER)
-
- # Test new user
- self.assertFalse(get_login('foo', 'bar', None))
- self.assertFalse(get_login('foo', 'bar', 'foo'))
-
- # Test create new user
- config.set(section, 'create_user', 'True')
- user_id = get_login('foo', 'bar', 'foo')
- foo, = User.search([('login', '=', 'foo')])
- self.assertEqual(user_id, foo.id)
- self.assertEqual(foo.name, 'foo')
-
- # Test create new user with different case
- user_id = get_login('BaR', 'foo', 'bar')
- bar, = User.search([('login', '=', 'bar')])
- self.assertEqual(user_id, bar.id)
- self.assertEqual(bar.name, 'bar')
+ pool = Pool()
+ User = pool.get('res.user')
+
+ @patch.object(ldap, 'initialize')
+ @patch.object(User, 'ldap_search_user')
+ def get_login(login, password, find, ldap_search_user, initialize):
+ con = initialize.return_value
+ con.simple_bind_s.return_value = True
+ if find:
+ ldap_search_user.return_value = [('dn', {'uid': [find]})]
+ else:
+ ldap_search_user.return_value = None
+ return User.get_login(login, password)
+
+ # Test existing user
+ user, = User.search([('login', '=', 'admin')])
+ self.assertEqual(get_login('admin', 'admin', None), user.id)
+ self.assertEqual(get_login('admin', 'admin', 'admin'), user.id)
+ self.assertEqual(get_login('AdMiN', 'admin', 'admin'), user.id)
+
+ # Test new user
+ self.assertFalse(get_login('foo', 'bar', None))
+ self.assertFalse(get_login('foo', 'bar', 'foo'))
+
+ # Test create new user
+ config.set(section, 'create_user', 'True')
+ user_id = get_login('foo', 'bar', 'foo')
+ foo, = User.search([('login', '=', 'foo')])
+ self.assertEqual(user_id, foo.id)
+ self.assertEqual(foo.name, 'foo')
+
+ # Test create new user with different case
+ user_id = get_login('BaR', 'foo', 'bar')
+ bar, = User.search([('login', '=', 'bar')])
+ self.assertEqual(user_id, bar.id)
+ self.assertEqual(bar.name, 'bar')
def test_parse_ldap_url(self):
'Test parse_ldap_url'
diff --git a/tryton.cfg b/tryton.cfg
index fe0a696..dc77d03 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
res
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 1219737..4697b96 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-ldap-authentication
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_ldap_authentication
===========================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index 955d096..ff64957 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -43,11 +43,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_ldap_authentication.egg-info/PKG-INFO
trytond_ldap_authentication.egg-info/SOURCES.txt
trytond_ldap_authentication.egg-info/dependency_links.txt
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index db8028b..d07fddf 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,2 +1,2 @@
python-ldap
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-ldap-authentication
More information about the tryton-debian-vcs
mailing list