From 26a308fa74be8dce1cc49ecebf5370680c158368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 6 Apr 2019 17:38:56 +0200 Subject: [PATCH] Merge README and doc and remove INSTALL issue7397 review253271002 --- INSTALL | 35 ----------------------------------- MANIFEST.in | 12 ++---------- README | 27 --------------------------- README.rst | 1 + setup.py | 19 +++++++++++++++++-- 5 files changed, 20 insertions(+), 74 deletions(-) delete mode 100644 INSTALL delete mode 100644 README create mode 120000 README.rst diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 1115426274..0000000000 --- a/INSTALL +++ /dev/null @@ -1,35 +0,0 @@ -Installing trytond_purchase_requisition -======================================= - -Prerequisites -------------- - - * Python 3.4 or later (http://www.python.org/) - * trytond (http://www.tryton.org/) - * trytond_company (http://www.tryton.org/) - * trytond_currency (http://www.tryton.org/) - * trytond_party (http://www.tryton.org/) - * trytond_product (http://www.tryton.org/) - * trytond_purchase (http://www.tryton.org/) - * trytond_purchase_request (http://www.tryton.org/) - -Installation ------------- - -Once you've downloaded and unpacked the purchase_requisition source -release, enter the directory where the archive was unpacked, and run: - - python setup.py install - -Note that you may need administrator/root privileges for this step, as -this command will by default attempt to install module to the Python -site-packages directory on your system. - -For advanced options, please refer to the easy_install and/or the distutils -documentation: - - http://setuptools.readthedocs.io/en/latest/easy_install.html - http://docs.python.org/inst/inst.html - -To use without installation, extract the archive into ``trytond/modules`` with -the directory name purchase_requisition. diff --git a/MANIFEST.in b/MANIFEST.in index 4a5843ddf0..e88b2348a3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,13 +1,5 @@ -include INSTALL -include README -include COPYRIGHT include CHANGELOG +include COPYRIGHT include LICENSE -include tryton.cfg -include *.xml -include view/*.xml -include *.fodt -include locale/*.po +include README.rst include doc/* -include icons/* -include tests/*.rst diff --git a/README b/README deleted file mode 100644 index 5c8d1a845f..0000000000 --- a/README +++ /dev/null @@ -1,27 +0,0 @@ -trytond_purchase_requisition -============================ - -The purchase_requisition module of the Tryton application platform. - -Installing ----------- - -See INSTALL - -Support -------- - -If you encounter any problems with Tryton, please don't hesitate to ask -questions on the Tryton forum or IRC channel: - - http://www.tryton.org/forum - -License -------- - -See LICENSE - -Copyright ---------- - -See COPYRIGHT diff --git a/README.rst b/README.rst new file mode 120000 index 0000000000..176d9c2695 --- /dev/null +++ b/README.rst @@ -0,0 +1 @@ +doc/index.rst \ No newline at end of file diff --git a/setup.py b/setup.py index 6b13c013c7..d8d60f930b 100755 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def get_require_version(name): config = ConfigParser() -config.read_file(open('tryton.cfg')) +config.read_file(open(os.path.join(os.path.dirname(__file__), 'tryton.cfg'))) info = dict(config.items('tryton')) for key in ('depends', 'extras_depend', 'xml'): if key in info: @@ -37,6 +37,14 @@ major_version = int(major_version) minor_version = int(minor_version) name = 'trytond_purchase_requisition' +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)(\W|$)', dep): @@ -53,10 +61,17 @@ setup(name=name, description=('Allows users to enter requests for product supply ' '(requisition). This will create a "Purchase request" by line ' 'which will be treated by the purchasing department.'), - long_description=read('README'), + long_description=read('README.rst'), author='Tryton', author_email='bugs@tryton.org', url='http://www.tryton.org', + download_url=download_url, + project_urls={ + "Bug Tracker": 'https://bugs.tryton.org/', + "Documentation": 'https://docs.tryton.org/', + "Forum": 'https://www.tryton.org/forum', + "Source Code": 'https://hg.tryton.org/modules/purchase_requisition', + }, keywords='tryton purchase requisition', package_dir={'trytond.modules.purchase_requisition': '.'}, packages=(