Remove process-dependency-links [SKIP CI]

This commit is contained in:
Sergio Morillo 2019-01-24 16:19:08 +01:00
parent 1608a6496c
commit 9d8f37cf5a
3 changed files with 21 additions and 28 deletions

View file

@ -38,18 +38,6 @@ matrix:
- IMAGE: python:2.7
TOXENV: py27
DATABASE: postgresql
- IMAGE: python:3.4
TOXENV: py34
DATABASE: sqlite
- IMAGE: python:3.4
TOXENV: py34
DATABASE: postgresql
- IMAGE: python:3.5
TOXENV: py35
DATABASE: sqlite
- IMAGE: python:3.5
TOXENV: py35
DATABASE: postgresql
- IMAGE: python:3.6
TOXENV: py36
DATABASE: sqlite

View file

@ -45,27 +45,33 @@ minor_version = int(minor_version)
name = 'datalife_stock_product_category_location'
download_url = 'https://bitbucket.org/datalife_sco/trytond-stock_product_category_location'
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res)(\W|$)', dep):
prefix = MODULE2PREFIX.get(dep, 'trytond')
requires.append(get_require_version('%s_%s' % (prefix, dep)))
requires.append(get_require_version('trytond'))
tests_require = [get_require_version('proteus')]
series = '%s.%s' % (major_version, minor_version)
if minor_version % 2:
branch = 'default'
else:
branch = series
dependency_links = [
('hg+https://bitbucket.org/datalife_sco/'
dependency_links = {
'stock_location_notebook':
'hg+https://bitbucket.org/datalife_sco/'
'trytond-stock_location_notebook@%(branch)s'
'#egg=datalife_stock_location_notebook-%(series)s' % {
'branch': branch,
'series': series,
})
]
}
}
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res)(\W|$)', dep):
prefix = MODULE2PREFIX.get(dep, 'trytond')
req = get_require_version('%s_%s' % (prefix, dep))
if dep in dependency_links:
req = '%s_%s @ %s' % (prefix, dep, dependency_links[dep])
requires.append(req)
requires.append(get_require_version('trytond'))
tests_require = [get_require_version('proteus')]
if minor_version % 2:
# Add development index for testing with proteus
dependency_links.append('https://trydevpi.tryton.org/')
@ -121,7 +127,6 @@ setup(name=name,
],
license='GPL-3',
install_requires=requires,
dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]

View file

@ -1,10 +1,10 @@
[tox]
envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
envlist = {py27,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
[testenv]
commands = {envpython} setup.py test
deps =
{py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
{py27,py36}-postgresql: psycopg2 >= 2.5
pypy-postgresql: psycopg2cffi >= 2.5
mysql: MySQL-python
sqlite: sqlitebck
@ -15,4 +15,4 @@ setenv =
sqlite: DB_NAME={env:SQLITE_NAME::memory:}
postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
mysql: DB_NAME={env:MYSQL_NAME:test}
install_command = pip install --pre --process-dependency-links {opts} {packages}
install_command = pip install --pre {opts} {packages}