From 54236c763cdf9dee3114554ddc2812ea4f8d81da Mon Sep 17 00:00:00 2001 From: Sergio Morillo Date: Fri, 8 Oct 2021 17:42:35 +0200 Subject: [PATCH] Migrate to 6.0 --- .drone.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 1 - tox.ini | 5 +++-- tryton.cfg | 2 +- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 879a4ac..a7b46fc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,6 +37,54 @@ volumes: path: /var/lib/cache +--- +kind: pipeline +name: py36-postgresql + +steps: + - name: tox + image: python:3.6 + pull: if-not-exists + environment: + CFLAGS: -O0 + DB_CACHE: /cache + TOX_TESTENV_PASSENV: CFLAGS DB_CACHE + POSTGRESQL_URI: postgresql://postgres@postgresql:5432/ + commands: + - pip install tox + - tox -e "py36-postgresql" + volumes: + - name: cache + path: /root/.cache + + - name: notify + image: drillster/drone-email + pull: if-not-exists + settings: + from: drone@datalifeit.es + skip_verify: true + host: + from_secret: email_host + port: + from_secret: email_port + when: + status: + - changed + - failure + +services: +- name: postgresql + image: postgres + pull: if-not-exists + environment: + POSTGRES_HOST_AUTH_METHOD: trust + +volumes: + - name: cache + host: + path: /var/lib/cache + + --- kind: pipeline name: py37-postgresql diff --git a/setup.py b/setup.py index 5d83d34..deeff69 100644 --- a/setup.py +++ b/setup.py @@ -104,5 +104,4 @@ setup(name='%s_%s' % (PREFIX, MODULE), test_suite='tests', test_loader='trytond.test_loader:Loader', tests_require=tests_require, - use_2to3=True, ) diff --git a/tox.ini b/tox.ini index 42a7907..da952cd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,12 @@ [tox] -envlist = {py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql} +envlist = {py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - {py37,py38}-postgresql: psycopg2 >= 2.5 + {py36,py37,py38}-postgresql: psycopg2 >= 2.5 pypy3-postgresql: psycopg2cffi >= 2.5 + {py36}-sqlite: sqlitebck setenv = sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://} postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://} diff --git a/tryton.cfg b/tryton.cfg index de2aca6..abe0e2b 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=5.1.0 +version=5.0.0 depends: stock_lot extras_depend: