Revert ""Fix egg on dependency links [SKIP CI].""

This reverts commit 9c69676bd2.
This commit is contained in:
Sergio Morillo 2021-01-06 01:37:48 +01:00
parent 9c69676bd2
commit f643ba87aa
4 changed files with 45 additions and 13 deletions

View File

@ -7,6 +7,7 @@ pipeline:
- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
commands:
- python tests/netrc2hgrc.py
- pip install tox
- tox -e "${TOXENV}-${DATABASE}"
volumes:
@ -41,10 +42,4 @@ matrix:
DATABASE: sqlite
- IMAGE: python:3.7
TOXENV: py37
DATABASE: postgresql
- IMAGE: python:3.8
TOXENV: py38
DATABASE: sqlite
- IMAGE: python:3.8
TOXENV: py38
DATABASE: postgresql

View File

@ -54,28 +54,38 @@ else:
dependency_links = {
'incoterm':
'git+https://gitlab.com/datalifeit/'
'trytond-incoterm@%(branch)s' % {
'trytond-incoterm@%(branch)s'
'#egg=datalife_incoterm-%(series)s' % {
'branch': branch,
'series': series,
},
'stock_unit_load':
'git+https://gitlab.com/datalifeit/'
'trytond-stock_unit_load@%(branch)s' % {
'trytond-stock_unit_load@%(branch)s'
'#egg=datalife_stock_unit_load-%(series)s' % {
'branch': branch,
'series': series,
},
'product_ean':
'git+https://gitlab.com/datalifeit/'
'trytond-product_ean@%(branch)s' % {
'trytond-product_ean@%(branch)s'
'#egg=datalife_product_ean-%(series)s' % {
'branch': branch,
'series': series,
},
'product_cross_reference':
'git+https://gitlab.com/datalifeit/'
'trytond-product_cross_reference@%(branch)s' % {
'trytond-product_cross_reference@%(branch)s'
'#egg=datalife_product_cross_reference-%(series)s' % {
'branch': branch,
'series': series,
},
'party_edi':
'git+https://gitlab.com/datalifeit/'
'trytond-party_edi@%(branch)s' % {
'trytond-party_edi@%(branch)s'
'#egg=nantic_party_edi-%(series)s' % {
'branch': branch,
'series': series,
},
}

27
tests/netrc2hgrc.py Normal file
View File

@ -0,0 +1,27 @@
import netrc
import os
try:
from configparser import ConfigParser, DuplicateSectionError
except ImportError:
from ConfigParser import ConfigParser, DuplicateSectionError
def main():
netrc_ = netrc.netrc(os.path.expanduser('~/.netrc'))
config = ConfigParser()
try:
config.add_section('auth')
except DuplicateSectionError:
pass
hgrc = os.path.expanduser('~/.hgrc')
config.read(hgrc)
for host, (login, _, password) in netrc_.hosts.items():
config.set('auth', host + '.prefix', host)
config.set('auth', host + '.username', login)
config.set('auth', host + '.password', password)
with open(hgrc, 'w') as fp:
config.write(fp)
if __name__ == '__main__':
main()

View File

@ -1,10 +1,10 @@
[tox]
envlist = {py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
envlist = {py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
[testenv]
commands = {envpython} setup.py test
deps =
{py36,py37,py38}-postgresql: psycopg2 >= 2.5
{py36,py37}-postgresql: psycopg2 >= 2.5
pypy3-postgresql: psycopg2cffi >= 2.5
{py36}-sqlite: sqlitebck
setenv =