From 203c5547346fa2a0b0a19993830da917a7485f43 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Tue, 17 Jun 2014 06:49:54 -0700 Subject: [PATCH] Use cached-property package. --- Makefile | 2 +- pre_commit/manifest.py | 2 +- pre_commit/repository.py | 2 +- pre_commit/runner.py | 2 +- pre_commit/store.py | 2 +- requirements.txt | 1 - setup.py | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 requirements.txt diff --git a/Makefile b/Makefile index 646b7e30..75415fc4 100644 --- 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/manifest.py b/pre_commit/manifest.py index e3b25dd7..52caa4a5 100644 --- 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/repository.py b/pre_commit/repository.py index 08fc397f..4e2ee42b 100644 --- a/pre_commit/repository.py +++ b/pre_commit/repository.py @@ -1,7 +1,7 @@ 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 diff --git a/pre_commit/runner.py b/pre_commit/runner.py index bbba62c7..23204df4 100644 --- a/pre_commit/runner.py +++ b/pre_commit/runner.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals 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 index c4942919..ccdac798 100644 --- a/pre_commit/store.py +++ b/pre_commit/store.py @@ -5,7 +5,7 @@ import logging 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 deleted file mode 100644 index 9c558e35..00000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -. diff --git a/setup.py b/setup.py index 83ff2005..a1504f8a 100644 --- a/setup.py +++ b/setup.py @@ -32,9 +32,9 @@ setup( }, install_requires=[ 'argparse', - 'asottile.cached_property', 'asottile.ordereddict', 'asottile.yaml', + 'cached-property', 'jsonschema', 'nodeenv>=0.9.4', 'plumbum',