Use newer versions of pre-commit hooks

Signed-off-by: Joffrey F <joffrey@docker.com>

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 - repo: git://github.com/pre-commit/pre-commit-hooks
-  sha: 'v0.4.2'
+  sha: 'v0.9.1'
   hooks:
     - id: check-added-large-files
     - id: check-docstring-first
@@ -14,7 +14,7 @@
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/asottile/reorder_python_imports
-  sha: v0.1.0
+  sha: v0.3.5
   hooks:
     - id: reorder-python-imports
       language_version: 'python2.7'

bin/docker-compose

@@ -1,3 +1,6 @@
 #!/usr/bin/env python
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
 from compose.cli.main import main
 main()

requirements.txt

@@ -1,5 +1,3 @@
-PySocks==1.6.7
-PyYAML==3.12
 backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.3.0
 certifi==2017.4.17
@@ -15,6 +13,8 @@ idna==2.5
 ipaddress==1.0.18
 jsonschema==2.6.0
 pypiwin32==219; sys_platform == 'win32'
+PySocks==1.6.7
+PyYAML==3.12
 requests==2.11.1
 six==1.10.0
 texttable==0.8.8

script/build/test-image

@@ -14,4 +14,4 @@ ctnr_id=$(docker create --entrypoint=tox docker-compose-tests:tmp)
 docker commit $ctnr_id docker/compose-tests:latest
 docker tag docker/compose-tests:latest docker/compose-tests:$TAG
 docker rm -f $ctnr_id
-docker rmi -f docker-compose-tests:tmp
+docker rmi -f docker-compose-tests:tmp

script/setup/osx

@@ -50,4 +50,3 @@ echo "*** Using $(openssl_version)"
 if !(which virtualenv); then
   pip install virtualenv
 fi
-

tests/fixtures/default-env-file/.env

@@ -1,4 +1,4 @@
 IMAGE=alpine:latest
 COMMAND=true
 PORT1=5643
-PORT2=9999
+PORT2=9999

tests/fixtures/env-file/test.env

@@ -1 +1 @@
-FOO=1
+FOO=1