[tryton-debian-vcs] tryton-modules-ldap-authentication branch upstream updated. upstream/3.0.0-1-g6e74da4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:07:51 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-ldap-authentication.git;a=commitdiff;h=upstream/3.0.0-1-g6e74da4
commit 6e74da4a55b43c3a4a61f5aac7f49720e6809632
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:22:05 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index b661834..8f03a85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 86ba1bd..c7afa3f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2006-2013 Cédric Krier.
+Copyright (C) 2006-2014 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2013 B2CK SPRL.
+Copyright (C) 2009-2014 B2CK SPRL.
Copyright (C) 2008-2012 Udo Spallek.
Copyright (C) 2008-2011 virtual things.
diff --git a/INSTALL b/INSTALL
index e3de39e..1a63572 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_ldap_authentication
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_ldap_connection (http://www.tryton.org/)
* python-ldap (http://python-ldap.sourceforge.net/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 2569955..e013c00 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,12 +1,10 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
include locale/*.po
include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 961beed..e3e4adf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_ldap_authentication
===========================
@@ -43,6 +43,7 @@ Description: trytond_ldap_authentication
http://www.tryton.org/
+Keywords: tryton ldap authentication
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,7 +63,6 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 8783db4..d952d54 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ 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 "No podeu establir la contrasenya de l'usuari \"%s\" d'ldap."
+msgstr "No podeu canviar la contrasenya de l'usuari \"%s\" d'LDAP."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
@@ -28,15 +28,15 @@ msgstr "UID"
msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
-msgstr "DN base per a l'autenticació"
+msgstr "DN base per a l'autenticació."
msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
-msgstr "Crea l'usuari si no existeix a la base de dades"
+msgstr "Crea l'usuari si no existeix a la base de dades."
msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
-msgstr "Atribut UID per a l'autenticació"
+msgstr "Atribut UID per a l'autenticació."
msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 43c8e4a..e36d68f 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -12,7 +12,7 @@ msgstr "DN base"
msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 726478c..528af21 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ 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 "No puede establecer la contraseña del usuario \"%s\" de ldap."
+msgstr "No puede cambiar la contraseña del usuario \"%s\" de LDAP."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
diff --git a/res.py b/res.py
index a9131c8..33e1c0d 100644
--- a/res.py
+++ b/res.py
@@ -78,11 +78,13 @@ class User:
return super(User, cls).create(vlist)
@classmethod
- def write(cls, users, values):
- if values.get('password'):
- logins = [x.login for x in users]
- cls._check_passwd_ldap_user(logins)
- super(User, cls).write(users, values)
+ def write(cls, *args):
+ actions = iter(args)
+ for users, values in zip(actions, actions):
+ if values.get('password'):
+ logins = [x.login for x in users]
+ cls._check_passwd_ldap_user(logins)
+ super(User, cls).write(*args)
@classmethod
def set_preferences(cls, values, old_password=False):
diff --git a/setup.py b/setup.py
index d1e9b98..a5cfec1 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_ldap_authentication'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = ['python-ldap']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-setup(name='trytond_ldap_authentication',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to authenticate users through LDAP',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton ldap authentication',
package_dir={'trytond.modules.ldap_authentication': '.'},
packages=[
'trytond.modules.ldap_authentication',
@@ -66,7 +84,6 @@ setup(name='trytond_ldap_authentication',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
('Topic :: System :: Systems Administration '
diff --git a/tests/test_ldap_authentication.py b/tests/test_ldap_authentication.py
index 34a1557..b5dd1f6 100644
--- a/tests/test_ldap_authentication.py
+++ b/tests/test_ldap_authentication.py
@@ -1,37 +1,22 @@
-#!/usr/bin/env python
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-
-import sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import unittest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view, test_depends
class LDAPAuthenticationTestCase(unittest.TestCase):
- '''
- Test LDAPAuthentication module.
- '''
+ 'Test LDAPAuthentication module'
def setUp(self):
trytond.tests.test_tryton.install_module('ldap_authentication')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('ldap_authentication')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
LDAPAuthenticationTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 1f8c8ad..d81c542 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
ir
ldap_connection
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index ad11540..1a7676f 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.0.0
+Version: 3.2.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_ldap_authentication
===========================
@@ -43,6 +43,7 @@ Description: trytond_ldap_authentication
http://www.tryton.org/
+Keywords: tryton ldap authentication
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,7 +63,6 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index fa0fbc9..8a3f7e3 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_ldap_connection >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-ldap-authentication
More information about the tryton-debian-vcs
mailing list