summaryrefslogtreecommitdiff
path: root/setup.py
Commit message (Collapse)AuthorAgeFilesLines
* Add Python 3.6 testingpython3.6Joffrey F2018-01-221-0/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Require at least requests v2.14.2 to fix chardettimvisee2017-11-021-1/+1
| | | | Signed-off-by: timvisee <timvisee@gmail.com>
* If we're pinning exact versions of things for requirements.txt, pincyli2017-08-151-3/+3
| | | | | | all dependencies of dependencies as well so we can get a consistent build. Signed-off-by: cyli <cyli@twistedmatrix.com>
* Require "requests[security]" if the `[tls]` option is selected, which also ↵cyli2017-08-151-0/+10
| | | | | | | | | | | 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>
* excludes requests 2.18.0 from compatible versionsMatt Oberle2017-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Prevent issues when installing docker and docker-py in the same environment1395-docker-py-conflictJoffrey F2017-01-181-0/+10
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Exclude requests==2.12.2 from dependenciesrequests_2.12.2Joffrey F2016-11-301-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #1314 from bfirsh/specify-encoding-for-readmeJoffrey F2016-11-281-1/+2
|\ | | | | Specify encoding when loading readme
| * Specify encoding when loading readmeBen Firshman2016-11-281-1/+2
| | | | | | | | | | | | | | | | Loading readme fails when system locale is not utf-8. Potentially replaces #1313 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Use find_packages in setup.pyBen Firshman2016-11-281-5/+2
| | | | | | | | | | | | It was missing docker.models, and this will fix it forever more. Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* | Update setup.py detailsBen Firshman2016-11-281-4/+4
|/ | | | | | Move from "docker-py" package to "docker". Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Drop support for Python 2.6Ben Firshman2016-11-221-1/+0
| | | | | | | 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>
* Make docker.utils.ports a single fileBen Firshman2016-11-221-1/+1
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Make docker.ssladaptor a single fileBen Firshman2016-11-221-1/+1
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Make docker.auth a single fileBen Firshman2016-11-221-3/+2
| | | | Signed-off-by: Ben Firshman <ben@firshman.co.uk>
* Merge pull request #1242 from YorikSar/masterJoffrey F2016-10-141-1/+1
|\ | | | | Support requests versions from 2.11.1 onwards
| * Support requests versions from 2.11.1 onwardsYuriy Taraday2016-10-031-1/+1
| | | | | | | | | | | | | | | | 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>
* | Add missing long_description and maintainer fields to setup.pysetup-py-fixesJoffrey F2016-10-051-0/+12
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | document requirement for ipaddress moduleTomas Tomecek2016-10-051-0/+3
|/ | | | Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* Bump docker-pycreds dependency ; bump patch numberJoffrey F2016-09-111-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Better credentials store error handling in resolve_authconfigcredstore-supportJoffrey F2016-09-061-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add credentials store supportJoffrey F2016-09-061-0/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* New docker.types subpackage containing advanced config dictionary typesJoffrey F2016-08-191-1/+2
| | | | | | | Tests and docs updated to match docker.utils.types has been moved to docker.types Signed-off-by: Joffrey F <joffrey@docker.com>
* Exclude requests 2.11 from setup.py to work around unicode bugJoffrey F2016-08-171-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* npipe support cleanupJoffrey F2016-06-021-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* pypiwin32 added to requirementsJoffrey F2016-06-021-0/+6
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* support Python 3.5Thomas Grainger2016-05-191-0/+4
| | | | Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
* Only install ipaddress if python version < 3.3felixonmars-backportsJoffrey F2016-04-191-2/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Require ipaddress on Python < 3.5Felix Yan2016-04-081-0/+1
| | | | Signed-off-by: Felix Yan <felixonmars@archlinux.org>
* Use backports.ssl_match_hostnameFelix Yan2016-04-081-1/+1
| | | | | | | | 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>
* Fix py2-ipaddress dependencyAanand Prasad2016-03-311-2/+4
| | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Add py2-ipaddress dependency for python 2.xJoffrey F2016-03-291-0/+3
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Drop support for python 3.2py32_deprecationJoffrey F2016-01-201-1/+0
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Add docker.api to setup packagesDarren Shepherd2015-09-221-2/+2
| | | | Signed-off-by: Darren Shepherd <darren@rancher.com>
* bump six req to >=1.4Trent Hauck2015-08-021-1/+1
|
* websocket-client for all versions1.3.0-releaseJoffrey F2015-07-081-3/+1
|
* Updated websocket-client dependency to latest version (now supports python 3)Joffrey F2015-06-191-1/+1
|
* Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into ↵Joffrey F2015-04-221-2/+5
|\ | | | | | | | | | | | | luzfcb-patch-1 Conflicts: setup.py
| * added URL for this project in setup configurationFábio C. Barrionuevo da Luz2015-03-311-0/+1
| |
* | added ports to setup.pyYuval Kohavi2015-04-081-1/+1
|/ | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* Bump requests versionJoffrey F2015-03-041-1/+1
|
* urllib3/requests issuesJoffrey F2015-01-091-1/+1
|
* Resolves #101, don't use pinned dependencies.Daniel Nephin2014-08-081-7/+10
| | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Merge branch 'master' into momer-tlsJoffrey F2014-07-101-0/+1
|\ | | | | | | | | Conflicts: docker/client.py
| * Added support for Python 3.4 in setup.py classifiersJoffrey F2014-06-231-0/+1
| |
* | * Merge branch 'tls' of github.com:momer/docker-py into momer-tlsJoffrey F2014-06-231-1/+2
|\ \ | |/ |/| | | | | | | | | * Exported TLS configuration in tls.TLSConfig * Merged exceptions packagee into pre-existing errors module * Flake8 fixes * Bug fixes
| * Expanding on @denibertovic initial additions, we now have full support for ↵Mo Omer2014-05-131-1/+1
| | | | | | | | SSL in docker-py. Including the ability to specify the expected SSL Version for issues with OpenSSL sslv3/tls1 recognition issues. Added an exception class for repetitive reminders to look at the CLI doc on docker.io.
* | Reverted c3ebce91b0d76540280c0ef6f961c0a5305b30f3Joffrey F2014-06-221-2/+1
| |
* | docker is now a namespace packageJoffrey F2014-06-231-1/+2
| |
* | Correct test requirements in setup.pyJoffrey F2014-05-241-1/+2
| |
View Lorry Controller Status