summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-08-27 17:32:38 -0400
committerGitHub <noreply@github.com>2020-08-27 16:32:38 -0500
commit761e9aa9901fbce8ea5d020ee9ebb6375e01b842 (patch)
tree3e0e56062f10f3f2f32fb9017e3cf57b098d941a
parentc2624de7ee23493c9f2a98271e16cf0f0a6cf2bc (diff)
downloadcryptography-761e9aa9901fbce8ea5d020ee9ebb6375e01b842.tar.gz
re-enable paramiko downstream testing (#5436)
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 103c2f835..44a7ea0e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,10 +118,8 @@ matrix:
env: DOWNSTREAM=pyopenssl
- python: 3.7
env: DOWNSTREAM=twisted OPENSSL=1.1.1g
- # Temporary disabled until
- # https://github.com/paramiko/paramiko/pull/1723 is merged
- # - python: 2.7
- # env: DOWNSTREAM=paramiko
+ - python: 2.7
+ env: DOWNSTREAM=paramiko
- python: 3.7
env: DOWNSTREAM=aws-encryption-sdk
- python: 3.7