[tryton-debian-vcs] tryton-modules-product-attribute branch upstream updated. upstream/3.0.0-1-g763ead9
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:08:30 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-product-attribute.git;a=commitdiff;h=upstream/3.0.0-1-g763ead9
commit 763ead9335041a104b80dda8c960572d0718b2db
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:22:29 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index cd2dc58..aeba0cd 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 7668cfa..5695e54 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2013 Cédric Krier.
-Copyright (C) 2012-2013 B2CK SPRL.
+Copyright (C) 2012-2014 Cédric Krier.
+Copyright (C) 2012-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 b06ce02..bf576df 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_product_attribute
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_product
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 67421d0..93f09fc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_attribute
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module with product attributes
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_product_attribute
=========================
@@ -43,6 +43,7 @@ Description: trytond_product_attribute
http://www.tryton.org/
+Keywords: tryton product attribute
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/locale/ca_ES.po b/locale/ca_ES.po
index 75afc75..238ecfd 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -36,7 +36,7 @@ msgstr "Selecció JSON"
msgctxt "field:product.attribute,sets:"
msgid "Sets"
-msgstr "Grups"
+msgstr "Grups d'atributs"
msgctxt "field:product.attribute,string:"
msgid "String"
@@ -60,7 +60,7 @@ msgstr "Atribut"
msgctxt "field:product.attribute-product.attribute-set,attribute_set:"
msgid "Set"
-msgstr "Grup"
+msgstr "Grup d'atributs"
msgctxt "field:product.attribute-product.attribute-set,create_date:"
msgid "Create Date"
@@ -124,11 +124,11 @@ msgstr "Atributs"
msgctxt "field:product.template,attribute_set:"
msgid "Set"
-msgstr "Grup"
+msgstr "Grup d'atributs"
msgctxt "help:product.attribute,selection:"
msgid "A couple of key and label separated by \":\" per line"
-msgstr "A cada línia hi ha la clau i valor separats per \":\""
+msgstr "Clau i valor separats per \":\" a cada línia."
msgctxt "model:ir.action,name:act_attribute_form"
msgid "Attributes"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 7e291ee..6815f5a 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -12,7 +12,7 @@ msgstr "Erstellt durch"
msgctxt "field:product.attribute,digits:"
msgid "Digits"
-msgstr "Stellen"
+msgstr "Nachkommastellen"
msgctxt "field:product.attribute,id:"
msgid "ID"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index efed19f..526e1b3 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -205,7 +205,3 @@ msgstr "Atributo"
msgctxt "view:product.attribute:"
msgid "Attributes"
msgstr "Atributos"
-
-msgctxt "view:product.template:"
-msgid "Attributes"
-msgstr "Atributos"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index a6a13d0..cf82502 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -92,7 +92,7 @@ msgstr "Atributos"
msgctxt "field:product.attribute.set,create_date:"
msgid "Create Date"
-msgstr "Creado por Usuario"
+msgstr "Fecha de Creación"
msgctxt "field:product.attribute.set,create_uid:"
msgid "Create User"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 9601349..9008011 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -36,7 +36,7 @@ msgstr "Selección JSON"
msgctxt "field:product.attribute,sets:"
msgid "Sets"
-msgstr "Grupos"
+msgstr "Grupos de atributos"
msgctxt "field:product.attribute,string:"
msgid "String"
@@ -60,7 +60,7 @@ msgstr "Atributo"
msgctxt "field:product.attribute-product.attribute-set,attribute_set:"
msgid "Set"
-msgstr "Grupo"
+msgstr "Grupo de atributos"
msgctxt "field:product.attribute-product.attribute-set,create_date:"
msgid "Create Date"
@@ -124,7 +124,7 @@ msgstr "Atributos"
msgctxt "field:product.template,attribute_set:"
msgid "Set"
-msgstr "Grupo"
+msgstr "Grupo de atributos"
msgctxt "help:product.attribute,selection:"
msgid "A couple of key and label separated by \":\" per line"
@@ -136,7 +136,7 @@ msgstr "Atributos"
msgctxt "model:ir.action,name:act_attribute_set_form"
msgid "Attribute Sets"
-msgstr "Grupos de atributo"
+msgstr "Grupos de atributos"
msgctxt "model:ir.ui.menu,name:menu_attribute"
msgid "Attributes"
@@ -144,7 +144,7 @@ msgstr "Atributos"
msgctxt "model:ir.ui.menu,name:menu_attribute_set"
msgid "Attribute Sets"
-msgstr "Grupos de atributo"
+msgstr "Grupos de atributos"
msgctxt "model:product.attribute,name:"
msgid "Product Attribute"
@@ -192,11 +192,11 @@ msgstr "Selección"
msgctxt "view:product.attribute.set:"
msgid "Attribute Set"
-msgstr "Grupo de atributo"
+msgstr "Grupo de atributos"
msgctxt "view:product.attribute.set:"
msgid "Attribute Sets"
-msgstr "Grupos de atributo"
+msgstr "Grupos de atributos"
msgctxt "view:product.attribute:"
msgid "Attribute"
diff --git a/setup.py b/setup.py
index 5a7e3b6..2d96eed 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_product_attribute'
+
+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_product_attribute',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module with product attributes',
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 product attribute',
package_dir={'trytond.modules.product_attribute': '.'},
packages=[
'trytond.modules.product_attribute',
@@ -67,7 +85,6 @@ setup(name='trytond_product_attribute',
'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_product_attribute.py b/tests/test_product_attribute.py
index dd74970..1cd3f3f 100644
--- a/tests/test_product_attribute.py
+++ b/tests/test_product_attribute.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 ProductTestCase(unittest.TestCase):
- '''
- Test Product Attribute module.
- '''
+ 'Test Product Attribute module'
def setUp(self):
trytond.tests.test_tryton.install_module('product_attribute')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('product')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
ProductTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 9860507..487c9e5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
ir
product
diff --git a/trytond_product_attribute.egg-info/PKG-INFO b/trytond_product_attribute.egg-info/PKG-INFO
index 6643f30..36375e3 100644
--- a/trytond_product_attribute.egg-info/PKG-INFO
+++ b/trytond_product_attribute.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-attribute
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module with product attributes
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_product_attribute
=========================
@@ -43,6 +43,7 @@ Description: trytond_product_attribute
http://www.tryton.org/
+Keywords: tryton product attribute
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_product_attribute.egg-info/requires.txt b/trytond_product_attribute.egg-info/requires.txt
index a69ed06..8453a9a 100644
--- a/trytond_product_attribute.egg-info/requires.txt
+++ b/trytond_product_attribute.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_product >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-product-attribute
More information about the tryton-debian-vcs
mailing list