fix conflicts

Author: norkans7

.github/workflows/ci.yml

@@ -36,6 +36,11 @@ jobs:
         poetry install
         poetry add django==${{ matrix.django-version }}
 
+    - name: Run pre-test checks
+      run: |
+        sudo apt-get install gettext
+        poetry run ./code_check.py --debug
+
     - name: Run tests
       run: |
         poetry run coverage run manage.py test smartmin test_runner --verbosity=2

poetry.lock

@@ -32,11 +32,39 @@ xlrd = "^1.2.0"
 xlwt = "^1.3.0"
 
 [tool.poetry.dev-dependencies]
-psycopg2 = "< 2.9"  # https://github.com/psycopg/psycopg2/issues/1293
+psycopg2-binary = "^2.9.1"
 funcsigs = "^1.0.2"
 flake8 = "^3.8.4"
 Pillow = "^9.3.0"
 codecov = "^2.1.11"
+coverage = {extras = ["toml"], version = "^6.5.0"}
+ruff = "^0.0.171"
+black = "^22.10.0"
+colorama = "^0.4.6"
+isort = "^5.10.1"
+
+[tool.black]
+line-length = 119
+
+[tool.ruff]
+line-length = 120
+select = ["E", "F", "W"]
+ignore = ["E501", "F405"]
+fix = true
+exclude = ["./.tox/*", "./.venv/*", "./env/*", "*/migrations/*", "./build/*"]
+
+[tool.isort]
+multi_line_output = 3
+force_grid_wrap = 0
+line_length = 119
+include_trailing_comma = true
+combine_as_imports = true
+sections = ["FUTURE", "STDLIB", "THIRDPARTY", "DJANGO", "DJANGOTHIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
+known_django = ["django"]
+known_djangothirdparty = ["celery"]
+
+[tool.coverage.run]
+source = ["smartmin"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -1,9 +1,2 @@
-[coverage:run]
-source = smartmin
-
-[flake8]
-max-line-length = 120
-exclude = ./env/*,./build/*,./dist/*,./docs/*,*/migrations/*
-
 [wheel]
 universal = 1

setup.cfg

@@ -1,3 +1,3 @@
 from __future__ import unicode_literals
 
-__version__ = '2.3.0'
+__version__ = "2.3.0"

smartmin/__init__.py

@@ -1,5 +1,5 @@
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -10,23 +10,60 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='ImportTask',
+            name="ImportTask",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('is_active', models.BooleanField(default=True, help_text='Whether this item is active, use this instead of deleting')),
-                ('created_on', models.DateTimeField(help_text='When this item was originally created', auto_now_add=True)),
-                ('modified_on', models.DateTimeField(help_text='When this item was last modified', auto_now=True)),
-                ('csv_file', models.FileField(help_text='A comma delimited file of records to import', upload_to='csv_imports', verbose_name='Import file')),
-                ('model_class', models.CharField(help_text='The model we are importing for', max_length=255)),
-                ('import_params', models.TextField(help_text='JSON blob of form parameters on task creation', null=True, blank=True)),
-                ('import_log', models.TextField()),
-                ('import_results', models.TextField(help_text='JSON blob of result values on task completion', null=True, blank=True)),
-                ('task_id', models.CharField(max_length=64, null=True)),
-                ('created_by', models.ForeignKey(related_name='csv_imports_importtask_creations', on_delete=models.PROTECT, to=settings.AUTH_USER_MODEL, help_text='The user which originally created this item')),
-                ('modified_by', models.ForeignKey(related_name='csv_imports_importtask_modifications', on_delete=models.PROTECT, to=settings.AUTH_USER_MODEL, help_text='The user which last modified this item')),
+                ("id", models.AutoField(verbose_name="ID", serialize=False, auto_created=True, primary_key=True)),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True, help_text="Whether this item is active, use this instead of deleting"
+                    ),
+                ),
+                (
+                    "created_on",
+                    models.DateTimeField(help_text="When this item was originally created", auto_now_add=True),
+                ),
+                ("modified_on", models.DateTimeField(help_text="When this item was last modified", auto_now=True)),
+                (
+                    "csv_file",
+                    models.FileField(
+                        help_text="A comma delimited file of records to import",
+                        upload_to="csv_imports",
+                        verbose_name="Import file",
+                    ),
+                ),
+                ("model_class", models.CharField(help_text="The model we are importing for", max_length=255)),
+                (
+                    "import_params",
+                    models.TextField(help_text="JSON blob of form parameters on task creation", null=True, blank=True),
+                ),
+                ("import_log", models.TextField()),
+                (
+                    "import_results",
+                    models.TextField(help_text="JSON blob of result values on task completion", null=True, blank=True),
+                ),
+                ("task_id", models.CharField(max_length=64, null=True)),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        related_name="csv_imports_importtask_creations",
+                        on_delete=models.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                        help_text="The user which originally created this item",
+                    ),
+                ),
+                (
+                    "modified_by",
+                    models.ForeignKey(
+                        related_name="csv_imports_importtask_modifications",
+                        on_delete=models.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                        help_text="The user which last modified this item",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
     ]

smartmin/csv_imports/migrations/0001_initial.py

@@ -1,17 +1,22 @@
 from django.db import migrations, models
+
 import smartmin.csv_imports.models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('csv_imports', '0001_initial'),
+        ("csv_imports", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='importtask',
-            name='csv_file',
-            field=models.FileField(help_text='A comma delimited file of records to import', upload_to=smartmin.csv_imports.models.generate_file_path, verbose_name='Import file'),
+            model_name="importtask",
+            name="csv_file",
+            field=models.FileField(
+                help_text="A comma delimited file of records to import",
+                upload_to=smartmin.csv_imports.models.generate_file_path,
+                verbose_name="Import file",
+            ),
         ),
     ]

smartmin/csv_imports/migrations/0002_auto_20161118_1920.py

@@ -4,13 +4,13 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('csv_imports', '0002_auto_20161118_1920'),
+        ("csv_imports", "0002_auto_20161118_1920"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='importtask',
-            name='task_status',
-            field=models.CharField(default='PENDING', max_length=32),
+            model_name="importtask",
+            name="task_status",
+            field=models.CharField(default="PENDING", max_length=32),
         ),
     ]

smartmin/csv_imports/migrations/0003_importtask_task_status.py

@@ -1,22 +1,32 @@
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('csv_imports', '0003_importtask_task_status'),
+        ("csv_imports", "0003_importtask_task_status"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='importtask',
-            name='created_on',
-            field=models.DateTimeField(blank=True, default=django.utils.timezone.now, editable=False, help_text='When this item was originally created'),
+            model_name="importtask",
+            name="created_on",
+            field=models.DateTimeField(
+                blank=True,
+                default=django.utils.timezone.now,
+                editable=False,
+                help_text="When this item was originally created",
+            ),
         ),
         migrations.AlterField(
-            model_name='importtask',
-            name='modified_on',
-            field=models.DateTimeField(blank=True, default=django.utils.timezone.now, editable=False, help_text='When this item was last modified'),
+            model_name="importtask",
+            name="modified_on",
+            field=models.DateTimeField(
+                blank=True,
+                default=django.utils.timezone.now,
+                editable=False,
+                help_text="When this item was last modified",
+            ),
         ),
     ]

smartmin/csv_imports/migrations/0004_auto_20170223_0917.py

@@ -1,26 +1,36 @@
 # Generated by Django 4.0.1 on 2022-01-12 15:47
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('csv_imports', '0004_auto_20170223_0917'),
+        ("csv_imports", "0004_auto_20170223_0917"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='importtask',
-            name='created_by',
-            field=models.ForeignKey(help_text='The user which originally created this item', on_delete=django.db.models.deletion.PROTECT, related_name='%(app_label)s_%(class)s_creations', to=settings.AUTH_USER_MODEL),
+            model_name="importtask",
+            name="created_by",
+            field=models.ForeignKey(
+                help_text="The user which originally created this item",
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="%(app_label)s_%(class)s_creations",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='importtask',
-            name='modified_by',
-            field=models.ForeignKey(help_text='The user which last modified this item', on_delete=django.db.models.deletion.PROTECT, related_name='%(app_label)s_%(class)s_modifications', to=settings.AUTH_USER_MODEL),
+            model_name="importtask",
+            name="modified_by",
+            field=models.ForeignKey(
+                help_text="The user which last modified this item",
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="%(app_label)s_%(class)s_modifications",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
     ]

smartmin/csv_imports/migrations/0005_alter_importtask_created_by_and_more.py

@@ -9,27 +9,30 @@
 
 def generate_file_path(instance, filename):
 
-    file_path_prefix = 'csv_imports/'
+    file_path_prefix = "csv_imports/"
 
     name, extension = os.path.splitext(filename)
 
     if len(name) + len(extension) >= 100:
-        name = name[:100-len(extension)-len(file_path_prefix)]
+        name = name[: 100 - len(extension) - len(file_path_prefix)]
 
     return "%s%s%s" % (file_path_prefix, name, extension)
 
 
 class ImportTask(SmartModel):
-    PENDING = 'PENDING'
-    STARTED = 'STARTED'
-    RUNNING = 'RUNNING'
-    SUCCESS = 'SUCCESS'
-    FAILURE = 'FAILURE'
+    PENDING = "PENDING"
+    STARTED = "STARTED"
+    RUNNING = "RUNNING"
+    SUCCESS = "SUCCESS"
+    FAILURE = "FAILURE"
 
     READY_STATES = [SUCCESS, FAILURE]
 
-    csv_file = models.FileField(upload_to=generate_file_path, verbose_name="Import file",
-                                help_text="A comma delimited file of records to import")
+    csv_file = models.FileField(
+        upload_to=generate_file_path,
+        verbose_name="Import file",
+        help_text="A comma delimited file of records to import",
+    )
 
     model_class = models.CharField(max_length=255, help_text="The model we are importing for")
 
@@ -45,12 +48,13 @@ class ImportTask(SmartModel):
 
     def start(self):
         from .tasks import csv_import
+
         self.log("Queued import at %s" % timezone.now())
         self.task_status = self.STARTED
-        self.save(update_fields=['import_log', 'task_status'])
+        self.save(update_fields=["import_log", "task_status"])
         result = csv_import.delay(self.pk)
         self.task_id = result.task_id
-        self.save(update_fields=['task_id'])
+        self.save(update_fields=["task_id"])
 
     def done(self):
         if self.task_id:
@@ -62,7 +66,7 @@ def status(self):
     def log(self, message):
         self.import_log += "%s\n" % message
         self.modified_on = timezone.now()
-        self.save(update_fields=['import_log', 'modified_on'])
+        self.save(update_fields=["import_log", "modified_on"])
 
     def __unicode__(self):
         return "%s Import" % import_string(self.model_class)._meta.verbose_name.title()

smartmin/csv_imports/models.py

@@ -1,10 +1,10 @@
 from io import StringIO
 
-from celery import shared_task
-
 from django.utils import timezone
 from django.utils.module_loading import import_string
 
+from celery import shared_task
+
 from .models import ImportTask
 
 
@@ -31,6 +31,7 @@ def csv_import(task_id):  # pragma: no cover
 
     except Exception as e:
         import traceback
+
         traceback.print_exc()
 
         task_obj.task_status = ImportTask.FAILURE

smartmin/csv_imports/tasks.py

@@ -8,16 +8,16 @@ def test_csv_import(self):
         pass
 
     def test_generate_file_path(self):
-        self.assertEquals(generate_file_path(ImportTask(), 'allo.csv'), 'csv_imports/allo.csv')
-        self.assertEquals(generate_file_path(ImportTask(), 'allo.xlsx'), 'csv_imports/allo.xlsx')
-        self.assertEquals(generate_file_path(ImportTask(), 'allo.foo.bar'), 'csv_imports/allo.foo.bar')
+        self.assertEquals(generate_file_path(ImportTask(), "allo.csv"), "csv_imports/allo.csv")
+        self.assertEquals(generate_file_path(ImportTask(), "allo.xlsx"), "csv_imports/allo.xlsx")
+        self.assertEquals(generate_file_path(ImportTask(), "allo.foo.bar"), "csv_imports/allo.foo.bar")
 
-        long_name = 'foo' * 100
+        long_name = "foo" * 100
 
-        test_file_name = '%s.xls.csv' % long_name
+        test_file_name = "%s.xls.csv" % long_name
         self.assertEquals(len(generate_file_path(ImportTask(), test_file_name)), 100)
-        self.assertEquals(generate_file_path(ImportTask(), test_file_name), 'csv_imports/%s.csv' % long_name[:84])
+        self.assertEquals(generate_file_path(ImportTask(), test_file_name), "csv_imports/%s.csv" % long_name[:84])
 
-        test_file_name = '%s.abc.xlsx' % long_name
+        test_file_name = "%s.abc.xlsx" % long_name
         self.assertEquals(len(generate_file_path(ImportTask(), test_file_name)), 100)
-        self.assertEquals(generate_file_path(ImportTask(), test_file_name), 'csv_imports/%s.xlsx' % long_name[:83])
+        self.assertEquals(generate_file_path(ImportTask(), test_file_name), "csv_imports/%s.xlsx" % long_name[:83])

smartmin/csv_imports/tests.py

@@ -1,4 +1,3 @@
 from smartmin.csv_imports.views import ImportTaskCRUDL
 
-
 urlpatterns = ImportTaskCRUDL().as_urlpatterns()