From b6a073d6ac2c2c93c80b9e7335d9a25e9737097b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksi=20H=C3=A4kli?= <aleksi.hakli@iki.fi>
Date: Sat, 23 Feb 2019 20:53:15 +0200
Subject: [PATCH] Add PyPy test matrix support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aleksi Häkli <aleksi.hakli@iki.fi>
---
 .travis.yml      | 4 ++++
 requirements.txt | 2 +-
 tox.ini          | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 156f821..c4af49f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ dist: xenial
 language: python
 cache: pip
 python:
+  - pypy3.5
   - 3.5
   - 3.6
   - 3.7
@@ -12,6 +13,8 @@ env:
   - DJANGO=master
 matrix:
   exclude:
+    - python: pypy3.5
+      env: DJANGO=master
     - python: 3.5
       env: DJANGO=master
   allow_failures:
@@ -19,6 +22,7 @@ matrix:
       env: DJANGO=master
     - python: 3.7
       env: DJANGO=master
+  fast_finish: true
 install: pip install tox-travis codecov
 script: tox
 after_success:
diff --git a/requirements.txt b/requirements.txt
index 8b0dc6c..bbed1ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 -e .
 coverage==4.5.2
-mypy==0.670
+mypy==0.670 ; platform_python_implementation != 'PyPy'
 prospector==1.1.6.2
 pytest==4.3.0
 pytest-cov==2.6.1
diff --git a/tox.ini b/tox.ini
index 41cbb02..fecbe83 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,11 @@
 [tox]
 envlist =
-    py{35,36,37}-django{111,20,21}
+    py{py3,35,36,37}-django{111,20,21}
     py{36,37}-djangomaster
 
 [travis]
 python =
+    pypy3.5: pypy3
     3.5: py35
     3.6: py36
     3.7: py37
@@ -27,6 +28,6 @@ usedevelop = True
 commands =
     pytest
     prospector
-    mypy axes
+    py{35,36,37}: mypy axes
 setenv =
     PYTHONDONTWRITEBYTECODE=1