Skip to content

Commit b2b4478

Browse files
committedJul 22, 2020
update more files from [1]
[1] https://codereview.tryton.org/278521002
1 parent 6811769 commit b2b4478

File tree

8 files changed

+38
-101
lines changed

8 files changed

+38
-101
lines changed
 

‎INSTALL

-30
This file was deleted.

‎MANIFEST.in

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
include INSTALL
2-
include README
3-
include TODO
4-
include COPYRIGHT
51
include CHANGELOG
2+
include COPYRIGHT
63
include LICENSE
7-
include tryton.cfg
8-
include *.xml
9-
include *.fodt
10-
include locale/*.po
4+
include README.rst
5+
include doc/*

‎README

-45
This file was deleted.

‎README.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc/index.rst

‎TODO

Whitespace-only changes.

‎doc/index.rst

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
Account Argentina Module
1+
Argentina Account Module
22
########################
33

4-
Define an account chart template for Argentina.
5-
6-
Usefull to create a Argentinian account chart with the wizard in
7-
Financial Management > Configuration > General Account >
8-
Create Chart of Account from Template
4+
The account_ar module provides a chart of accounts and implements the accounting
5+
requirements for companies based in Argentina.

‎setup.py

+28-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import os
88
import re
99
from configparser import ConfigParser
10-
from setuptools import setup
10+
from setuptools import setup, find_packages
1111

1212
MODULE2PREFIX = {}
1313

@@ -31,7 +31,7 @@ def get_require_version(name):
3131

3232

3333
config = ConfigParser()
34-
config.read_file(open('tryton.cfg'))
34+
config.read_file(open(os.path.join(os.path.dirname(__file__), 'tryton.cfg')))
3535
info = dict(config.items('tryton'))
3636
for key in ('depends', 'extras_depend', 'xml'):
3737
if key in info:
@@ -44,6 +44,16 @@ def get_require_version(name):
4444

4545
download_url = 'https://github.com/tryton-ar/account_ar/tree/%s.%s' % (
4646
major_version, minor_version)
47+
if minor_version % 2:
48+
version = '%s.%s.dev0' % (major_version, minor_version)
49+
download_url = 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
50+
name[8:], name, version)
51+
local_version = []
52+
for build in ['CI_BUILD_NUMBER', 'CI_JOB_NUMBER', 'CI_JOB_ID']:
53+
if os.environ.get(build):
54+
local_version.append(os.environ[build])
55+
if local_version:
56+
version += '+' + '.'.join(local_version)
4757

4858
LINKS = {}
4959

@@ -57,22 +67,31 @@ def get_require_version(name):
5767

5868
tests_require = [get_require_version('proteus')]
5969
dependency_links = list(LINKS.values())
70+
if minor_version % 2:
71+
dependency_links.append('https://trydevpi.tryton.org/')
6072

6173
setup(name=name,
6274
version=version,
63-
description='Tryton module to add an account chart template for Argentina',
64-
long_description=read('README'),
75+
description='Tryton module for Argentinian accounting',
76+
long_description=read('README.rst'),
6577
author='tryton-ar',
6678
url='https://github.com/tryton-ar/account_ar',
6779
download_url=download_url,
80+
project_urls={
81+
"Bug Tracker": 'https://bugs.tryton.org/',
82+
"Documentation": 'https://docs.tryton.org/',
83+
"Forum": 'https://www.tryton.org/forum',
84+
"Source Code": 'https://github.com/tryton-ar/account_ar',
85+
},
86+
keywords='tryton account chart argentina',
6887
package_dir={'trytond.modules.account_ar': '.'},
69-
packages=[
70-
'trytond.modules.account_ar',
71-
'trytond.modules.account_ar.tests',
72-
],
88+
packages=(
89+
['trytond.modules.account_ar'] +
90+
['trytond.modules.account_ar.%s' % p for p in find_packages()]
91+
),
7392
package_data={
7493
'trytond.modules.account_ar': (info.get('xml', []) + [
75-
'tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt']),
94+
'tryton.cfg', 'view/*.xml', 'locale/*.po']),
7695
},
7796
classifiers=[
7897
'Development Status :: 5 - Production/Stable',

‎tests/test_account_ar.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
from trytond.tests.test_tryton import suite as test_suite
77

88

9-
class AccountTestCase(ModuleTestCase):
10-
'Test Account Ar module'
9+
class AccountARTestCase(ModuleTestCase):
10+
'Test Account AR module'
1111
module = 'account_ar'
1212

1313

1414
def suite():
1515
suite = test_suite()
1616
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
17-
AccountTestCase))
17+
AccountARTestCase))
1818
return suite

0 commit comments

Comments
 (0)
Please sign in to comment.