From 45e18766cfe4efd0a19760108a1690a1a84cf357 Mon Sep 17 00:00:00 2001 From: Sergio Morillo Date: Wed, 20 Jan 2021 00:30:55 +0100 Subject: [PATCH] "Fix egg on dependency links [SKIP CI]." --- .drone.yml | 6 ++++++ setup.py | 6 ++---- tox.ini | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5707620..de4821e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,4 +41,10 @@ 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 \ No newline at end of file diff --git a/setup.py b/setup.py index ee5d1b8..9d90068 100644 --- a/setup.py +++ b/setup.py @@ -54,16 +54,14 @@ dependency_links = { 'stock_location_combined': 'git+https://gitlab.com/datalifeit/' 'trytond-stock_location_combined@%(branch)s' - '#egg=datalife_stock_location_combined-%(series)s' % { + '#egg=datalife_stock_location_combined' % { 'branch': branch, - 'series': series, }, 'stock_unit_load': 'git+https://gitlab.com/datalifeit/' 'trytond-stock_unit_load@%(branch)s' - '#egg=datalife_stock_unit_load-%(series)s' % { + '#egg=datalife_stock_unit_load' % { 'branch': branch, - 'series': series, } } diff --git a/tox.ini b/tox.ini index 8c73716..da952cd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -envlist = {py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql} +envlist = {py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - {py36,py37}-postgresql: psycopg2 >= 2.5 + {py36,py37,py38}-postgresql: psycopg2 >= 2.5 pypy3-postgresql: psycopg2cffi >= 2.5 {py36}-sqlite: sqlitebck setenv =