Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump requests version to 2.20.1 #3797

Merged
merged 3 commits into from
Dec 4, 2018
Merged

Bump requests version to 2.20.1 #3797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dcec9f
Bump requests version to 2.20.1
hush-hush Dec 3, 2018
b5d481b
bump urllib
arbll Dec 4, 2018
ca79233
remove outdated comment
arbll Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions tests/core/test_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down