docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If we're pinning exact versions of things for requirements.txt, pin 

all dependencies of dependencies as well so we can get a consistent build.

Signed-off-by: cyli <cyli@twistedmatrix.com>
This commit is contained in:
cyli 2017-05-22 15:45:06 -07:00 committed by Joffrey F
parent 3b95da3ea4
commit c163375591
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
requirements.txt
View File

@ -1,6 +1,16 @@
requests[security]==2.11.1 appdirs==1.4.3
six>=1.4.0 asn1crypto==0.22.0
websocket-client==0.32.0 backports.ssl-match-hostname==3.5.0.1
backports.ssl_match_hostname>=3.5 ; python_version < '3.5' cffi==1.10.0
ipaddress==1.0.16 ; python_version < '3.3' cryptography==1.9
docker-pycreds==0.2.1 docker-pycreds==0.2.1
enum34==1.1.6
idna==2.5
ipaddress==1.0.18
packaging==16.8
pycparser==2.17
pyOpenSSL==17.0.0
pyparsing==2.2.0
requests==2.14.2
six==1.10.0
websocket-client==0.40.0

6
setup.py
View File

@ -36,10 +36,10 @@ extras_require = {
# ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname # ServerAltname: https://pypi.python.org/pypi/backports.ssl_match_hostname
':python_version < "3.3"': 'ipaddress >= 1.0.16', ':python_version < "3.3"': 'ipaddress >= 1.0.16',
# If using docker-py over TLS, highly recommend this option is pip-installed # If using docker-py over TLS, highly recommend this option is
# or pinned. # pip-installed or pinned.
# TODO: if pip installign both "requests" and "requests[security]", the # TODO: if pip installing both "requests" and "requests[security]", the
# extra package from the "security" option are not installed (see # extra package from the "security" option are not installed (see
# https://github.com/pypa/pip/issues/4391). Once that's fixed, instead of # https://github.com/pypa/pip/issues/4391). Once that's fixed, instead of
# installing the extra dependencies, install the following instead: # installing the extra dependencies, install the following instead: