[tryton-debian-vcs] tryton-modules-google-maps branch upstream updated. upstream/3.8.0-2-gbf34e61
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:19:11 UTC 2016
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.8.0-2-gbf34e61
commit bf34e61032db5ab1ffa9702bdfed4dbbaea0edcf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:22 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index c563af2..80bc1e3 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)
* Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index f603e7c..b8e8f93 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_google_maps
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to link addresses to Google Maps
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index b68e518..6897ca2 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 "field:party.address,google_maps_url:"
msgid "Google Maps"
-msgstr ""
+msgstr "ແຜນທີ່ ຄູເກີນລ໌"
diff --git a/tryton.cfg b/tryton.cfg
index 7b7f20e..a10fdca 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
party
diff --git a/trytond_google_maps.egg-info/PKG-INFO b/trytond_google_maps.egg-info/PKG-INFO
index b16a99a..da1e81d 100644
--- a/trytond_google_maps.egg-info/PKG-INFO
+++ b/trytond_google_maps.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-google-maps
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to link addresses to Google Maps
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_google_maps.egg-info/SOURCES.txt b/trytond_google_maps.egg-info/SOURCES.txt
index 9de9161..b57ef80 100644
--- a/trytond_google_maps.egg-info/SOURCES.txt
+++ b/trytond_google_maps.egg-info/SOURCES.txt
@@ -24,11 +24,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_google_maps.py
./view/address_form.xml
diff --git a/trytond_google_maps.egg-info/requires.txt b/trytond_google_maps.egg-info/requires.txt
index 4b6ae47..095799c 100644
--- a/trytond_google_maps.egg-info/requires.txt
+++ b/trytond_google_maps.egg-info/requires.txt
@@ -1,2 +1,2 @@
trytond_party >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit f012be93f4eff6c9887fbc4a775507fca5e16efb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:04 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index e339ff3..c563af2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 34d4187..808b71b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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/PKG-INFO b/PKG-INFO
index 88642fd..f603e7c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_google_maps
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to link addresses to Google Maps
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_google_maps
===================
@@ -54,6 +54,8 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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
@@ -67,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/address.py b/address.py
index d3b59a8..6bc5b86 100644
--- a/address.py
+++ b/address.py
@@ -6,10 +6,10 @@ from trytond.transaction import Transaction
from trytond.pool import PoolMeta
__all__ = ['Address']
-__metaclass__ = PoolMeta
class Address:
+ __metaclass__ = PoolMeta
__name__ = 'party.address'
google_maps_url = fields.Function(fields.Char('Google Maps'),
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..b68e518
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.address,google_maps_url:"
+msgid "Google Maps"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..d96a89f
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.address,google_maps_url:"
+msgid "Google Maps"
+msgstr "谷歌地图"
diff --git a/setup.py b/setup.py
index 9bd6103..8386e1e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
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'))
@@ -75,6 +81,8 @@ setup(name=name,
'Intended Audience :: Manufacturing',
'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',
@@ -88,6 +96,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -101,4 +112,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 5c2af6f..da47257 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from .test_google_maps import suite
+try:
+ from trytond.modules.google_maps.tests.test_google_maps import suite
+except ImportError:
+ from .test_google_maps import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index c8dd1af..7b7f20e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
party
diff --git a/trytond_google_maps.egg-info/PKG-INFO b/trytond_google_maps.egg-info/PKG-INFO
index b31e7cf..b16a99a 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.8.0
+Version: 4.0.0
Summary: Tryton module to link addresses to Google Maps
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_google_maps
===================
@@ -54,6 +54,8 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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
@@ -67,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_google_maps.egg-info/SOURCES.txt b/trytond_google_maps.egg-info/SOURCES.txt
index eacceff..9de9161 100644
--- a/trytond_google_maps.egg-info/SOURCES.txt
+++ b/trytond_google_maps.egg-info/SOURCES.txt
@@ -46,11 +46,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_google_maps.egg-info/PKG-INFO
trytond_google_maps.egg-info/SOURCES.txt
trytond_google_maps.egg-info/dependency_links.txt
diff --git a/trytond_google_maps.egg-info/requires.txt b/trytond_google_maps.egg-info/requires.txt
index fb92f88..4b6ae47 100644
--- a/trytond_google_maps.egg-info/requires.txt
+++ b/trytond_google_maps.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-google-maps
More information about the tryton-debian-vcs
mailing list