Merge pull request pre-commit#121 from pre-commit/packages_redux

asottile · asottile · commit fe5e829ea4c3 · 2014-06-17T08:00:10.000-07:00
Packages redux
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ test: .venv.touch
 	tox $(REBUILD_FLAG)
 
 
-.venv.touch: setup.py requirements.txt requirements-dev.txt
+.venv.touch: setup.py requirements-dev.txt
 	$(eval REBUILD_FLAG := --recreate)
 	touch .venv.touch
 
diff --git a/pre_commit/commands/autoupdate.py b/pre_commit/commands/autoupdate.py
@@ -3,7 +3,6 @@
 
 import sys
 
-from asottile.ordereddict import OrderedDict
 from asottile.yaml import ordered_dump
 from asottile.yaml import ordered_load
 from plumbum import local
@@ -12,6 +11,7 @@
 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
 
 
diff --git a/pre_commit/five.py b/pre_commit/five.py
@@ -2,11 +2,10 @@
 
 """five: six, redux"""
 # pylint:disable=invalid-name
-PY2 = (str is bytes)
-PY3 = (str is not bytes)
+PY2 = str is bytes
+PY3 = str is not bytes
 
-# provide a symettrical `text` type to `bytes`
-if PY2:
+if PY2:  # pragma: no cover (PY2 only)
     text = unicode  # flake8: noqa
-else:
+else:  # pragma: no cover (PY3 only)
     text = str
diff --git a/pre_commit/manifest.py b/pre_commit/manifest.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 
 import os.path
-from asottile.cached_property import cached_property
+from cached_property import cached_property
 
 import pre_commit.constants as C
 from pre_commit.clientlib.validate_manifest import load_manifest
diff --git a/pre_commit/ordereddict.py b/pre_commit/ordereddict.py
@@ -0,0 +1,7 @@
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+try:
+    from collections import OrderedDict  # noqa
+except ImportError:  # pragma: no cover (PY26)
+    from ordereddict import OrderedDict  # noqa
diff --git a/pre_commit/repository.py b/pre_commit/repository.py
@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
-from asottile.cached_property import cached_property
-from asottile.ordereddict import OrderedDict
+from cached_property import cached_property
 
 from pre_commit.languages.all import languages
 from pre_commit.manifest import Manifest
+from pre_commit.ordereddict import OrderedDict
 from pre_commit.prefixed_command_runner import PrefixedCommandRunner
 
 
diff --git a/pre_commit/runner.py b/pre_commit/runner.py
@@ -2,7 +2,7 @@
 
 import os
 import os.path
-from asottile.cached_property import cached_property
+from cached_property import cached_property
 
 import pre_commit.constants as C
 from pre_commit import git
diff --git a/pre_commit/store.py b/pre_commit/store.py
@@ -5,7 +5,7 @@
 import os
 import os.path
 import tempfile
-from asottile.cached_property import cached_property
+from cached_property import cached_property
 from plumbum import local
 
 from pre_commit.prefixed_command_runner import PrefixedCommandRunner
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -32,11 +32,11 @@
     },
     install_requires=[
         'argparse',
-        'asottile.cached_property',
-        'asottile.ordereddict',
         'asottile.yaml',
+        'cached-property',
         'jsonschema',
         'nodeenv>=0.9.4',
+        'ordereddict',
         'plumbum',
         'pyyaml',
         'simplejson',
diff --git a/testing/fixtures.py b/testing/fixtures.py
@@ -3,7 +3,6 @@
 
 import io
 import os.path
-from asottile.ordereddict import OrderedDict
 from asottile.yaml import ordered_dump
 from plumbum import local
 
@@ -12,6 +11,7 @@
 from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
 from pre_commit.clientlib.validate_config import validate_config_extra
 from pre_commit.jsonschema_extensions import apply_defaults
+from pre_commit.ordereddict import OrderedDict
 from testing.util import copy_tree_to_path
 from testing.util import get_head_sha
 from testing.util import get_resource_path
diff --git a/tests/clientlib/validate_base_test.py b/tests/clientlib/validate_base_test.py
@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
 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 testing.util import get_resource_path
 
 
diff --git a/tests/commands/autoupdate_test.py b/tests/commands/autoupdate_test.py
@@ -2,13 +2,13 @@
 
 import pytest
 import shutil
-from asottile.ordereddict import OrderedDict
 from plumbum import local
 
 import pre_commit.constants as C
 from pre_commit.commands.autoupdate import _update_repository
 from pre_commit.commands.autoupdate import autoupdate
 from pre_commit.commands.autoupdate import RepositoryCannotBeUpdatedError
+from pre_commit.ordereddict import OrderedDict
 from pre_commit.runner import Runner
 from testing.auto_namedtuple import auto_namedtuple
 from testing.fixtures import make_config_from_repo
