[tor-commits] [bridgedb/master] Update Twisted and PyOpenSSL dependency versions, also for CI.

[isis at torproject.org]

commit 0ae12639cfb045763241454c803ff0d8ded4f58d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Jul 21 19:13:35 2017 +0000

    Update Twisted and PyOpenSSL dependency versions, also for CI.
    
     * FIXES #22998: https://bugs.torproject.org/22998
---
 .travis.yml      | 20 +++++++++++++-------
 requirements.txt |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4717c23..9fb68f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,22 +35,28 @@ env:
     #     https://github.com/pypa/virtualenv/issues/459
     - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)"
   matrix:
-    # Debian Jessie
-    - TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14
+    # What we're running on polyanthum
+    - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
     # Debian Stretch
-    - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.0.0
+    - TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+    # Debian experimental (all other versions of Debian have the same dependency versions right now)
+    - TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0
 
 matrix:
   include:
     - python: "pypy"
-      env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14
+      env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
     - python: "pypy"
-      env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.0.0
+      env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
   allow_failures:
+    - python: "2.7"
+      env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
+    - python: "2.7"
+      env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=16.2.0
     - python: "pypy"
-      env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14
+      env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.2.0
     - python: "pypy"
-      env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=16.0.0
+      env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=16.2.0
   fast_finish: true
 
 before_install:
diff --git a/requirements.txt b/requirements.txt
index 26c2c1a..644de6c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 Babel==0.9.6
 BeautifulSoup==3.2.1
 Mako==0.8.1
-Twisted==14.0.2
+Twisted==16.1.1
 ipaddr==2.1.11
 pycrypto==2.6.1
-pyOpenSSL==0.14
+pyOpenSSL==16.2.0
 pygeoip==0.2.7
 gnupg==2.0.1
 pillow>=2.6.1