8a6061bfb9
__init__ takes service name and dict
...
Moving service name and dict out of the function make_service_dict
and into __init__. We always call make_service_dict with those so
let's put them in the initialiser. Slightly cleaner design intent.
The whole purpose of the ServiceLoader is to take a
service name&service dictionary then validate, process and return
service dictionaries ready to be created.
This is also another step towards cleaning the code up so we can
interpolate and validate an extended dictionary.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
1344533b24
filename is not optional
...
While it can be set to ultimately a value of None, when a
config file is read in from stdin, it is not optional.
We kinda make use of it's ability to be set to None in our
tests but functionally and design wise, it is required.
If filename is not set, extends does not work.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
c907f35e74
Raise if working_dir is None
...
Check for this in the init so we can remove the duplication of
raising in further functions.
A ServiceLoader isn't valid without one.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
3bee62e4c5
Merge pull request #1956 from bfirsh/link-to-zenhub
...
Link to ZenHub instead of Waffle
2015-09-01 17:31:45 -07:00
6969829a70
Link to ZenHub instead of Waffle
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-09-01 17:23:39 -07:00
c63ae64ca6
Merge pull request #1920 from dnephin/use_pytest
...
Use py.test as a test runner
2015-09-01 15:29:24 -07:00
c1ed1efde8
Use py.test as the test runner
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-01 16:27:44 -04:00
6ac617bae1
Split requirements-build.txt from requirements-dev.txt to support a leaner tox.ini
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-01 16:27:44 -04:00
8479108ee8
Merge pull request #1945 from dnephin/issue_triage_doc
...
Add ISSUE-TRIAGE.md
2015-09-01 13:25:37 -07:00
83c514f838
Merge pull request #1933 from dnephin/fix_scale_test_flakes
...
Fix flaky test
2015-08-31 13:52:33 -07:00
235fe21fd0
Prevent flaky test by changing container names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-31 14:57:06 -04:00
17bd11c334
Merge pull request #1940 from hermanjunge/patch-1
...
Fix doc install.md
2015-08-31 10:43:30 +01:00
8f310767a6
Add ISSUE-TRIAGE.md doc
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-28 14:10:15 -04:00
9543cb341b
Fix doc install.md
...
termial -> terminal
Signed-off-by: Herman Junge <hermanalonsojunge@gmail.com>
2015-08-28 11:51:04 -03:00
0074d74d7a
Merge pull request #1914 from bbirand/patch-1
...
Export COMPOSE_FILE
2015-08-28 12:13:42 +01:00
f5d73fee57
Merge pull request #1932 from mrfuxi/image-dockerfile-validation
...
Do not allow to specify both image and dockerfile in configuration.
2015-08-28 10:12:54 +01:00
d264c2e33a
Resolves #1804
...
Fix mutation of service.options when a label or environment variable is specified in the config.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-27 18:05:21 -04:00
477d4f491d
Do not allow to specify both image and dockerfile in configuration. Closes #1908
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-08-27 19:36:39 +01:00
21c16a787a
Merge pull request #1928 from albers/completion-timeout
...
Bash completion for `docker-compose scale --timeout`
2015-08-27 12:37:55 -04:00
d45f00df13
Merge pull request #1935 from aanand/normalise-ignore-files
...
Normalise ignore files
2015-08-27 10:39:24 -04:00
e777d08854
Merge pull request #1924 from dnephin/python3_fix_for_logs
...
Fix `docker-compose logs` on python3
2015-08-27 14:19:42 +01:00
b39e549c87
Normalise ignore files
...
- Consistent order and contents (where possible)
- Prepend .gitignore paths with slashes where appropriate
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-27 13:51:51 +01:00
7c8c23e0c7
Merge pull request #1917 from sdurrheimer/master
...
Update zsh completion with last changes
2015-08-27 13:17:19 +01:00
4602ceca18
Merge pull request #1931 from dnephin/fix_regression_in_up
...
Only show logs for listed services in `up`
2015-08-27 13:00:59 +01:00
5865df3633
Merge pull request #1934 from aanand/fix-release-process-typo
...
Fix typo in release process docs
2015-08-27 10:38:20 +01:00
acca22206a
Fix typo
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-27 10:36:12 +01:00
0286d282f9
Merge pull request #1916 from aanand/improve-release-docs
...
Improve release docs
2015-08-27 10:34:32 +01:00
3a0153859a
Resolves #1856 , fix regression in #1645 . Includes some refactoring to make testing easier.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 16:21:31 -04:00
ecd1cc31dc
Merge pull request #1930 from dnephin/name_one_off_containers
...
Allow setting a one-off container name
2015-08-26 19:03:00 +01:00
d2718bed99
Allow setting a one-off container name
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 13:33:03 -04:00
bdec7e6b52
Cleanup some test case, remove unused mock return values, and use standard single underscore for unused variable
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 13:32:49 -04:00
ae64f306f8
Merge pull request #1929 from dnephin/remove_flake8_ignores
...
Remove flake8 ignores and wrap the longest lines to 140 char
2015-08-26 18:19:20 +01:00
54973e8200
Remove flake8 ignores and wrap the longest lines to 140 char.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 12:53:11 -04:00
2cfda01ff4
Use consistent argument order in bash completion
...
In most of this file and in Dockers's bash completion the sort order of
options is to sort alphabetically by long option name.
The short options are put right behind their long couterpart.
This commit improves consistency.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-26 18:31:36 +02:00
b03a2f7910
Add completion for `scale --timeout`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-26 18:31:36 +02:00
7e22719090
Fix suppressed blank in completion of `scale --help`
...
Wrong placement of `compopt -o` introduces an unexpected behavior that did
not matter as long as --help was the only option (you would probably not
continue to type after --help): completion of options would not automatically
append a whitespace character as expected.
For the outstanding addition of the --timeout option, which has an
argument, this would mean that the user would have to type an extra
whitespace after completion of --timeout before the argument could be
added.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-26 18:20:17 +02:00
34249fad5d
Improve release docs
...
Incorporating questions from
https://gist.github.com/aanand/e567bd8d6a5d8e28c829
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-26 17:06:10 +01:00
9d9550c5b6
Fix log printing for python3 by converting everything to unicode.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 11:24:48 -04:00
a348993d2c
Remove two unused functions from cli/utils.py
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 16:55:29 -04:00
2b589606da
Move log_printer_test into correct testing module for naming convention.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 16:49:49 -04:00
196f0afe8d
Update zsh completion with last changes
...
- sdurrheimer/docker-compose-zsh-completion@4ff5c0d Add pause and unpause commands
- sdurrheimer/docker-compose-zsh-completion@9948d66 Add -t/--timeout flag to scale command
- sdurrheimer/docker-compose-zsh-completion@7cf14c8 Improve -p/--publish flag for the run command
- sdurrheimer/docker-compose-zsh-completion@cb16818 Don't trigger expensive completion function for flags
- sdurrheimer/docker-compose-zsh-completion@52d33fa Several cosmetic improvements and return responses
- sdurrheimer/docker-compose-zsh-completion@632ca9c Bump to version 1.5.0
- sdurrheimer/docker-compose-zsh-completion@22f92d9 Refactor compose file and project-name option flags when invoking docker-compose
- sdurrheimer/docker-compose-zsh-completion@1b512fc Refactor --help flags
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-08-25 22:00:32 +02:00
fc63454c99
Merge pull request #440 from dnephin/python3
...
Support python 3
2015-08-25 18:22:40 +01:00
1451a6e188
Python3 requires a locale
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 11:10:02 -04:00
bd7c032a00
Fix service integration tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:48:48 -04:00
71ff872e8e
Update unit tests for stream_output to match the behaviour of a docker-py response.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:48:48 -04:00
7e4c3142d7
Have log_printer use utf8 stream.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:47:06 -04:00
feaa4a5f1a
Unit tests passing again.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:47:06 -04:00
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
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
809443d6d0
Support python 3
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:37:29 -04:00
Mazz Mosley
Aanand Prasad
Ben Firshman
Daniel Nephin
mnowster
Herman Junge
Karol Duleba
Harald Albers
Steve Durrheimer
funkyfuture