aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-18 08:59:04 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-18 08:59:04 -0600
commit46950ab9bb7a0d96b2bfe7a21272f4fe0f072b38 (patch)
treeb7ea474d468ba7dea317918d90864d78c1c8b17b
parent191717ae354f0860b6c66850280faf93e3cb5401 (diff)
parentb638dba24e9b9b5b28d67b920466d4552410f629 (diff)
downloadcryptography-46950ab9bb7a0d96b2bfe7a21272f4fe0f072b38.tar.gz
cryptography-46950ab9bb7a0d96b2bfe7a21272f4fe0f072b38.tar.bz2
cryptography-46950ab9bb7a0d96b2bfe7a21272f4fe0f072b38.zip
Merge pull request #2675 from alex/further-reduce-duplication
Attempt to further reduce dependecy duplication
-rw-r--r--setup.py1
-rw-r--r--tox.ini7
2 files changed, 1 insertions, 7 deletions
diff --git a/setup.py b/setup.py
index ce04d2c9..7faac7c7 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,6 @@ 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",
diff --git a/tox.ini b/tox.ini
index 6ad82856..1c502d6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,14 +2,9 @@
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 =
coverage
- iso8601
- pretend
- pytest
- hypothesis>=1.11.4
- pyasn1_modules
+ .[test]
./vectors
passenv = ARCHFLAGS LDFLAGS CFLAGS INCLUDE LIB LD_LIBRARY_PATH USERNAME
commands =