Add black reformatting to all files (#589)

* Add black reformatting to all files

* Enforce travis on ci

Author: Ross Mechanic

.gitignore

@@ -5,6 +5,7 @@
 .coverage
 .idea
 .tox/
+.venv/
 /.project
 /.pydevproject
 /.ve

.travis.yml

@@ -25,8 +25,8 @@ install:
 
 script:
   - flake8 simple_history
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then black --check simple_history; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then black --check simple_history; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then black --check simple_history setup.py runtests.py; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then black --check simple_history setup.py runtests.py; fi
   - coverage run setup.py test
 
 matrix:

Makefile

@@ -44,4 +44,4 @@ release: dist
 	twine upload dist/*
 
 format:
-	black simple_history
+	black simple_history setup.py runtests.py

runtests.py

@@ -10,22 +10,20 @@
 
 sys.path.insert(0, abspath(dirname(__file__)))
 
-media_root = join(abspath(dirname(__file__)), 'test_files')
+media_root = join(abspath(dirname(__file__)), "test_files")
 rmtree(media_root, ignore_errors=True)
 
 installed_apps = [
-    'simple_history.tests',
-    'simple_history.tests.custom_user',
-    'simple_history.tests.external',
-    'simple_history.registry_tests.migration_test_app',
-
-    'simple_history',
-
-    'django.contrib.contenttypes',
-    'django.contrib.auth',
-    'django.contrib.sessions',
-    'django.contrib.admin',
-    'django.contrib.messages',
+    "simple_history.tests",
+    "simple_history.tests.custom_user",
+    "simple_history.tests.external",
+    "simple_history.registry_tests.migration_test_app",
+    "simple_history",
+    "django.contrib.contenttypes",
+    "django.contrib.auth",
+    "django.contrib.sessions",
+    "django.contrib.admin",
+    "django.contrib.messages",
 ]
 
 
@@ -38,51 +36,51 @@ def __getitem__(self, item):
 
 
 DEFAULT_SETTINGS = dict(
-    ALLOWED_HOSTS=['localhost'],
-    AUTH_USER_MODEL='custom_user.CustomUser',
-    ROOT_URLCONF='simple_history.tests.urls',
+    ALLOWED_HOSTS=["localhost"],
+    AUTH_USER_MODEL="custom_user.CustomUser",
+    ROOT_URLCONF="simple_history.tests.urls",
     MEDIA_ROOT=media_root,
-    STATIC_URL='/static/',
+    STATIC_URL="/static/",
     INSTALLED_APPS=installed_apps,
     DATABASES={
-        'default': {
-            'ENGINE': 'django.db.backends.sqlite3',
-        },
-        'other': {
-            'ENGINE': 'django.db.backends.sqlite3',
-        }
+        "default": {"ENGINE": "django.db.backends.sqlite3"},
+        "other": {"ENGINE": "django.db.backends.sqlite3"},
     },
     MIGRATION_MODULES=DisableMigrations(),
-    TEMPLATES=[{
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ]
-        },
-    }],
+    TEMPLATES=[
+        {
+            "BACKEND": "django.template.backends.django.DjangoTemplates",
+            "APP_DIRS": True,
+            "OPTIONS": {
+                "context_processors": [
+                    "django.contrib.auth.context_processors.auth",
+                    "django.contrib.messages.context_processors.messages",
+                ]
+            },
+        }
+    ],
 )
 MIDDLEWARE = [
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
 ]
 
-if django.__version__ >= '2.0':
-    DEFAULT_SETTINGS['MIDDLEWARE'] = MIDDLEWARE
+if django.__version__ >= "2.0":
+    DEFAULT_SETTINGS["MIDDLEWARE"] = MIDDLEWARE
 else:
-    DEFAULT_SETTINGS['MIDDLEWARE_CLASSES'] = MIDDLEWARE
+    DEFAULT_SETTINGS["MIDDLEWARE_CLASSES"] = MIDDLEWARE
 
 
 def main():
 
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
     django.setup()
-    failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
-    failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
+    failures = DiscoverRunner(failfast=False).run_tests(["simple_history.tests"])
+    failures |= DiscoverRunner(failfast=False).run_tests(
+        ["simple_history.registry_tests"]
+    )
     sys.exit(failures)
 
 

setup.py

@@ -2,24 +2,28 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.11', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1',
-    'six']
+    "Django>=1.11",
+    "WebTest==2.0.24",
+    "django-webtest==1.8.0",
+    "mock==1.0.1",
+    "six",
+]
 
 setup(
-    name='django-simple-history',
+    name="django-simple-history",
     version=simple_history.__version__,
-    description='Store model history and view/revert changes from admin site.',
-    long_description='\n'.join((
-        open('README.rst').read(),
-        open('CHANGES.rst').read(),
-    )),
-    author='Corey Bertram',
-    author_email='[email protected]',
-    maintainer='Trey Hunner',
-    url='https://github.com/treyhunner/django-simple-history',
+    description="Store model history and view/revert changes from admin site.",
+    long_description="\n".join((open("README.rst").read(), open("CHANGES.rst").read())),
+    author="Corey Bertram",
+    author_email="[email protected]",
+    maintainer="Trey Hunner",
+    url="https://github.com/treyhunner/django-simple-history",
     packages=[
-        'simple_history', 'simple_history.management',
-        'simple_history.management.commands', 'simple_history.templatetags'],
+        "simple_history",
+        "simple_history.management",
+        "simple_history.management.commands",
+        "simple_history.templatetags",
+    ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Framework :: Django",
@@ -32,16 +36,16 @@
         "Framework :: Django :: 2.2",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "License :: OSI Approved :: BSD License",
     ],
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     tests_require=tests_require,
     install_requires=["six"],
     include_package_data=True,
-    test_suite='runtests.main',
+    test_suite="runtests.main",
 )