Merge branch 'master' into fake-treq

Conflicts: requirements-dev.txt setup.py
twisted · Jul 9, 2015 · cc9196c · cc9196c
2 parents 75b49b1 + e03b370
commit cc9196c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ coverage
 htmlcov
 _trial_temp
 .tox
+_trial_temp.lock
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,5 @@
-Twisted>=13.2.0
+-e .
 pyflakes
 pep8
 sphinx
 mock
-requests>=2.1.0
-six
diff --git a/setup.py b/setup.py
@@ -27,8 +27,11 @@
     version=__version__,
     packages=find_packages(),
     install_requires=[
-        "Twisted >= 13.2.0", "requests >= 2.1.0", "service_identity",
-        "pyOpenSSL >= 0.11", "six"
+        "Twisted >= 13.2.0",
+        "pyOpenSSL",
+        "requests >= 2.1.0",
+        "service_identity",
+        "six"
     ],
     package_data={"treq": ["_version"]},
     author="David Reid",