[tryton-debian-vcs] tryton-modules-calendar-classification branch debian updated. debian/3.0.0-3-4-g7f6f5d5
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:06:39 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-classification.git;a=commitdiff;h=debian/3.0.0-3-4-g7f6f5d5
commit 7f6f5d5916d651754b1431bc27a90677cfbc7e65
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:47 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index a282d1a..3ff31a6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tryton/tryton-modules-calendar-classification.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-calendar-classification.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-calendar-classification
Architecture: all
commit d902252a78ef615b4feea559a87a9c1db7bfe9db
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:45:49 2014 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 7c28aff..f7db076 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: 2009-2013 Cédric Krier
+Copyright: 2009-2014 Cédric Krier
2009-2012 Bertrand Chenal
- 2009-2013 B2CK SPRL
+ 2009-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit b1d4e2151f5acc7dc084ea3380c40c981fa0d87e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:21:27 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8376d07..468af02 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 39f9196..4949045 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-2012 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 dc5fe4e..0c4c828 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_calendar
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_calendar (http://www.tryton.org/)
* vobject >= 0.8.0 (http://vobject.skyhouseconsulting.com/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7..f858323 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,8 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
-include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 8a69a7d..2cdcc3a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_classification
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add classification access to events
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_calendar_classification
===============================
@@ -44,6 +44,7 @@ Description: trytond_calendar_classification
http://www.tryton.org/
+Keywords: tryton calendar caldav classification
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,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/calendar_.py b/calendar_.py
index bef4230..16a6371 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -125,14 +125,16 @@ class Event:
return res
@classmethod
- def write(cls, events, values):
- if len(set(events)) != cls.search([('id', 'in', map(int, events))],
- count=True):
- cls.raise_user_error('access_error', cls.__doc__)
- super(Event, cls).write(events, values)
- if len(set(events)) != cls.search([('id', 'in', map(int, events))],
- count=True):
- cls.raise_user_error('access_error', cls.__doc__)
+ def write(cls, *args):
+ for events in args[::2]:
+ if len(set(events)) != cls.search([('id', 'in', map(int, events))],
+ count=True):
+ cls.raise_user_error('access_error', cls.__doc__)
+ super(Event, cls).write(*args)
+ for events in args[::2]:
+ if len(set(events)) != cls.search([('id', 'in', map(int, events))],
+ count=True):
+ cls.raise_user_error('access_error', cls.__doc__)
@classmethod
def delete(cls, events):
diff --git a/setup.py b/setup.py
index 7467f5c..6f6baee 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_calendar_classification'
+
+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']
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_calendar_classification',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to add classification access to events',
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 calendar caldav classification',
package_dir={'trytond.modules.calendar_classification': '.'},
packages=[
'trytond.modules.calendar_classification',
@@ -65,7 +83,6 @@ setup(name='trytond_calendar_classification',
'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 484a029..02265fe 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
calendar
ir
diff --git a/trytond_calendar_classification.egg-info/PKG-INFO b/trytond_calendar_classification.egg-info/PKG-INFO
index e7abb11..f8c5917 100644
--- a/trytond_calendar_classification.egg-info/PKG-INFO
+++ b/trytond_calendar_classification.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-calendar-classification
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add classification access to events
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_calendar_classification
===============================
@@ -44,6 +44,7 @@ Description: trytond_calendar_classification
http://www.tryton.org/
+Keywords: tryton calendar caldav classification
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,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_calendar_classification.egg-info/requires.txt b/trytond_calendar_classification.egg-info/requires.txt
index b9ade18..b3a32ff 100644
--- a/trytond_calendar_classification.egg-info/requires.txt
+++ b/trytond_calendar_classification.egg-info/requires.txt
@@ -1,3 +1,3 @@
vobject >= 0.8.0
-trytond_calendar >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_calendar >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-calendar-classification
More information about the tryton-debian-vcs
mailing list