Bump requests version to 2.20.1 (#3797)

Author: hush-hush

requirements.txt

@@ -31,14 +31,12 @@ python-etcd==0.4.5
 pyyaml==3.11
 # note: requests is also used in many checks
 # upgrade with caution
-requests==2.20.0
-# We need to pin this explicitely because both python-etcd and requests depend on urllib3
-# but even though requests pins urllib3 < 1.24, python-etcd does not and pip installs the latest anyway.
-urllib3==1.23
+requests==2.20.1
+urllib3==1.24.1
 # note: simplejson is used in many checks to inteface APIs
 simplejson==3.6.5
 supervisor==3.3.3
 tornado==3.2.2
 uptime==3.0.1
 prometheus-client==0.1.0
-distro==1.3.0
+distro==1.3.0

tests/core/test_proxy.py

@@ -57,7 +57,9 @@ def test_no_proxy(self):
             'https': 'http://localhost:3128',
             'no': '127.0.0.1,localhost,169.254.169.254'
         }
+
         environ_proxies = get_environ_proxies("https://www.google.com")
+        environ_proxies.pop('travis_apt', None)
         self.assertEquals(expected_proxies, environ_proxies, (expected_proxies, environ_proxies))
 
         # Clear the env variables set