From 667700354c2b59ed6ab4f917d4ee834412404aec Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 1 Nov 2015 10:03:30 -0500
Subject: Attempt to enable coverage on pypy

---
 tox.ini | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 63f1e4bd..9ce86e4f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,14 +46,6 @@ basepython = python2.7
 commands =
     sphinx-build -W -b linkcheck docs docs/_build/html
 
-# Temporarily disable coverage on pypy because of performance problems with
-# coverage.py on pypy.
-[testenv:pypy]
-commands =
-    pip list
-    python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())"
-    py.test --capture=no --strict {posargs}
-
 # Temporarily disable coverage on pypy3 because of performance problems with
 # coverage.py on pypy3.
 [testenv:pypy3]
-- 
cgit v1.2.3


From cfd90a268cfd92afa0c820ef276c3a7ecbc4bc05 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 1 Nov 2015 10:13:55 -0500
Subject: Drop pypy3, we don't run it in CI, and we won't run it again until
 these issues are resolved

---
 tox.ini | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 9ce86e4f..db09d8b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,14 +46,6 @@ basepython = python2.7
 commands =
     sphinx-build -W -b linkcheck docs docs/_build/html
 
-# Temporarily disable coverage on pypy3 because of performance problems with
-# coverage.py on pypy3.
-[testenv:pypy3]
-commands =
-    pip list
-    python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())"
-    py.test --capture=no --strict {posargs}
-
 [testenv:pep8]
 deps =
     flake8
-- 
cgit v1.2.3


From 1dafc3f9b6e7f2743d1acad876a960c9d6885a80 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 3 Jan 2016 21:09:22 -0600
Subject: add a pypy-nocoverage target and use that on OS X

---
 tox.ini | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index db09d8b8..af8217b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,6 +46,14 @@ basepython = python2.7
 commands =
     sphinx-build -W -b linkcheck docs docs/_build/html
 
+# This target disables coverage on pypy because of performance problems with
+# coverage.py on pypy.
+[testenv:pypy-nocoverage]
+commands =
+    pip list
+    python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())"
+    py.test --capture=no --strict {posargs}
+
 [testenv:pep8]
 deps =
     flake8
-- 
cgit v1.2.3


From 030c4ac7fe5a37aa9d3000af97ab4fd4a4dbad56 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 3 Jan 2016 21:22:05 -0600
Subject: add missing basepython

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index af8217b4..2c5a1331 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,6 +49,7 @@ commands =
 # This target disables coverage on pypy because of performance problems with
 # coverage.py on pypy.
 [testenv:pypy-nocoverage]
+basepython = pypy
 commands =
     pip list
     python -c "from cryptography.hazmat.backends.openssl.backend import backend; print(backend.openssl_version_text())"
-- 
cgit v1.2.3