pre-commit · asottile · Apr 12, 2014 · Apr 12, 2014
diff --git a/pre_commit/commands.py b/pre_commit/commands.py
@@ -4,16 +4,16 @@
 import pkg_resources
 import shutil
 import stat
+from asottile.ordereddict import OrderedDict
+from asottile.yaml import ordered_dump
+from asottile.yaml import ordered_load
 from plumbum import local
 
 import pre_commit.constants as C
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
 from pre_commit.clientlib.validate_config import load_config
 from pre_commit.jsonschema_extensions import remove_defaults
-from pre_commit.ordereddict import OrderedDict
 from pre_commit.repository import Repository
-from pre_commit.yaml_extensions import ordered_dump
-from pre_commit.yaml_extensions import ordered_load
 
 
 def install(runner):

diff --git a/pre_commit/ordereddict.py b/pre_commit/ordereddict.py
diff --git a/pre_commit/repository.py b/pre_commit/repository.py
@@ -1,12 +1,12 @@
 import contextlib
 import logging
+from asottile.ordereddict import OrderedDict
 from plumbum import local
 
 import pre_commit.constants as C
 from pre_commit.clientlib.validate_manifest import load_manifest
 from pre_commit.hooks_workspace import in_hooks_workspace
 from pre_commit.languages.all import languages
-from pre_commit.ordereddict import OrderedDict
 from pre_commit.prefixed_command_runner import PrefixedCommandRunner
 from pre_commit.util import cached_property
 from pre_commit.util import clean_path_on_failure

diff --git a/pre_commit/yaml_extensions.py b/pre_commit/yaml_extensions.py
diff --git a/setup.py b/setup.py
@@ -1,21 +1,7 @@
-import sys
 from setuptools import find_packages
 from setuptools import setup
 
 
-install_requires = [
-    'argparse',
-    'jsonschema',
-    'plumbum',
-    'pyyaml',
-    'simplejson',
-]
-
-
-if sys.version_info < (2, 7):
-    install_requires.append('ordereddict')
-
-
 setup(
     name='pre_commit',
     description='A framework for managing and maintaining multi-language pre-commit hooks.',
@@ -38,7 +24,15 @@
             'resources/pre-commit.sh'
         ]
     },
-    install_requires=install_requires,
+    install_requires=[
+        'argparse',
+        'asottile.ordereddict',
+        'asottile.yaml',
+        'jsonschema',
+        'plumbum',
+        'pyyaml',
+        'simplejson',
+    ],
     entry_points={
         'console_scripts': [
             'pre-commit = pre_commit.run:run',

diff --git a/tests/clientlib/validate_base_test.py b/tests/clientlib/validate_base_test.py
@@ -1,8 +1,8 @@
 import pytest
+from asottile.ordereddict import OrderedDict
+from asottile.yaml import ordered_load
 
 from pre_commit.clientlib.validate_base import get_validator
-from pre_commit.ordereddict import OrderedDict
-from pre_commit.yaml_extensions import ordered_load
 from testing.util import get_resource_path
 
 

diff --git a/tests/commands_test.py b/tests/commands_test.py
@@ -4,8 +4,11 @@
 import pytest
 import shutil
 import stat
+from asottile.ordereddict import OrderedDict
+from asottile.yaml import ordered_dump
 from plumbum import local
 
+
 import pre_commit.constants as C
 from pre_commit import git
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
@@ -17,9 +20,7 @@
 from pre_commit.commands import uninstall
 from pre_commit.commands import _update_repository
 from pre_commit.jsonschema_extensions import apply_defaults
-from pre_commit.ordereddict import OrderedDict
 from pre_commit.runner import Runner
-from pre_commit.yaml_extensions import ordered_dump
 from testing.auto_namedtuple import auto_namedtuple
 from testing.util import get_resource_path
 

diff --git a/tests/yaml_extensions_test.py b/tests/yaml_extensions_test.py