Upgrade to Ubuntu 20.04, PyPy 3.6 and CPython 3.9 final

urllib3 · Nov 12, 2020 · deb21b6 · deb21b6
1 parent 087d4de
commit deb21b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 os: linux
-dist: xenial
+dist: focal
 
 before_install:
   - env
@@ -43,13 +43,13 @@ jobs:
       env: NOX_SESSION=test-3.7
     - python: 3.8
       env: NOX_SESSION=test-3.8
-    - python: 3.9-dev
+    - python: 3.9
       env: NOX_SESSION=test-3.9
     - python: nightly
       env: NOX_SESSION=test-3.10
-    - python: pypy2.7-6.0
+    - python: pypy2.7-7.3.1
       env: NOX_SESSION=test-pypy
-    - python: pypy3.5-6.0
+    - python: pypy3.6-7.3.1
       env: NOX_SESSION=test-pypy
 
     # Extras

diff --git a/src/urllib3/util/ssl_.py b/src/urllib3/util/ssl_.py
@@ -393,7 +393,7 @@ def ssl_wrap_socket(
     try:
         if hasattr(context, "set_alpn_protocols"):
             context.set_alpn_protocols(ALPN_PROTOCOLS)
-    except NotImplementedError:
+    except NotImplementedError:  # Defensive: in CI, we always have set_alpn_protocols
         pass
 
     # If we detect server_hostname is an IP address then the SNI