From 67ceb5b999f3acb27d483dc6567af0544ebab4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 8 Jun 2012 19:34:33 +0200 Subject: [PATCH] Simplify module information with python configuration review363001 --- MANIFEST.in | 1 + README | 1 - __tryton__.py | 107 -------------------------------------------------- setup.py | 33 ++++++++++------ tryton.cfg | 14 +++++++ 5 files changed, 37 insertions(+), 119 deletions(-) delete mode 100644 __tryton__.py create mode 100644 tryton.cfg diff --git a/MANIFEST.in b/MANIFEST.in index 32879dffb2..97a95966de 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 4c3c6fc4c6..d3bcfb2839 100644 --- a/README +++ b/README @@ -2,7 +2,6 @@ trytond_stock_supply ==================== The stock_supply module of the Tryton application platform. -See __tryton__.py Installing ---------- diff --git a/__tryton__.py b/__tryton__.py deleted file mode 100644 index 3d005e83e7..0000000000 --- a/__tryton__.py +++ /dev/null @@ -1,107 +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': 'Stock Supply Management', - 'name_bg_BG': 'Управление на доставка на наличност', - 'name_ca_ES': 'Gestió del proveïment d''estocs', - 'name_de_DE': 'Lagerverwaltung Bestellwesen', - 'name_es_AR': 'Gestión de suministro de existencias', - 'name_es_CO': 'Gestión de pedidos de inventario', - 'name_es_ES': 'Gestión del abastecimiento de stock', - 'name_fr_FR': 'Gestion des approvisionnements de stock', - 'version': '2.5.0', - 'author': 'B2CK', - 'email': 'info@b2ck.com', - 'website': 'http://www.tryton.org/', - 'description': '''Supply Management Module with: - - Order point - - Purchase Request - -With schedulers: - - to generate purchase requests based on order points - - to generate internal shipments based on order points -''', - 'description_bg_BG': '''Модул за управление на доставка на наличност с: - - Пренареждане - - Заявка за покупка - -С планировщици: - - за генериране на заявки за покупка въз основа на пренареждания - - за генериране на вътрешни пратки въз основа на пренареждания -''', - 'description_ca_ES': '''Mòdul per la gestió del proveïment d'estocs amb: - - Estocs mínims - - Peticions de compra - -I planificadors: - - Per generar peticions de compra basades en estocs mínims - - Per generar albarans interns basats en estocs mínims -''', - 'description_de_DE': '''Modul für das Bestellwesen mit: - - Bestellpunkten - - Auftragserstellung - -Mit automatischer Auftragserstellung per Zeitplaner: - - für Bestellungen auf der Basis von Bestellpunkten - - für interne Lieferposten auf der Basis von Bestellpunkten -''', - 'description_es_AR': '''Módulo de gestión de suministros con: - - Punto de orden - - Solicitud de compra - -Con tareas programadas para: - - generar solicitudes de compra basados en puntos de orden - - generar envios internos basados en puntos de orden -''', - 'description_es_CO': '''Módulo de Administración de pedidos: - - Punto de Orden - - Solicitud de Compras - -Con agendadores para: - - generar solicitudes de compra basados en puntos de orden - - generar empaques internos basados en puntos de orden -''', - 'description_es_ES': '''Módulo para la gestión de abastecimientos con: - - Reglas de stock mínimo - - Solicitudes de compra - -Con planificadores para: - - Generar solicitudes de compra basadas en stocks mínimos - - Generar envíos internos basados en stocks mínimos -''', - 'description_fr_FR': '''Module de gestion des approvisionnements avec: - - Règles d'approvisionnement - - Demandes d'achat - -Et les planificateurs pour générer: - - des demandes d'achat et - - des colisages internes -sur base des règles d'approvisionnement -''', - 'depends': [ - 'ir', - 'res', - 'product', - 'stock', - 'purchase', - 'party', - 'account', - ], - 'xml': [ - 'order_point.xml', - 'purchase_request.xml', - 'shipment.xml', - ], - 'translation': [ - 'locale/cs_CZ.po', - 'locale/bg_BG.po', - 'locale/ca_ES.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 fde7348b3b..5c457de194 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_stock_supply', 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 for stock supply', + 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.stock_supply': '.'}, packages=[ 'trytond.modules.stock_supply', 'trytond.modules.stock_supply.tests', - ], + ], package_data={ 'trytond.modules.stock_supply': info.get('xml', []) \ - + info.get('translation', []), - }, + + ['tryton.cfg', 'locale/*.po'], + }, classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Plugins', @@ -57,7 +68,7 @@ setup(name='trytond_stock_supply', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Topic :: Office/Business', - ], + ], license='GPL-3', install_requires=requires, zip_safe=False, @@ -67,4 +78,4 @@ setup(name='trytond_stock_supply', """, test_suite='tests', test_loader='trytond.test_loader:Loader', -) + ) diff --git a/tryton.cfg b/tryton.cfg new file mode 100644 index 0000000000..301137a60f --- /dev/null +++ b/tryton.cfg @@ -0,0 +1,14 @@ +[tryton] +version=2.5.0 +depends: + account + ir + party + product + purchase + res + stock +xml: + order_point.xml + purchase_request.xml + shipment.xml