diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0e7b9d5f3..b7bcc8466 100644
--- a/.pre-commit-config.yaml
+++ b/.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'
diff --git a/bin/docker-compose b/bin/docker-compose
index 5976e1d4a..aeb538703 100755
--- a/bin/docker-compose
+++ b/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()
diff --git a/requirements.txt b/requirements.txt
index 81dcdf08c..826c31eb1 100644
--- a/requirements.txt
+++ b/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
diff --git a/script/build/test-image b/script/build/test-image
index 216d63f9c..a2eb62cdf 100755
--- a/script/build/test-image
+++ b/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
\ No newline at end of file
+docker rmi -f docker-compose-tests:tmp
diff --git a/script/setup/osx b/script/setup/osx
index e6ab62a84..e0c2bd0a2 100755
--- a/script/setup/osx
+++ b/script/setup/osx
@@ -50,4 +50,3 @@ echo "*** Using $(openssl_version)"
 if !(which virtualenv); then
   pip install virtualenv
 fi
-
diff --git a/tests/fixtures/default-env-file/.env b/tests/fixtures/default-env-file/.env
index 996c886cb..9056de724 100644
--- a/tests/fixtures/default-env-file/.env
+++ b/tests/fixtures/default-env-file/.env
@@ -1,4 +1,4 @@
 IMAGE=alpine:latest
 COMMAND=true
 PORT1=5643
-PORT2=9999
\ No newline at end of file
+PORT2=9999
diff --git a/tests/fixtures/env-file/test.env b/tests/fixtures/env-file/test.env
index c9604dad5..d99cd41a4 100644
--- a/tests/fixtures/env-file/test.env
+++ b/tests/fixtures/env-file/test.env
@@ -1 +1 @@
-FOO=1
\ No newline at end of file
+FOO=1