From 22f7ec5fc011430a4e4fe94bba049a918a11f5c8 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 17 Jan 2016 11:41:40 -0500
Subject: syntax error

---
 setup.py |  6 ++++--
 tox.ini  | 24 ++++++++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/setup.py b/setup.py
index f79b0e25..7faac7c7 100644
--- a/setup.py
+++ b/setup.py
@@ -57,12 +57,11 @@ else:
     requirements.append("cffi>=1.4.1")
     setup_requirements.append("cffi>=1.4.1")
 
-# If you add a new dep here you probably need to add it in the tox.ini as well
 test_requirements = [
     "pytest",
     "pretend",
     "iso8601",
-    "hypothesis",
+    "hypothesis>=1.11.4",
     "pyasn1_modules",
 ]
 
@@ -308,6 +307,9 @@ setup(
 
     install_requires=requirements,
     tests_require=test_requirements,
+    extras_require={
+        "test": test_requirements,
+    },
 
     # for cffi
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
index 6ad82856..d5a6f861 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,12 +4,8 @@ envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
 [testenv]
 # If you add a new dep here you probably need to add it in setup.py as well
 deps =
+    .[test]
     coverage
-    iso8601
-    pretend
-    pytest
-    hypothesis>=1.11.4
-    pyasn1_modules
     ./vectors
 passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME
 commands =
@@ -22,6 +18,15 @@ commands =
     coverage combine
     coverage report -m
 
+# 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())"
+    py.test --capture=no --strict {posargs}
+
 [testenv:docs]
 deps =
     doc8
@@ -46,15 +51,6 @@ 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]
-basepython = 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}
-
 [testenv:pep8]
 deps =
     flake8
-- 
cgit v1.2.3


From 3499d6dd025ddbb4b05ab12f8c74acf98430aa97 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 17 Jan 2016 11:41:53 -0500
Subject: more duplication reduction

---
 dev-requirements.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index b33b5e68..0ad5f927 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -3,17 +3,12 @@ coverage
 flake8
 flake8-import-order
 invoke
-iso8601
 pep8-naming
-pretend
-pyasn1_modules
-pytest
 requests
 sphinx
 sphinx_rtd_theme
 sphinxcontrib-spelling
 tox
 twine
-hypothesis
--e .
+-e .[test]
 -e vectors
-- 
cgit v1.2.3


From d9370a17753f6cf951202b7a88302de3b084e908 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 17 Jan 2016 11:45:26 -0500
Subject: Give up on tox

---
 tox.ini | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tox.ini b/tox.ini
index d5a6f861..6ad82856 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,12 @@ envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
 [testenv]
 # If you add a new dep here you probably need to add it in setup.py as well
 deps =
-    .[test]
     coverage
+    iso8601
+    pretend
+    pytest
+    hypothesis>=1.11.4
+    pyasn1_modules
     ./vectors
 passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME
 commands =
@@ -18,15 +22,6 @@ commands =
     coverage combine
     coverage report -m
 
-# 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())"
-    py.test --capture=no --strict {posargs}
-
 [testenv:docs]
 deps =
     doc8
@@ -51,6 +46,15 @@ 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]
+basepython = 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}
+
 [testenv:pep8]
 deps =
     flake8
-- 
cgit v1.2.3


From e74dc4ed8608d119881273b887b8c022128846d7 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 17 Jan 2016 11:46:25 -0500
Subject: add this back, we couldn't dedupe there

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 7faac7c7..ce04d2c9 100644
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,7 @@ else:
     requirements.append("cffi>=1.4.1")
     setup_requirements.append("cffi>=1.4.1")
 
+# If you add a new dep here you probably need to add it in the tox.ini as well
 test_requirements = [
     "pytest",
     "pretend",
-- 
cgit v1.2.3