docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,691 Commits 23 Branches 129 Tags 9.3 MiB
Commit Graph

18 Commits

Author SHA1 Message Date
Joffrey F c76a914e01 Only install ipaddress if python version < 3.3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-19 17:15:51 -07:00
Felix Yan cba2e973ec Require ipaddress on Python < 3.5 
Signed-off-by: Felix Yan <felixonmars@archlinux.org>
 2016-04-08 00:36:54 +08:00
Felix Yan 9da5493135 Use backports.ssl_match_hostname 
The py2-ipaddress module unfortunately conflicts with the pypi:ipaddress module, which is in the dependency tree of widely used pyOpenSSL. I think it would be a good idea to use a well maintained backport of the Python 3.5 implementation of match_hostname() instead of duplicating the effort and maintain another.

All tests are passing here.

Signed-off-by: Felix Yan <felixonmars@archlinux.org>
 2016-04-08 00:36:46 +08:00
Joffrey F 241793b101 Use pip environment markers for conditional dependencies 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 11:37:17 -07:00
Joffrey F b0e234eb0c Add py2-ipaddress dependency for python 2.x 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-29 17:06:36 -07:00
Trent Hauck 275b45ddef bump six req to >=1.4 2015-08-02 10:53:58 -07:00
Joffrey F 3170277347 Updated websocket-client dependency to latest version (now supports python 3) 2015-06-19 23:09:51 +02:00
Joffrey F 9bed480c27 Bump requests version 2015-03-04 16:29:44 -08:00
shin- 2d56149831 Separated test dependencies from runtime dependencies 2014-04-04 16:41:26 +02:00
Darren Shepherd 31f48d718d Update to requests==2.2.1 2014-01-27 09:09:16 -07:00
Roman Rader 9787c004e5 "six" dependency fixed to greater-or-equal 2013-12-30 17:49:43 +02:00
shin- 0901b28957 Merge branch 'attach-websocket' of github.com:aanand/docker-py into aanand-attach-websocket 
Conflicts:
	docker/client.py
 2013-11-08 19:03:43 +01:00
shin- 0808905636 Refactoring, Python 3 compatibility, Tests working with python 3, cleaned up imports. 2013-10-15 19:19:20 +02:00
Aanand Prasad c2d867b117 Implement attach_websocket() for attaching with WebSockets instead of HTTP streaming 2013-10-03 14:44:33 +01:00
Deni Bertovic 320fcdeed9 added mock to requirements 2013-10-03 11:51:12 +02:00
Rob Terhaar d3edaa7a14 pip needs "==" 2013-07-13 19:42:13 -04:00
Mike Neilsen 5bf0625a7a Add six==1.3.0 to requirements.txt 
Signed-off-by: Mike Neilsen <mneilsen@acm.org>
 2013-07-13 01:04:39 -05:00
shin- f2bcd532d7 Added requirements file 2013-06-06 09:05:19 -07:00