fixes

twisted · Sep 4, 2015 · 302a217 · 302a217
1 parent 93f98ac
commit 302a217
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,7 @@ sudo: false
 language: python
 python: 2.7
 
-cache:
-  directories:
-    - $HOME/.cache/pip
+cache: false
 
 env:
   - TOX_ENV=pypy-twisted_13.2.0-pyopenssl_0.13.1
@@ -83,18 +81,6 @@ matrix:
   allow_failures:
     - env: TOX_ENV=pypy-twisted_trunk-pyopenssl_trunk
     - env: TOX_ENV=py27-twisted_trunk-pyopenssl_trunk
-    - env: TOX_ENV=pypy-twisted_13.2.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_13.2.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_14.0.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_14.0.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_15.0.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_15.0.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_15.1.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_15.1.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_15.3.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_15.3.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_current-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_current-pyopenssl_0.15.1
 
 branches:
   only:

diff --git a/tox.ini b/tox.ini
@@ -21,6 +21,9 @@ deps =
     pyopenssl_0.14: pyopenssl==0.14
     pyopenssl_0.15.1: pyopenssl==0.15.1
     pyopenssl_trunk: https://github.com/pyca/pyopenssl/archive/master.zip
+
+    ; Because Travis' pypy only works with old Cryptography
+    pypy: cryptography == 0.9
 passenv = TERM  # ensure colors
 commands =
     coverage run --branch --source=treq {envbindir}/trial {posargs:treq}

diff --git a/tox2travis.py b/tox2travis.py
@@ -12,9 +12,7 @@
 language: python
 python: 2.7
 
-cache:
-  directories:
-    - $HOME/.cache/pip
+cache: false
 
 env:
   {envs}
@@ -36,18 +34,6 @@
   allow_failures:
     - env: TOX_ENV=pypy-twisted_trunk-pyopenssl_trunk
     - env: TOX_ENV=py27-twisted_trunk-pyopenssl_trunk
-    - env: TOX_ENV=pypy-twisted_13.2.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_13.2.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_14.0.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_14.0.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_15.0.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_15.0.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_15.1.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_15.1.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_15.3.0-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_15.3.0-pyopenssl_0.15.1
-    - env: TOX_ENV=pypy-twisted_current-pyopenssl_0.14
-    - env: TOX_ENV=pypy-twisted_current-pyopenssl_0.15.1
 
 branches:
   only: