From 96338b72a9255ef4920b92a9c5b829251afbe47f Mon Sep 17 00:00:00 2001 From: Mikhail Krivushin Date: Mon, 14 Sep 2020 16:09:27 +0400 Subject: [PATCH 1/3] remove tox 2.7 --- {tests3k => tests}/test_async.py | 0 tox.ini | 27 +-------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) rename {tests3k => tests}/test_async.py (100%) diff --git a/tests3k/test_async.py b/tests/test_async.py similarity index 100% rename from tests3k/test_async.py rename to tests/test_async.py diff --git a/tox.ini b/tox.ini index 491d410..f05606d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,33 +1,8 @@ [tox] -envlist = py27,py35,py36,py37 +envlist = py37,py38 whitelist_externals = {toxinidir}/utests.py [testenv] -deps= - pytest - unittest2 - flake8 - pylint - pymongo - python-dateutil -commands= - python -m pytest {toxinidir}/tests - - -[testenv:py36] -deps= - flake8 - pylint - pymongo - python-dateutil - pytest - pytest-cov - pytest-asyncio -commands= - python -m pytest --cov=trafaret {toxinidir}/tests {toxinidir}/tests3k - flake8 trafaret - -[testenv:py37] deps= pyannotate flake8 From e94b445e64c8db70f32f9c0a17f244e6b1258b8f Mon Sep 17 00:00:00 2001 From: Mikhail Krivushin Date: Mon, 14 Sep 2020 16:21:47 +0400 Subject: [PATCH 2/3] circle --- .circleci/config.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0a58a4..c22252c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,9 +4,9 @@ jobs: # using tox toxify: docker: - - image: circleci/python:3.6.6 + - image: circleci/python:3.8.5 environment: - TOXENV: py27,py35,py36 + TOXENV: py37,py38 steps: &toxsteps - checkout - restore_cache: @@ -22,12 +22,6 @@ jobs: key: pip_cache_{{ checksum "setup.py" }} paths: - "~/project/.tox" - toxify3.7: - docker: - - image: circleci/python:3.7-rc - environment: - TOXENV: py37 - steps: *toxsteps workflows: version: 2 @@ -35,4 +29,3 @@ workflows: build: jobs: - toxify - - toxify3.7 From 71177625575e0f8132724fb6824f8e0e470c4faf Mon Sep 17 00:00:00 2001 From: Mikhail Krivushin Date: Mon, 14 Sep 2020 17:28:13 +0400 Subject: [PATCH 3/3] no3ktests --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index f05606d..efc1abf 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps= pytest-cov pytest-asyncio commands= - python -m pytest --cov=trafaret {toxinidir}/tests {toxinidir}/tests3k + python -m pytest --cov=trafaret {toxinidir}/tests flake8 trafaret [flake8]