Add command for running flake8 and fix linting errors

Author: Photonios

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2
 jobs:
-    python35:
+    test-python35:
         docker:
             - image: python:3.5-alpine
             - image: postgres:11.0
@@ -22,7 +22,7 @@ jobs:
                 environment:
                     DATABASE_URL: 'postgres://psqlextra:psqlextra@localhost:5432/psqlextra'
 
-    python36:
+    test-python36:
         docker:
             - image: python:3.6-alpine
             - image: postgres:11.0
@@ -44,7 +44,7 @@ jobs:
                 environment:
                     DATABASE_URL: 'postgres://psqlextra:psqlextra@localhost:5432/psqlextra'
 
-    python37:
+    test-python37:
         docker:
             - image: python:3.7-alpine
             - image: postgres:11.0
@@ -66,11 +66,27 @@ jobs:
                 environment:
                     DATABASE_URL: 'postgres://psqlextra:psqlextra@localhost:5432/psqlextra'
 
+    lint:
+        docker:
+            - image: python3.5-alpine
+        steps:
+            - checkout
+            - run:
+                name: Install packages
+                command: apk add postgresql-libs gcc musl-dev postgresql-dev git
+            - run:
+                name: Install Python packages
+                command: pip install -r requirements/test.txt
+            - run:
+                name: Lint code
+                command: python setup.py lint
+
 
 workflows:
     version: 2
     build:
         jobs:
-            - python35
-            - python36
-            - python37
+            - test-python35
+            - test-python36
+            - test-python37
+            - lint

psqlextra/fields/hstore_field.py

@@ -4,8 +4,6 @@
 from django.db.models.fields import Field
 from django.contrib.postgres.fields import HStoreField as DjangoHStoreField
 
-from psqlextra.expressions import HStoreValue
-
 
 class HStoreField(DjangoHStoreField):
     """Improved version of Django's :see:HStoreField that

setup.cfg

@@ -1,5 +1,6 @@
 [flake8]
 max-line-length = 120
+ignore = E252
 exclude = env,.tox,.git,config/settings,*/migrations/*,*/static/CACHE/*,docs,node_modules
 
 [pep8]

setup.py

@@ -1,13 +1,40 @@
 import os
+import distutils.cmd
+import subprocess
 
 from setuptools import find_packages, setup
 
+
+class BaseCommand(distutils.cmd.Command):
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+
+def create_command(text, commands):
+    """Creates a custom setup.py command."""
+
+    class CustomCommand(BaseCommand):
+        description = text
+
+        def run(self):
+            for cmd in commands:
+                subprocess.check_call(cmd)
+
+    return CustomCommand
+
+
 with open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8') as readme:
     README = readme.read().split('h1>\n\n', 2)[1]
 
+
 setup(
     name='django-postgres-extra',
-    version='1.21a13',
+    version='1.21a14',
     packages=find_packages(),
     include_package_data=True,
     license='MIT License',
@@ -27,5 +54,11 @@
         'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
-    ]
+    ],
+    cmdclass={
+        'lint': create_command(
+            'Lints the code',
+            [['flake8', 'setup.py', 'psqlextra', 'tests']],
+        ),
+    },
 )

tests/test_conditional_unique_index.py

@@ -59,10 +59,13 @@ def test_migrations():
     calls = [call[0] for _, call, _ in simulator.migrate('CREATE UNIQUE INDEX')[0]['CREATE UNIQUE INDEX']]
 
     db_table = Model._meta.db_table
-    assert str(calls[0]) == 'CREATE UNIQUE INDEX "index1" ON "{0}" ("name", "other_name") WHERE "name" IS NOT NULL'.format(
+    query = 'CREATE UNIQUE INDEX "index1" ON "{0}" ("name", "other_name") WHERE "name" IS NOT NULL'
+    assert str(calls[0]) == query.format(
         db_table
     )
-    assert str(calls[1]) == 'CREATE UNIQUE INDEX "index2" ON "{0}" ("other_name") WHERE "name" IS NULL'.format(
+
+    query = 'CREATE UNIQUE INDEX "index2" ON "{0}" ("other_name") WHERE "name" IS NULL'
+    assert str(calls[1]) == query.format(
         db_table
     )
 

tests/test_on_conflict.py

@@ -414,9 +414,9 @@ def test_on_conflict_bulk():
     for index, obj in enumerate(list(model.objects.all())):
         assert obj.title == rows[index]['title']
 
+
 def test_bulk_return():
-    """Tests if primary keys are properly returned from 'bulk_insert'
-    """
+    """Tests if primary keys are properly returned from 'bulk_insert'"""
 
     model = get_fake_model({
         'id': models.BigAutoField(primary_key=True),

tests/test_on_conflict_nothing.py

@@ -191,4 +191,4 @@ def test_on_conflict_nothing_foreign_key_by_id():
     assert obj1.other == other_obj
     assert obj2.other == other_obj
     assert obj1.data == "some data"
-    assert obj2.data == "some data"
+    assert obj2.data == "some data"

tests/test_signals.py

@@ -16,9 +16,9 @@ def mock_signal_handler(signal):
     """
 
     model = get_fake_model({
-                'title': models.CharField(max_length=255),
-                'flag': models.BooleanField(default=False)
-            })
+        'title': models.CharField(max_length=255),
+        'flag': models.BooleanField(default=False)
+    })
 
     signal_handler = Mock()
     signal.connect(signal_handler, sender=model, weak=False)