[tryton-debian-vcs] tryton-modules-party-vcarddav branch upstream updated. upstream/3.0.0-1-g8f0f3c0

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:08:17 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-party-vcarddav.git;a=commitdiff;h=upstream/3.0.0-1-g8f0f3c0

commit 8f0f3c04bdb66b60762892da50ec82eef2c41d31
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 22 14:22:18 2014 +0200

    Adding upstream version 3.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index 7d5a2bd..48784bd 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 a005001..9d9d0a6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2013 Cédric Krier.
+Copyright (C) 2009-2014 Cédric Krier.
 Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2013 B2CK SPRL.
+Copyright (C) 2009-2014 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 4ece669..20a7448 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_party_vcarddav
 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_party (http://www.tryton.org/)
  * vobject 0.8.0 or later (http://vobject.skyhouseconsulting.com/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 97a9596..51d2c2e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,9 @@
 include INSTALL
 include README
-include TODO
 include COPYRIGHT
 include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
-include *.odt
 include locale/*.po
 include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index e02ee4f..af8fb16 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_party_vcarddav
-Version: 3.0.0
+Version: 3.2.0
 Summary: Tryton module for CardDAV
 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_party_vcarddav
         ======================
         
@@ -44,6 +44,7 @@ Description: trytond_party_vcarddav
         
           http://www.tryton.org/
         
+Keywords: tryton party carddav
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
@@ -64,6 +65,5 @@ 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
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index b22de37..eef49fa 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -9,7 +9,7 @@ msgstr ""
 
 msgctxt "error:party.party:"
 msgid "The UUID of the party must be unique."
-msgstr "El UUID del tercer ha de ser únic."
+msgstr "L'UUID del tercer ha de ser únic."
 
 msgctxt "error:webdav.collection:"
 msgid ""
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0ff1a0f..f25859e 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.party:"
 msgid "The UUID of the party must be unique."
-msgstr ""
+msgstr "El UUID del tercero debe ser único."
 
 msgctxt "field:party.party,uuid:"
 msgid "UUID"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1ada398..2085f25 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -25,7 +25,7 @@ msgstr "UUID"
 
 msgctxt "field:party.party,vcard:"
 msgid "VCard"
-msgstr "VCard"
+msgstr "vCard"
 
 msgctxt "help:party.party,uuid:"
 msgid "Universally Unique Identifier"
@@ -33,4 +33,4 @@ msgstr "Identificador universal único."
 
 msgctxt "model:ir.action,name:report_party_vcard"
 msgid "VCard"
-msgstr "VCard"
+msgstr "vCard"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index cb74981..005334f 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:party.party:"
 msgid "The UUID of the party must be unique."
-msgstr "UUID stranke mora biti edinstven."
+msgstr "UUID partnerja mora biti edinstven."
 
 msgctxt "field:party.party,uuid:"
 msgid "UUID"
diff --git a/party.py b/party.py
index 2a9e860..eba6219 100644
--- a/party.py
+++ b/party.py
@@ -73,10 +73,10 @@ class Party:
         return new_parties
 
     @classmethod
-    def write(cls, parties, vals):
+    def write(cls, parties, values, *args):
         Collection = Pool().get('webdav.collection')
 
-        super(Party, cls).write(parties, vals)
+        super(Party, cls).write(parties, values, *args)
         # Restart the cache for vcard
         Collection._vcard_cache.clear()
 
diff --git a/setup.py b/setup.py
index f188b3b..a681d20 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_party_vcarddav'
+
+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 = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.8', 'python-sql']
 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_party_vcarddav',
-    version=info.get('version', '0.0.1'),
+setup(name=name,
+    version=version,
     description='Tryton module for CardDAV',
     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 party carddav',
     package_dir={'trytond.modules.party_vcarddav': '.'},
     packages=[
         'trytond.modules.party_vcarddav',
@@ -66,7 +84,6 @@ setup(name='trytond_party_vcarddav',
         'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
         ],
diff --git a/tryton.cfg b/tryton.cfg
index 802b318..c570ab3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.2.0
 depends:
     ir
     party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index b08822f..25c0e22 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-party-vcarddav
-Version: 3.0.0
+Version: 3.2.0
 Summary: Tryton module for CardDAV
 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_party_vcarddav
         ======================
         
@@ -44,6 +44,7 @@ Description: trytond_party_vcarddav
         
           http://www.tryton.org/
         
+Keywords: tryton party carddav
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
@@ -64,6 +65,5 @@ 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
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 085c9e7..98919a2 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,5 +1,5 @@
 vobject >= 0.8.0
 PyWebDAV >= 0.9.8
 python-sql
-trytond_party >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_party >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
-- 
tryton-modules-party-vcarddav



More information about the tryton-debian-vcs mailing list