From 55a8e8e452decb768c1923d58659e5cc7d3a51da Mon Sep 17 00:00:00 2001 From: Kodi Arfer Date: Fri, 18 Aug 2017 12:17:19 -0700 Subject: [PATCH 1/3] Require a sufficiently recent version of pytest --- .travis.yml | 1 - requirements-dev.txt | 4 ++-- requirements-travis.txt | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d710d11..5c2bb43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ python: - "3.6" - pypy install: - - pip install --upgrade pytest - pip install -r requirements-travis.txt - pip install -e . script: pytest diff --git a/requirements-dev.txt b/requirements-dev.txt index 4e197a9..4381487 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,9 +1,9 @@ -r requirements-travis.txt + # test tools -pytest tox # documentation -Pygments>=1.6 +Pygments >= 1.6 Sphinx sphinx_rtd_theme diff --git a/requirements-travis.txt b/requirements-travis.txt index 80be0ce..cfc7872 100644 --- a/requirements-travis.txt +++ b/requirements-travis.txt @@ -1,3 +1,5 @@ +pytest >= 3.2.1 + # code quality flake8 coverage From 02881cf813a9e1e21eee83e2e77e48d2d7ec4c99 Mon Sep 17 00:00:00 2001 From: Kodi Arfer Date: Fri, 18 Aug 2017 12:06:49 -0700 Subject: [PATCH 2/3] Test PyPy3 on Travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5c2bb43..7a10e06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: - "3.5" - "3.6" - pypy + - pypy3 install: - pip install -r requirements-travis.txt - pip install -e . From 12ba5cc44f6efd3faa457a0d1b24d6b215ba4cc7 Mon Sep 17 00:00:00 2001 From: Kodi Arfer Date: Fri, 18 Aug 2017 13:44:00 -0700 Subject: [PATCH 3/3] Test PyPy3 in Tox --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8d38373..1f5be88 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,pypy,py34,py35,py36,flake8 +envlist = py27,pypy,py34,py35,py36,pypy3,flake8 skipsdist = True [testenv]