diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 880c321..1d3b930 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,20 +3,20 @@ stages: - build - deploy -test:py35-sqlite: +test:py37-sqlite: stage: test - image: python:3.5 + image: python:3.7 variables: CFLAGS: "-O0" DB_CACHE: "~/cache" TOX_TESTENV_PASSENV: "CFLAGS DB_CACHE" script: - pip install tox - - tox -e py35-sqlite + - tox -e py37-sqlite -test:py35-postgresql: +test:py37-postgresql: stage: test - image: python:3.5 + image: python:3.7 tags: - postgres services: @@ -30,4 +30,4 @@ test:py35-postgresql: POSTGRESQL_URI: "postgresql://postgres:@postgres:5432/" script: - pip install tox - - tox -e py35-postgresql + - tox -e py37-postgresql diff --git a/setup.py b/setup.py index b871d35..829d5f1 100644 --- a/setup.py +++ b/setup.py @@ -41,11 +41,7 @@ name = 'kopen_web_shop_woocommerce' requires = ['WooCommerce'] for dep in info.get('depends', []): - if dep == 'web_shop': - requires.append('trytond_%(dep)s @ https://gitlab.com/kopen/' - '%(dep)s/-/archive/master/%(dep)s-master.zip' - % {'dep': dep}) - elif not re.match(r'(ir|res)(\W|$)', dep): + 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')) @@ -104,7 +100,6 @@ setup(name=name, 'Natural Language :: Turkish', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', @@ -113,7 +108,7 @@ setup(name=name, 'Topic :: Office/Business', ], license='GPL-3', - python_requires='>=3.5', + python_requires='>=3.6', install_requires=requires, dependency_links=dependency_links, zip_safe=False, diff --git a/tox.ini b/tox.ini index 711ba8b..601a866 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,12 @@ [tox] -envlist = {py35,py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql} +envlist = {py36,py37,py38}-{sqlite,postgresql},pypy3-{sqlite,postgresql} [testenv] commands = {envpython} setup.py test deps = - {py35,py36,py37,py38}-postgresql: psycopg2 >= 2.5 + {py36,py37,py38}-postgresql: psycopg2 >= 2.5 pypy3-postgresql: psycopg2cffi >= 2.5 - {py35,py36}-sqlite: sqlitebck + 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 5bfc98a..c202683 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=5.6.0 +version=5.8.0 depends: ir account_product