Commit Graph

92 Commits

Author SHA1 Message Date
Joffrey F 415c5ddde4 Bump docker SDK -> 2.5.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-23 12:35:31 -07:00
Joffrey F bd3feae62b Bump python SDK version -> 2.5.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 16:24:12 -07:00
Joffrey F f9aaa72c54 Bump texttable dependency
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-03 12:06:23 -07:00
Carl George 8ea0e8e053 only require colorama on windows
Colorama is only useful on Windows by design.  Since it has no effect on
other platforms, it makes sense to not require it universally.

Signed-off-by: Carl George <carl@george.computer>
2017-07-27 14:07:19 -07:00
Joffrey F abd395a5f3 Add 'socks' extra to help with proxy environment.
SOCKS support will be included in the bundled (binary) version

Update some packages in requirements.txt and add some implicit deps

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-06 15:14:52 -07:00
Joffrey F 300b879d44 Bump docker Python SDK version -> 2.4.2
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 12:06:16 -07:00
Alexey Rokhin 0043dc4fab Add cpu_count, cpu_percent, cpus parameters.
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 14:50:29 +03:00
Joffrey F 48831a8d5f Bump docker SDK dependency
Update invalid ports test

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:15:34 -07:00
Joffrey F e0e862c042 Update docker SDK dependency
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-16 17:05:09 -08:00
Daniel Nephin dc5b3f3b3e Fix secrets config.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-10 17:11:24 -05:00
Joffrey F 2593366a3e Bump docker SDK version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 16:49:05 -08:00
Joffrey F 52792b7a96 Update setup.py extra_requires
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-10 14:59:11 -08:00
Joffrey F 9f6778aa73 Merge pull request #4172 from graingert/enable-universal-wheels
enable universal wheels
2017-01-10 14:57:22 -08:00
Joffrey F 2c157e8fa9 Use docker SDK 2.0.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-09 15:27:20 -08:00
Thomas Grainger 2648af6807
enable universal wheels
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
2017-01-04 18:33:58 +00:00
Joffrey F 346802715d Use colorama to enable colored output on Windows
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-19 20:40:47 -08:00
Joffrey F 04e5925a23 Use docker SDK 2.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-14 15:36:08 -08:00
Joffrey F 7a430dbe96 Updated docker-py dependency to latest version
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-02 16:56:45 -07:00
Joffrey F 046144e8f4 Bump docker-py version to include latest patch
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-27 12:13:32 -07:00
Joffrey F 882084932d Upgrade docker-py to latest version
Adjust required requests version

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-17 14:03:21 -07:00
Joffrey F fc6791f3f0 Bump docker-py dependency
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 14:12:15 -07:00
Joffrey F b64bd07f22 Update docker-py dependency to latest release
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-12 14:34:07 -07:00
Joffrey F 7f3375c2ce Update docker-py requirement to the latest release
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-26 13:07:38 -07:00
Joffrey F a822406eb0 Update docker-py version in requirements
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-28 15:49:06 -07:00
Joffrey F e4bb678875 Require latest docker-py version
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:37:26 -07:00
Joffrey F 75bcc382d9 Force docker-py 1.8.0 or above
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-20 16:56:48 -07:00
Joffrey F 60470fb9f1 Require docker-py 1.8.0rc2
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:13:56 -07:00
Aanand Prasad be236d8801 Update docker-py and dockerpty
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:16:01 +00:00
Daniel Nephin b76dc1e05e Require volumes_from a container to be explicit in V2 config.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:45:16 -05:00
Daniel Nephin c3968a439f Refactor config loading to move version check into ConfigFile.
Adds the cached_property package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:45:15 -05:00
Mazz Mosley fe760a7b62 Include additional classifiers
I've included Python 2/3 as they are not parent classifiers but
sibling classifiers. They denote that this project will work with
*some* versions of python and by having them, they'll show up for
people searching for python 2 or 3 projects.

According to the internet :)

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-26 17:08:45 +00:00
Nicolas Delaby 37921b40dd Add trove classifier to declare supported python versions.
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
2015-10-19 10:52:39 +02:00
Daniel Nephin 7c6e7e0dce Update docker-py to 1.5.0
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 11:18:21 -04:00
Aanand Prasad d1dd06a7e2 Update docker-py to 1.4.0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-11 15:42:20 -07:00
Daniel Nephin 0484e22a84 Add enum34 and use it to create a ConvergenceStrategy enum.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-04 10:45:53 -04:00
Daniel Nephin 9d7ad796a3 bump requests to 2.7 to fix the ResponseNotReady() error, and add a missing default for tox posargs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-03 14:11:44 -04:00
Daniel Nephin c1ed1efde8 Use py.test as the test runner
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-01 16:27:44 -04:00
Daniel Nephin 2943ac6812 Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:46:08 -04:00
funkyfuture 9aa61e596e Run tests against Python 2.6, 2.7, 3.3, 3.4 and PyPy2
In particular it includes:
- some extension of CONTRIBUTING.md
- one fix for Python 2.6 in tests/integration/cli_test.py
- one fix for Python 3.3 in tests/integration/service_test.py
- removal of unused imports

Make stream_output Python 3-compatible

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-08-25 10:41:09 -04:00
Daniel Nephin 809443d6d0 Support python 3
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:37:29 -04:00
Daniel Nephin 59d4f304ee Run pre-commit on all files
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-24 17:04:50 -04:00
Mazz Mosley da36ee7cbc Perform schema validation
Define a schema that we can pass to jsonschema to validate against the
config a user has supplied. This will help catch a wide variety of common
errors that occur.

If the config does not pass schema validation then it raises an exception
and prints out human readable reasons.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-07 12:06:34 +01:00
Aanand Prasad f4dac02947 Update docker-py to 1.3.1
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
Christoph Witzany 04b7490ef2 Fix required version of websockets-client
Signed-off-by: Christoph Witzany <christoph@web.crofting.com>
2015-07-21 11:59:32 +02:00
Aanand Prasad 4ba9d9dac2 Make parallel tasks interruptible with Ctrl-C
The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.

Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-20 14:13:25 +01:00
Aanand Prasad 35aef1aee0 Merge pull request #1687 from mnowster/1651-parallelise-stopping-containers
1651 parallelise stopping containers
2015-07-15 16:29:54 +01:00
Mazz Mosley a68ca199a2 Execute container commands in parallel
Commands able to use this parallelisation are `stop`, `kill` and `rm`.

We're using a backported function from python 3, to allow us to make
the most of a pool of threads without having to write the low level
code for managing this ourselves.

A default value for number of threads is a low enough number so it
shouldn't cause performance problems but if someone knows the
capability of their system and wants to increase it, they can via
an environment variable DEFAULT_MAX_WORKERS

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-15 11:02:50 +01:00
Aanand Prasad fdc34a187e Use docker-py 1.3.0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-14 16:17:12 +01:00
Aanand Prasad ac56ef3d65 Update docker-py to 1.2.3 final
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 11:11:51 -07:00
Aanand Prasad 4e108e377e Update setup.py with new docker-py minimum
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-15 10:18:15 -07:00