[tryton-debian-vcs] tryton-modules-google-maps branch upstream updated. upstream/3.0.0-1-g92434bd
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:07:46 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-google-maps.git;a=commitdiff;h=upstream/3.0.0-1-g92434bd
commit 92434bd7541e9136b2ea506a003c38c62a9fe0cc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:22:03 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index edf5d22..cffc3f7 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 d7165c7..9925e7d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-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 79260d0..78048ee 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_google_maps
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/)
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 b11d8e5..aa678ab 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_google_maps
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to link addresses to Google Maps
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_google_maps
===================
@@ -43,6 +43,7 @@ Description: trytond_google_maps
http://www.tryton.org/
+Keywords: tryton google maps
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,6 +63,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/address.py b/address.py
index 064eaca..d2af626 100644
--- a/address.py
+++ b/address.py
@@ -12,10 +12,11 @@ __metaclass__ = PoolMeta
class Address:
__name__ = 'party.address'
- google_maps_url = fields.Function(fields.Char('Google Maps',
- on_change_with=['street', 'streetbis', 'zip', 'city', 'country',
- 'subdivision']), 'on_change_with_google_maps_url')
+ google_maps_url = fields.Function(fields.Char('Google Maps'),
+ 'on_change_with_google_maps_url')
+ @fields.depends('street', 'streetbis', 'zip', 'city', 'country',
+ 'subdivision')
def on_change_with_google_maps_url(self, name=None):
lang = Transaction().language[:2]
url = ''
diff --git a/setup.py b/setup.py
index 3fb52f7..76e0625 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_google_maps'
+
+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 = []
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_google_maps',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to link addresses to Google Maps',
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 google maps',
package_dir={'trytond.modules.google_maps': '.'},
packages=[
'trytond.modules.google_maps',
@@ -66,7 +84,6 @@ setup(name='trytond_google_maps',
'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/tests/test_google_maps.py b/tests/test_google_maps.py
index dbc80ad..0c0ce02 100644
--- a/tests/test_google_maps.py
+++ b/tests/test_google_maps.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 GoogleMapsTestCase(unittest.TestCase):
- '''
- Test GoogleMaps module.
- '''
+ 'Test GoogleMaps module'
def setUp(self):
trytond.tests.test_tryton.install_module('google_maps')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('google_maps')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
GoogleMapsTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index a552bc0..af3ccc8 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_google_maps.egg-info/PKG-INFO b/trytond_google_maps.egg-info/PKG-INFO
index 6913023..c2fde50 100644
--- a/trytond_google_maps.egg-info/PKG-INFO
+++ b/trytond_google_maps.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-google-maps
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to link addresses to Google Maps
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_google_maps
===================
@@ -43,6 +43,7 @@ Description: trytond_google_maps
http://www.tryton.org/
+Keywords: tryton google maps
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,6 +63,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_google_maps.egg-info/requires.txt b/trytond_google_maps.egg-info/requires.txt
index d3ca374..099085f 100644
--- a/trytond_google_maps.egg-info/requires.txt
+++ b/trytond_google_maps.egg-info/requires.txt
@@ -1,2 +1,2 @@
-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-google-maps
More information about the tryton-debian-vcs
mailing list