Run black

Author: jacklinke

django_range_merge/__init__.py

@@ -2,6 +2,6 @@
 Enables the range_merge Aggregate for Django on Postgres
 """
 
-__version__ = '0.1.0'
+__version__ = "0.2.0"
 
-default_app_config = 'django_range_merge.apps.DjangoRangeMergeConfig'  # pylint: disable=invalid-name
+default_app_config = "django_range_merge.apps.DjangoRangeMergeConfig"  # pylint: disable=invalid-name

django_range_merge/apps.py

@@ -10,4 +10,4 @@ class DjangoRangeMergeConfig(AppConfig):
     Configuration for the django_range_merge Django application.
     """
 
-    name = 'django_range_merge'
+    name = "django_range_merge"

manage.py

@@ -8,8 +8,8 @@
 
 PWD = os.path.abspath(os.path.dirname(__file__))
 
-if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'test_settings')
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_settings")
     sys.path.append(PWD)
     try:
         from django.core.management import execute_from_command_line

runtests.py

@@ -4,15 +4,11 @@
 
 import pytest
 
-APP_NAME = 'django_range_merge'
-TESTS = 'tests'
+APP_NAME = "django_range_merge"
+TESTS = "tests"
 PYTEST_ARGS = {
-    'default': [
-        TESTS, '--tb=short', '-s', '-rw'
-    ],
-    'fast': [
-        TESTS, '--tb=short', '-q', '-s', '-rw'
-    ],
+    "default": [TESTS, "--tb=short", "-s", "-rw"],
+    "fast": [TESTS, "--tb=short", "-q", "-s", "-rw"],
 }
 
 FLAKE8_ARGS = [APP_NAME, TESTS]
@@ -26,20 +22,20 @@ def exit_on_failure(ret, message=None):
 
 
 def flake8_main(args):
-    print('Running flake8 code linting')
-    ret = subprocess.call(['flake8'] + args)
-    print('flake8 failed' if ret else 'flake8 passed')
+    print("Running flake8 code linting")
+    ret = subprocess.call(["flake8"] + args)
+    print("flake8 failed" if ret else "flake8 passed")
     return ret
 
 
 def split_class_and_function(string):
-    class_string, function_string = string.split('.', 1)
+    class_string, function_string = string.split(".", 1)
     return "%s and %s" % (class_string, function_string)
 
 
 def is_function(string):
     # `True` if it looks like a test function is included in the string.
-    return string.startswith('test_') or '.test_' in string
+    return string.startswith("test_") or ".test_" in string
 
 
 def is_class(string):
@@ -49,54 +45,49 @@ def is_class(string):
 
 if __name__ == "__main__":
     try:
-        sys.argv.remove('--nolint')
+        sys.argv.remove("--nolint")
     except ValueError:
         run_flake8 = True
     else:
         run_flake8 = False
 
     try:
-        sys.argv.remove('--lintonly')
+        sys.argv.remove("--lintonly")
     except ValueError:
         run_tests = True
     else:
         run_tests = False
 
     try:
-        sys.argv.remove('--fast')
+        sys.argv.remove("--fast")
     except ValueError:
-        style = 'default'
+        style = "default"
     else:
-        style = 'fast'
+        style = "fast"
         run_flake8 = False
 
     if len(sys.argv) > 1:
         pytest_args = sys.argv[1:]
         first_arg = pytest_args[0]
 
         try:
-            pytest_args.remove('--coverage')
+            pytest_args.remove("--coverage")
         except ValueError:
             pass
         else:
-            pytest_args = [
-                '--cov-report',
-                'xml',
-                '--cov',
-                APP_NAME
-            ] + pytest_args
-
-        if first_arg.startswith('-'):
+            pytest_args = ["--cov-report", "xml", "--cov", APP_NAME] + pytest_args
+
+        if first_arg.startswith("-"):
             # `runtests.py [flags]`
             pytest_args = [TESTS] + pytest_args
         elif is_class(first_arg) and is_function(first_arg):
             # `runtests.py TestCase.test_function [flags]`
             expression = split_class_and_function(first_arg)
-            pytest_args = [TESTS, '-k', expression] + pytest_args[1:]
+            pytest_args = [TESTS, "-k", expression] + pytest_args[1:]
         elif is_class(first_arg) or is_function(first_arg):
             # `runtests.py TestCase [flags]`
             # `runtests.py test_function [flags]`
-            pytest_args = [TESTS, '-k', pytest_args[0]] + pytest_args[1:]
+            pytest_args = [TESTS, "-k", pytest_args[0]] + pytest_args[1:]
     else:
         pytest_args = PYTEST_ARGS[style]
 

setup.py

