[tryton-debian-vcs] tryton-modules-account-invoice-line-standalone branch upstream updated. upstream/3.0.0-1-gd039b30
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:05: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-account-invoice-line-standalone.git;a=commitdiff;h=upstream/3.0.0-1-gd039b30
commit d039b309fb567df5b7fe78035b4f4e8868dcd4b0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:20:46 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 71892e9..f1c9bbd 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 53df3b3..bf1255e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_invoice_line_standalone
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_account_invoice (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 18ce53c..4cf1634 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 view/*.xml
-include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index d75f8f9..8a676c9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_invoice_line_standalone
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to have standalone invoice lines
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_account_invoice_line_standalone
=======================================
@@ -43,6 +43,7 @@ Description: trytond_account_invoice_line_standalone
http://www.tryton.org/
+Keywords: tryton account standalone invoice line
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -61,6 +62,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/fr_FR.po b/locale/fr_FR.po
index 99a35ec..01681b0 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -16,7 +16,7 @@ msgstr "Lignes de note de crédit"
msgctxt "model:ir.action,name:act_invoice_line_out_invoice_form"
msgid "Invoice Lines"
-msgstr "Lignes de factures"
+msgstr "Lignes de facture"
msgctxt "model:ir.ui.menu,name:menu_invoice_line_in_credit_note_form"
msgid "Supplier Credit Note Lines"
@@ -32,4 +32,4 @@ msgstr "Lignes de note de crédit"
msgctxt "model:ir.ui.menu,name:menu_invoice_line_out_invoice_form"
msgid "Invoice Lines"
-msgstr "Lignes de factures"
+msgstr "Lignes de facture"
diff --git a/setup.py b/setup.py
index abc3a4e..297414c 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_account_invoice_line_standalone'
+
+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_account_invoice_line_standalone',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to have standalone invoice lines',
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 account standalone invoice line',
package_dir={'trytond.modules.account_invoice_line_standalone': '.'},
packages=[
'trytond.modules.account_invoice_line_standalone',
@@ -65,7 +83,6 @@ setup(name='trytond_account_invoice_line_standalone',
'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_account_invoice_line_standalone.py b/tests/test_account_invoice_line_standalone.py
index a3ff7b2..3640b32 100644
--- a/tests/test_account_invoice_line_standalone.py
+++ b/tests/test_account_invoice_line_standalone.py
@@ -1,38 +1,23 @@
-#!/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 AccountInvoiceLineStandaloneTestCase(unittest.TestCase):
- '''
- Test AccountInvoiceLineStandalone module.
- '''
+ 'Test AccountInvoiceLineStandalone module'
def setUp(self):
trytond.tests.test_tryton.install_module(
- 'account_invoice_line_standalone')
+ 'account_invoice_line_standalone')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('account_invoice_line_standalone')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -41,6 +26,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountInvoiceLineStandaloneTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 1f05006..7e9f488 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
account_invoice
ir
diff --git a/trytond_account_invoice_line_standalone.egg-info/PKG-INFO b/trytond_account_invoice_line_standalone.egg-info/PKG-INFO
index 8682a9d..eeb7329 100644
--- a/trytond_account_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_account_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-invoice-line-standalone
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to have standalone invoice lines
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_account_invoice_line_standalone
=======================================
@@ -43,6 +43,7 @@ Description: trytond_account_invoice_line_standalone
http://www.tryton.org/
+Keywords: tryton account standalone invoice line
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -61,6 +62,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_account_invoice_line_standalone.egg-info/requires.txt b/trytond_account_invoice_line_standalone.egg-info/requires.txt
index 31ed0b4..77401fc 100644
--- a/trytond_account_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_account_invoice_line_standalone.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_account_invoice >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_account_invoice >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-account-invoice-line-standalone
More information about the tryton-debian-vcs
mailing list