From 7900de9ff262f0073f7ab1aa60b2f680ded63c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 8 Jun 2012 19:33:37 +0200 Subject: [PATCH] Simplify module information with python configuration review363001 --- MANIFEST.in | 1 + README | 1 - __tryton__.py | 68 --------------------------------------------------- setup.py | 33 ++++++++++++++++--------- tryton.cfg | 7 ++++++ 5 files changed, 30 insertions(+), 80 deletions(-) delete mode 100644 __tryton__.py create mode 100644 tryton.cfg diff --git a/MANIFEST.in b/MANIFEST.in index 7f5d5fdaf4..44969c7156 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,7 @@ include TODO include COPYRIGHT include CHANGELOG include LICENSE +include tryton.cfg include *.xml include *.odt include locale/*.po diff --git a/README b/README index b032c453a9..72e84997fe 100644 --- a/README +++ b/README @@ -2,7 +2,6 @@ trytond_account_invoice_line_standalone ======================================= The account_invoice_line_standalone module of the Tryton application platform. -See __tryton__.py Installing ---------- diff --git a/__tryton__.py b/__tryton__.py deleted file mode 100644 index 129f94b73f..0000000000 --- a/__tryton__.py +++ /dev/null @@ -1,68 +0,0 @@ -#This file is part of Tryton. The COPYRIGHT file at the top level of -#this repository contains the full copyright notices and license terms. -{ - "name": "Account Invoice Line Standalone", - "name_bg_BG": "Ред от независима фактура към сметка", - "name_ca_ES": "Línia de factura independent", - "name_de_DE": "Fakturierung ungebundene Rechnungsposition", - "name_es_AR": "Línea de factura independiente", - "name_es_CO": "Línea de factura autónoma", - "name_es_ES": "Línea de factura independiente", - "name_fr_FR": "Ligne de facture autonome", - "version": "2.5.0", - "author": "B2CK", - 'email': 'info@b2ck.com', - 'website': 'http://www.tryton.org/', - "description": '''Allow to create standalone invoice lines and add them later to a draft -invoice. The invoice will only accept invoice lines with the same -type, company, currency and party. -''', - "description_bg_BG": '''Позволява създаване на редове от независими фактури и по-късното им добавяне - към проект на фактура. Фактурата приема редове само с едни и същи вид, фирма, валута и партньор. -''', - "description_ca_ES": '''Permet crear línies de factura independents i -afegir-les a una factura esborrany. La factura només acceptarà línies de factura amb -el mateix tipus, empresa, divisa i tercer. -''', - "description_de_DE": '''Fakturierung mit ungebundenen Rechnungspositionen - - Ermöglicht die Erstellung ungebundener Rechnungspositionen, die später zu - Rechnungen mit Status Entwurf hinzugefügt werden können. - - Innerhalb einer Rechnung können nur Rechnungspositionen mit - übereinstimmendem Typ, Unternehmen, Währung und Partei verwendet werden. -''', - "description_es_AR": '''Permite crear líneas de factura independientes y -añadirlas a una factura borrador. La factura solo aceptará líneas de factura -con el mismo tipo, empresa, divisa y entidad. -''', - "description_es_CO": '''Permite crear líneas individuales para facturación y añadirlas -posteriormente a una factura en borrador. La factuara aceptará únicamente líneas de factura del -mismo tipo, compañía, moneda y tercero. -''', - "description_es_ES": '''Permite crear líneas de factura independientes y -añadirlas a una factura borrador. La factura sólo aceptará líneas de factura -con el mismo tipo, empresa, divisa y tercero. -''', - "description_fr_FR": '''Permet de créer des lignes de facture autonomes et de les ajouter -ensuite à des factures dans l'état brouillon. La facture n'acceptera -que des lignes qui ont les même type, société, devis et tiers. -''', - "depends": [ - "ir", - "account_invoice", - ], - "xml": [ - "invoice.xml", - ], - 'translation': [ - 'locale/bg_BG.po', - 'locale/ca_ES.po', - 'locale/cs_CZ.po', - 'locale/de_DE.po', - 'locale/es_AR.po', - 'locale/es_CO.po', - 'locale/es_ES.po', - 'locale/fr_FR.po', - 'locale/nl_NL.po', - 'locale/ru_RU.po', - ], -} diff --git a/setup.py b/setup.py index 49877d2449..db31725ca0 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,19 @@ from setuptools import setup import re +import os +import ConfigParser -info = eval(open('__tryton__.py').read()) + +def read(fname): + return open(os.path.join(os.path.dirname(__file__), fname)).read() + +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) major_version = int(major_version) minor_version = int(minor_version) @@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' % setup(name='trytond_account_invoice_line_standalone', version=info.get('version', '0.0.1'), - description=info.get('description', ''), - author=info.get('author', ''), - author_email=info.get('email', ''), - url=info.get('website', ''), + description='Tryton module to have standalone invoice lines', + long_description=read('README'), + author='Tryton', + url='http://www.tryton.org/', download_url="http://downloads.tryton.org/" + \ - info.get('version', '0.0.1').rsplit('.', 1)[0] + '/', + info.get('version', '0.0.1').rsplit('.', 1)[0] + '/', package_dir={'trytond.modules.account_invoice_line_standalone': '.'}, packages=[ 'trytond.modules.account_invoice_line_standalone', 'trytond.modules.account_invoice_line_standalone.tests', - ], + ], package_data={ 'trytond.modules.account_invoice_line_standalone': \ - info.get('xml', []) + info.get('translation', []), - }, + info.get('xml', []) + ['tryton.cfg', 'locale/*.po'], + }, classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Plugins', @@ -56,7 +67,7 @@ setup(name='trytond_account_invoice_line_standalone', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Office/Business', - ], + ], license='GPL-3', install_requires=requires, zip_safe=False, @@ -66,4 +77,4 @@ setup(name='trytond_account_invoice_line_standalone', """, test_suite='tests', test_loader='trytond.test_loader:Loader', -) + ) diff --git a/tryton.cfg b/tryton.cfg new file mode 100644 index 0000000000..150006b06f --- /dev/null +++ b/tryton.cfg @@ -0,0 +1,7 @@ +[tryton] +version=2.5.0 +depends: + account_invoice + ir +xml: + invoice.xml