Skip to content

Commit 969170b

Browse files
asottileasottile
committed
Merge pull request pre-commit#73 from pre-commit/use_asottile_packages
yaml extensions and ordereddict are now imported from asottile.
2 parents c0a0a21 + e58d28a commit 969170b

File tree

8 files changed

+18
-99
lines changed

8 files changed

+18
-99
lines changed

‎pre_commit/commands.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
import pkg_resources
55
import shutil
66
import stat
7+
from asottile.ordereddict import OrderedDict
8+
from asottile.yaml import ordered_dump
9+
from asottile.yaml import ordered_load
710
from plumbum import local
811

912
import pre_commit.constants as C
1013
from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
1114
from pre_commit.clientlib.validate_config import load_config
1215
from pre_commit.jsonschema_extensions import remove_defaults
13-
from pre_commit.ordereddict import OrderedDict
1416
from pre_commit.repository import Repository
15-
from pre_commit.yaml_extensions import ordered_dump
16-
from pre_commit.yaml_extensions import ordered_load
1717

1818

1919
def install(runner):

‎pre_commit/ordereddict.py‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎pre_commit/repository.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import contextlib
22
import logging
3+
from asottile.ordereddict import OrderedDict
34
from plumbum import local
45

56
import pre_commit.constants as C
67
from pre_commit.clientlib.validate_manifest import load_manifest
78
from pre_commit.hooks_workspace import in_hooks_workspace
89
from pre_commit.languages.all import languages
9-
from pre_commit.ordereddict import OrderedDict
1010
from pre_commit.prefixed_command_runner import PrefixedCommandRunner
1111
from pre_commit.util import cached_property
1212
from pre_commit.util import clean_path_on_failure

‎pre_commit/yaml_extensions.py‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎setup.py‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1-
import sys
21
from setuptools import find_packages
32
from setuptools import setup
43

54

6-
install_requires = [
7-
'argparse',
8-
'jsonschema',
9-
'plumbum',
10-
'pyyaml',
11-
'simplejson',
12-
]
13-
14-
15-
if sys.version_info < (2, 7):
16-
install_requires.append('ordereddict')
17-
18-
195
setup(
206
name='pre_commit',
217
description='A framework for managing and maintaining multi-language pre-commit hooks.',
@@ -38,7 +24,15 @@
3824
'resources/pre-commit.sh'
3925
]
4026
},
41-
install_requires=install_requires,
27+
install_requires=[
28+
'argparse',
29+
'asottile.ordereddict',
30+
'asottile.yaml',
31+
'jsonschema',
32+
'plumbum',
33+
'pyyaml',
34+
'simplejson',
35+
],
4236
entry_points={
4337
'console_scripts': [
4438
'pre-commit = pre_commit.run:run',

‎tests/clientlib/validate_base_test.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import pytest
2+
from asottile.ordereddict import OrderedDict
3+
from asottile.yaml import ordered_load
24

35
from pre_commit.clientlib.validate_base import get_validator
4-
from pre_commit.ordereddict import OrderedDict
5-
from pre_commit.yaml_extensions import ordered_load
66
from testing.util import get_resource_path
77

88

‎tests/commands_test.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
import pytest
55
import shutil
66
import stat
7+
from asottile.ordereddict import OrderedDict
8+
from asottile.yaml import ordered_dump
79
from plumbum import local
810

11+
912
import pre_commit.constants as C
1013
from pre_commit import git
1114
from pre_commit.clientlib.validate_config import CONFIG_JSON_SCHEMA
@@ -17,9 +20,7 @@
1720
from pre_commit.commands import uninstall
1821
from pre_commit.commands import _update_repository
1922
from pre_commit.jsonschema_extensions import apply_defaults
20-
from pre_commit.ordereddict import OrderedDict
2123
from pre_commit.runner import Runner
22-
from pre_commit.yaml_extensions import ordered_dump
2324
from testing.auto_namedtuple import auto_namedtuple
2425
from testing.util import get_resource_path
2526

‎tests/yaml_extensions_test.py‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)