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

87 Commits

Author SHA1 Message Date
Joffrey F 479f13eff1 Add paramiko requirement for SSH transport 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-01 15:24:22 -07:00
Joffrey F 609045f343 Bump pyopenssl to prevent installation of vulnerable version 
CVE refs:
CVE-2018-1000807
CVE-2018-1000808

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-17 13:52:39 -07:00
Joffrey F d7bb808ca6 Update deps for 3.3 & 3.7 support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-18 19:21:54 -07:00
Joffrey F f1189bfb4b Allow passing of env overrides to credstore through APIClient ctor 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-06-08 15:43:58 -07:00
Joffrey F accb9de52f Remove obsolete docker-py check in setup.py 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-25 14:49:18 -07:00
Joffrey F e1ab5457ca Bump docker-pycreds dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-25 14:17:24 -07:00
Joffrey F 1d6f8ecf92 Support absolute paths for in-context Dockerfiles 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-04-12 13:22:47 -07:00
Joffrey F 15ae1f09f8 Bump docker-pycreds to 0.2.2 (pass support) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-02-14 16:02:04 -08:00
Joffrey F a5490ad0be Fix appveyor tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-26 13:44:31 -08:00
Joffrey F 0acef5f6d2 Add Python 3.6 testing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-22 18:08:01 -08:00
timvisee ff86324c4f
Require at least requests v2.14.2 to fix chardet 
Signed-off-by: timvisee <timvisee@gmail.com>
 2017-11-02 14:30:18 +01:00
cyli c163375591 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>
 2017-08-15 15:45:51 -07:00
cyli 3b95da3ea4 Require "requests[security]" if the `[tls]` option is selected, which also installs: 
pyOpenSSL, cryptography, idna

and installs cryptography's version of openssl in Mac OS (which by default has an
ancient version of openssl that doesn't support TLS 1.2).

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2017-08-15 15:45:51 -07:00
Matt Oberle ae1f596d37 excludes requests 2.18.0 from compatible versions 
The 2.18.0 version of requests breaks compatibility with docker-py:
https://github.com/requests/requests/issues/4160

[This block](https://github.com/shazow/urllib3/blob/master/urllib3/connectionpool.py#L292) of code from urllib3 fails:
```python
    def _get_timeout(self, timeout):
        """ Helper that always returns a :class:`urllib3.util.Timeout` """
        if timeout is _Default:
            return self.timeout.clone()

        if isinstance(timeout, Timeout):
            return timeout.clone()
        else:
            # User passed us an int/float. This is for backwards compatibility,
            # can be removed later
            return Timeout.from_float(timeout)
```

In the case of requests version 2.18.0:
`timeout` was an instance of `urllib3.util.timeout.Timeout`
`Timeout` was an instance of `requests.packages.urllib3.util.timeout.Timeout`

When the `isinstance(timeout, Timeout)` check fails the `urllib3.util.timeout.Timeout` object is passed as the `connection` argument to `requests.packages.urllib3.util.timeout.Timeout.from_float`.

Signed-off-by: Matt Oberle <matt.r.oberle@gmail.com>
 2017-06-14 14:44:56 -04:00
Joffrey F e9691db91b Prevent issues when installing docker and docker-py in the same environment 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-18 16:26:22 -08:00
Joffrey F 176346bd95 Exclude requests==2.12.2 from dependencies 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-30 15:23:41 -08:00
Joffrey F f051f7e90a Merge pull request #1314 from bfirsh/specify-encoding-for-readme 
Specify encoding when loading readme
 2016-11-28 11:33:43 -08:00
Ben Firshman 6d770a65d7
Use find_packages in setup.py 
It was missing docker.models, and this will fix it forever more.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 15:11:01 +00:00
Ben Firshman 04e9437986
Update setup.py details 
Move from "docker-py" package to "docker".

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 15:11:01 +00:00
Ben Firshman a658e14e8b
Specify encoding when loading readme 
Loading readme fails when system locale is not utf-8.

Potentially replaces #1313

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 14:38:38 +00:00
Ben Firshman d5bc7dc99a
Drop support for Python 2.6 
Because it's ancient. If you're still using it, you can use an old
version of docker-py.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 17:03:03 +00:00
Ben Firshman b49cacced0
Make docker.utils.ports a single file 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 17:03:03 +00:00
Ben Firshman 19eefcf705
Make docker.ssladaptor a single file 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 17:03:03 +00:00
Ben Firshman 2c9d1110f0
Make docker.auth a single file 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 17:03:03 +00:00
Joffrey F 9a10447b40 Merge pull request #1242 from YorikSar/master 
Support requests versions from 2.11.1 onwards
 2016-10-14 16:56:45 -07:00
Joffrey F f4cb91eb02 Add missing long_description and maintainer fields to setup.py 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-05 15:27:36 -07:00
Tomas Tomecek aa2bd80ebb document requirement for ipaddress module 
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-10-05 09:32:33 +02:00
Yuriy Taraday b00e321b58 Support requests versions from 2.11.1 onwards 
Bug #1155 has been fixed starting with requests 2.11.1 and excluding it
from dependencies causes failures when using latest versions of both
libs together in our project.

Signed-off-by: Yuriy Taraday <yorik.sar@gmail.com>
 2016-10-03 18:46:28 +03:00
Joffrey F 2ad403c78b Bump docker-pycreds dependency ; bump patch number 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-11 19:01:39 -07:00
Joffrey F 219a8699f9 Better credentials store error handling in resolve_authconfig 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-06 15:17:36 -07:00
Joffrey F fbe1686e62 Add credentials store support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-06 15:17:36 -07:00
Joffrey F 97094e4ea3 New docker.types subpackage containing advanced config dictionary types 
Tests and docs updated to match
docker.utils.types has been moved to docker.types

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-19 16:51:13 -07:00
Joffrey F 95d9306d2a Exclude requests 2.11 from setup.py to work around unicode bug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-08-17 12:20:13 -07:00
Joffrey F b5d9312f9a npipe support cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 17:59:50 -07:00
Joffrey F 4a8832ca8b pypiwin32 added to requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-02 17:59:50 -07:00
Thomas Grainger e0b9cb2a8c
support Python 3.5 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2016-05-19 17:59:34 +01:00
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
Aanand Prasad 26cd4d6f2e Fix py2-ipaddress dependency 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-31 18:22:18 +01: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
Joffrey F ae6069eea7 Drop support for python 3.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-20 12:02:14 -08:00
Darren Shepherd 10055eb9dd Add docker.api to setup packages 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-09-22 16:08:33 -07:00
Trent Hauck 275b45ddef bump six req to >=1.4 2015-08-02 10:53:58 -07:00
Joffrey F b60d57b67b websocket-client for all versions 2015-07-08 15:18:04 -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 ee096c867f Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into luzfcb-patch-1 
Conflicts:
	setup.py
 2015-04-22 11:16:44 -07:00
Yuval Kohavi 8028c988ce added ports to setup.py 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-04-08 11:00:25 +03:00
Fábio C. Barrionuevo da Luz f588831a88 added URL for this project in setup configuration 2015-03-31 23:03:55 -03:00
Joffrey F 9bed480c27 Bump requests version 2015-03-04 16:29:44 -08:00