@@ -18,11 +18,10 @@ def get_version(*file_paths):
     """
     filename = os.path.join(os.path.dirname(__file__), *file_paths)
     version_file = open(filename, encoding="utf8").read()
-    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
-                              version_file, re.M)
+    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
     if version_match:
         return version_match.group(1)
-    raise RuntimeError('Unable to find version string.')
+    raise RuntimeError("Unable to find version string.")
 
 
 def load_requirements(*requirements_paths):
@@ -48,10 +47,12 @@ def add_version_constraint_or_raise(current_line, current_requirements, add_if_n
             # fine to add constraints to an unconstrained package,
             # raise an error if there are already constraints in place
             if existing_version_constraints and existing_version_constraints != version_constraints:
-                raise BaseException(f'Multiple constraint definitions found for {package}:'
-                                    f' "{existing_version_constraints}" and "{version_constraints}".'
-                                    f'Combine constraints into one location with {package}'
-                                    f'{existing_version_constraints},{version_constraints}.')
+                raise BaseException(
+                    f"Multiple constraint definitions found for {package}:"
+                    f' "{existing_version_constraints}" and "{version_constraints}".'
+                    f"Combine constraints into one location with {package}"
+                    f"{existing_version_constraints},{version_constraints}."
+                )
             if add_if_not_present or package in current_requirements:
                 current_requirements[package] = version_constraints
 
@@ -62,8 +63,8 @@ def add_version_constraint_or_raise(current_line, current_requirements, add_if_n
             for line in reqs:
                 if is_requirement(line):
                     add_version_constraint_or_raise(line, requirements, True)
-                if line and line.startswith('-c') and not line.startswith('-c http'):
-                    constraint_files.add(os.path.dirname(path) + '/' + line.split('#')[0].replace('-c', '').strip())
+                if line and line.startswith("-c") and not line.startswith("-c http"):
+                    constraint_files.add(os.path.dirname(path) + "/" + line.split("#")[0].replace("-c", "").strip())
 
     # process constraint files: add constraints to existing requirements
     for constraint_file in constraint_files:
@@ -88,47 +89,46 @@ def is_requirement(line):
     return line and line.strip() and not line.startswith(("-r", "#", "-e", "git+", "-c"))
 
 
-VERSION = get_version('django_range_merge', '__init__.py')
+VERSION = get_version("django_range_merge", "__init__.py")
 
-if sys.argv[-1] == 'tag':
+if sys.argv[-1] == "tag":
     print("Tagging the version on github:")
     os.system("git tag -a %s -m 'version %s'" % (VERSION, VERSION))
     os.system("git push --tags")
     sys.exit()
 
-README = open(os.path.join(os.path.dirname(__file__), 'README.md'), encoding="utf8").read()
-CHANGELOG = open(os.path.join(os.path.dirname(__file__), 'CHANGELOG.md'), encoding="utf8").read()
+README = open(os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf8").read()
+CHANGELOG = open(os.path.join(os.path.dirname(__file__), "CHANGELOG.md"), encoding="utf8").read()
 
 setup(
-    name='django-range-merge',
+    name="django-range-merge",
     version=VERSION,
     description="""Enables the range_merge Aggregate for Django on Postgres""",
-    long_description=README + '\n\n' + CHANGELOG,
-    author='Jack Linke',
-    author_email='[email protected]',
-    url='https://github.com/jacklinke/django-range-merge',
+    long_description=README + "\n\n" + CHANGELOG,
+    author="Jack Linke",
+    author_email="[email protected]",
+    url="https://github.com/jacklinke/django-range-merge",
     packages=find_packages(
-        include=['django_range_merge', 'django_range_merge.*'],
+        include=["django_range_merge", "django_range_merge.*"],
         exclude=["*tests"],
     ),
-
     include_package_data=True,
     # install_requires=load_requirements('requirements-dev.txt'),
     python_requires=">=3.8",
     zip_safe=False,
-    keywords='Postgres django range fields aggregate',
+    keywords="Postgres django range fields aggregate",
     classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Framework :: Django',
-        'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
-        'Framework :: Django :: 4.1',
-        'Intended Audience :: Developers',
-        'License :: Other/Proprietary License',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
+        "Development Status :: 3 - Alpha",
+        "Framework :: Django",
+        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
+        "Intended Audience :: Developers",
+        "License :: Other/Proprietary License",
+        "Natural Language :: English",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
 )

test_settings.py

@@ -14,49 +14,52 @@ def root(*args):
     """
     return join(abspath(dirname(__file__)), *args)
 
+
 USE_TZ = True
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'default.db',
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',
-        'PORT': '',
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": "default.db",
+        "USER": "",
+        "PASSWORD": "",
+        "HOST": "",
+        "PORT": "",
     }
 }
 
 INSTALLED_APPS = (
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.messages',
-    'django.contrib.sessions',
-    'django_range_merge',
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.messages",
+    "django.contrib.sessions",
+    "django_range_merge",
 )
 
 LOCALE_PATHS = [
-    root('django_range_merge', 'conf', 'locale'),
+    root("django_range_merge", "conf", "locale"),
 ]
 
-ROOT_URLCONF = 'django_range_merge.urls'
+ROOT_URLCONF = "django_range_merge.urls"
 
-SECRET_KEY = 'insecure-secret-key'
+SECRET_KEY = "insecure-secret-key"
 
 MIDDLEWARE = (
-    '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",
+    "django.contrib.sessions.middleware.SessionMiddleware",
 )
 
-TEMPLATES = [{
-    'BACKEND': 'django.template.backends.django.DjangoTemplates',
-    'APP_DIRS': False,
-    'OPTIONS': {
-        'context_processors': [
-            'django.contrib.auth.context_processors.auth',  # this is required for admin
-            'django.contrib.messages.context_processors.messages',  # this is required for admin
-        ],
-    },
-}]
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "APP_DIRS": False,
+        "OPTIONS": {
+            "context_processors": [
+                "django.contrib.auth.context_processors.auth",  # this is required for admin
+                "django.contrib.messages.context_processors.messages",  # this is required for admin
+            ],
+        },
+    }
+]