diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-10-14 16:56:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 16:56:45 -0700 |
| commit | 9a10447b40d74e124c4de9bd2db45397dcd08f0f (patch) | |
| tree | 28b88aae917c4beec84eec2c82d0dd2dd2c7ba16 | |
| parent | 9fc06b197b9302267dea60e6cad1ce19731a4104 (diff) | |
| parent | b00e321b589c1c9ade22a670c3517cc68f892cfc (diff) | |
| download | docker-py-9a10447b40d74e124c4de9bd2db45397dcd08f0f.tar.gz | |
Merge pull request #1242 from YorikSar/master
Support requests versions from 2.11.1 onwards
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index 1e52846..3754131 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -requests==2.5.3 +requests==2.11.1 six>=1.4.0 websocket-client==0.32.0 backports.ssl_match_hostname>=3.5 ; python_version < '3.5' ipaddress==1.0.16 ; python_version < '3.3' -docker-pycreds==0.2.1
\ No newline at end of file +docker-pycreds==0.2.1 @@ -9,7 +9,7 @@ ROOT_DIR = os.path.dirname(__file__) SOURCE_DIR = os.path.join(ROOT_DIR) requirements = [ - 'requests >= 2.5.2, < 2.11', + 'requests >= 2.5.2, != 2.11.0', 'six >= 1.4.0', 'websocket-client >= 0.32.0', 'docker-pycreds >= 0.2.1' |