Fix config for check-unicode and format

Author: DRMacIver

Makefile

@@ -83,8 +83,7 @@ format: $(PYFORMAT) $(ISORT)
 	$(FILES_TO_FORMAT) | xargs $(TOOL_PYTHON) scripts/enforce_header.py
 	# isort will sort packages differently depending on whether they're installed
 	$(FILES_TO_FORMAT) | xargs env -i PATH="$(PATH)" $(ISORT) -p hypothesis -ls -m 2 -w 75 \
-			-a "from __future__ import absolute_import, print_function, division" \
-			-rc src tests examples
+			-a "from __future__ import absolute_import, print_function, division"
 	$(FILES_TO_FORMAT) | xargs $(PYFORMAT) -i
 
 lint: $(FLAKE8)

scripts/files-to-format.py

@@ -18,12 +18,9 @@
 from __future__ import division, print_function, absolute_import
 
 import os
-import sys
 
 import hypothesistooling as tools
 
-sys.path.append(os.path.dirname(__file__))  # noqa
-
 
 def should_format_file(path):
     if os.path.basename(path) in ('header.py', 'test_lambda_formatting.py'):

scripts/hypothesistooling.py

@@ -40,15 +40,19 @@ def tags():
 
 ROOT = subprocess.check_output([
     'git', 'rev-parse', '--show-toplevel']).decode('ascii').strip()
-SRC = os.path.join(ROOT, 'hypothesis-python', 'src')
 
-assert os.path.exists(SRC)
+HYPOTHESIS_PYTHON = os.path.join(ROOT, 'hypothesis-python')
+
+PYTHON_SRC = os.path.join(HYPOTHESIS_PYTHON, 'src')
+PYTHON_TESTS = os.path.join(HYPOTHESIS_PYTHON, 'tests')
+
+assert os.path.exists(PYTHON_SRC)
 
 
 __version__ = None
 __version_info__ = None
 
-VERSION_FILE = os.path.join(SRC, 'hypothesis/version.py')
+VERSION_FILE = os.path.join(PYTHON_SRC, 'hypothesis/version.py')
 
 with open(VERSION_FILE) as o:
     exec(o.read())
@@ -121,7 +125,7 @@ def has_source_changes(version=None):
 
     return subprocess.call([
         'git', 'diff', '--no-patch', '--exit-code', point_of_divergence,
-        'HEAD', '--', SRC,
+        'HEAD', '--', PYTHON_SRC,
     ]) != 0
 
 

scripts/unicodechecker.py

@@ -26,6 +26,7 @@
 import unicodenazi
 from hypothesis import settings, unlimited
 from hypothesis.errors import HypothesisDeprecationWarning
+from hypothesistooling import PYTHON_TESTS
 from hypothesis.configuration import set_hypothesis_home_dir
 
 warnings.filterwarnings('error', category=UnicodeWarning)
@@ -47,9 +48,7 @@
     'test_testdecorators',
 ]
 
-sys.path.append(os.path.join(
-    os.path.dirname(__file__), '..', 'tests', 'cover',
-))
+sys.path.append(os.path.join(PYTHON_TESTS, 'cover'))
 
 if __name__ == '__main__':
     for t in TESTS: