Liniting with isort and black.

.ci/install_conda.py

@@ -2,13 +2,12 @@
 
 import argparse
 import logging
-from pathlib import Path
 import shlex
-from subprocess import CalledProcessError, PIPE, run
 import urllib.request
+from pathlib import Path
+from subprocess import PIPE, CalledProcessError, run
 from tempfile import TemporaryDirectory
 
-
 MINICONDA_URL = "https://repo.anaconda.com/miniconda/Miniconda3-latest"
 
 logging.basicConfig(format="%(name)s - %(levelname)s - %(message)s", level=logging.INFO)

.github/workflows/test_job.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           activate-environment: freva-web
           environment-file: conda-env.yml
-          python-version: "3.11"
+          python-version: "3.12"
           auto-activate-base: false
       - name: Run checks in python
         run: make tests

Makefile

@@ -10,7 +10,7 @@ dummy-data:
 	python3 docker/solr/ingest_dummy_data.py
 
 lint:
-	black -t py310 --check .
+	isort -c --profile black -t py312 .
 
 tests:
 	rm -rf node_modules

base/LdapUser.py

@@ -1,10 +1,13 @@
 import os
+from configparser import ConfigParser as Config
+from configparser import ExtendedInterpolation
+
+from evaluation_system.misc import config
 from evaluation_system.model.db import UserDB
 from evaluation_system.model.user import User
+
 from base.exceptions import UserNotFoundError
 from django_evaluation.ldaptools import get_ldap_object
-from configparser import ConfigParser as Config, ExtendedInterpolation
-from evaluation_system.misc import config
 
 
 class LdapUser(User):

base/admin.py

@@ -1,8 +1,6 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.models import User
-
-from django.contrib.auth.models import Permission
+from django.contrib.auth.models import Permission, User
 
 from .models import UIMessages
 

base/models.py

@@ -1,8 +1,8 @@
-from django.db import models
-from django.contrib.auth.models import User
-
 from datetime import datetime
 
+from django.contrib.auth.models import User
+from django.db import models
+
 
 def isGuest(self):
     groups = self.groups.filter(name="Guest")

base/serializers.py

@@ -1,5 +1,5 @@
-from rest_framework import serializers
 from django.contrib.auth.models import User
+from rest_framework import serializers
 
 from django_evaluation.settings.local import HOME_DIRS_AVAILABLE
 

base/urls.py

@@ -1,4 +1,5 @@
 from django.urls import re_path as url
+
 import base.views
 
 urlpatterns = [

base/views.py

@@ -1,17 +1,17 @@
 import logging
 
-from base.models import UIMessages
-
-from django.http import HttpResponseRedirect
-from django.shortcuts import render
 import django.contrib.auth as auth
-from django.contrib.auth.decorators import login_required, user_passes_test
-from django.views.decorators.debug import sensitive_variables, sensitive_post_parameters
-from django_evaluation.monitor import _restart
 from django.conf import settings
+from django.contrib.auth.decorators import login_required, user_passes_test
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.urls import reverse
-from evaluation_system.misc import config
 from django.utils.http import url_has_allowed_host_and_scheme
+from django.views.decorators.debug import sensitive_post_parameters, sensitive_variables
+from evaluation_system.misc import config
+
+from base.models import UIMessages
+from django_evaluation.monitor import _restart
 
 
 @sensitive_variables("passwd")
@@ -113,6 +113,7 @@ def contact(request):
     """
     if request.method == "POST":
         from templated_email import send_templated_mail
+
         from django_evaluation.ldaptools import get_ldap_object
 
         user_info = get_ldap_object()

base/views_api.py

@@ -1,8 +1,9 @@
-from rest_framework.views import APIView
 from rest_framework.response import Response
+from rest_framework.views import APIView
 
-from base.LdapUser import LdapUser
 from base.exceptions import UserNotFoundError
+from base.LdapUser import LdapUser
+
 from .serializers import UserSerializer
 
 

conda-env.yml

@@ -30,6 +30,7 @@ dependencies:
   - pip
   - pip:
     - black
+    - isort
     - requests_mock
     - django-auth-ldap
     - django-datatable-view

django_evaluation/ldaptools.py

@@ -1,16 +1,18 @@
 from __future__ import annotations
-from abc import ABCMeta, abstractmethod
+
+import grp
 import importlib
+import pwd
 import time
+from abc import ABCMeta, abstractmethod
 from typing import Iterator
 
-from django_evaluation import settings
-from django_evaluation.utils import background
+import ldap
 from django.core.cache import cache, caches
 from django.core.exceptions import ImproperlyConfigured
-import ldap
-import grp
-import pwd
+
+from django_evaluation import settings
+from django_evaluation.utils import background
 
 """
 FIXME: 28.03.2022

django_evaluation/monitor.py

@@ -3,12 +3,12 @@
 http://code.google.com/p/modwsgi/wiki/ReloadingSourceCode#Restarting_Daemon_Processes
 """
 
+import atexit
 import os
-import sys
+import queue
 import signal
+import sys
 import threading
-import atexit
-import queue
 
 _interval = 1.0
 _times = {}

django_evaluation/settings/base.py

@@ -3,15 +3,16 @@
 repo. If you need to override a setting locally, use local.py
 """
 
-import os
 import logging
+import os
 from pathlib import Path
 
+import django.utils
+
 # Normally you should not import ANYTHING from Django directly
 # into your settings, but ImproperlyConfigured is an exception.
 from django.core.exceptions import ImproperlyConfigured
 from django.urls import reverse_lazy
-import django.utils
 
 
 def get_env_setting(setting):

django_evaluation/settings/local.py

@@ -1,17 +1,15 @@
-from pathlib import Path
 import os
+import shutil
 import sys
+from pathlib import Path
+
 import ldap
-from django_auth_ldap.config import (
-    LDAPSearch,
-    NestedGroupOfNamesType,
-    PosixGroupType,
-)
-import shutil
-import toml
 import requests
+import toml
 from django.urls import reverse_lazy
+from django_auth_ldap.config import LDAPSearch, NestedGroupOfNamesType, PosixGroupType
 from evaluation_system.misc import config
+
 from base.exceptions import UnknownLDAPGroupTypeError
 
 freva_share_path = Path(os.environ["EVALUATION_SYSTEM_CONFIG_FILE"]).parent

django_evaluation/settings/test.py

@@ -6,7 +6,6 @@
 
 from .base import *
 
-
 TEST_RUNNER = "discover_runner.DiscoverRunner"
 TEST_DISCOVER_TOP_LEVEL = PROJECT_ROOT
 TEST_DISCOVER_ROOT = PROJECT_ROOT

django_evaluation/urls.py

@@ -1,19 +1,21 @@
 """ Default urlconf for django_evaluation """
 
 from django.conf import settings
-from django.urls import include, re_path as url
 from django.conf.urls import static
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.urls import include
+from django.urls import re_path as url
 from django.views.generic import RedirectView
+
 from base.views_api import AuthenticatedUser
+from history.views_api import ResultFacets, ResultFiles
 from plugins.views_api import (
-    PluginsList,
     ExportPlugin,
     PluginDetail,
+    PluginsList,
     SendMailToDeveloper,
 )
-from history.views_api import ResultFacets, ResultFiles
 from solr.views_api import ncdump
 
 admin.autodiscover()

django_evaluation/utils.py

@@ -1,6 +1,7 @@
 """Collection of utility functions."""
 
 from __future__ import annotations
+
 import threading
 from typing import Any, Callable
 

django_evaluation/wsgi.py

@@ -15,8 +15,8 @@
 """
 
 import os
-import sys
 import site
+import sys
 
 PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__) + "../../")
 
@@ -48,6 +48,7 @@
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
 from django.core.wsgi import get_wsgi_application
+
 from django_evaluation.ldaptools import get_ldap_object
 
 LdapCls = get_ldap_object()

docker/solr/ingest_dummy_data.py

@@ -3,9 +3,8 @@
 import logging
 from pathlib import Path
 
-from evaluation_system.model.solr_core import SolrCore
 from evaluation_system.misc import config, logger
-
+from evaluation_system.model.solr_core import SolrCore
 
 if __name__ == "__main__":
     logger.setLevel(logging.INFO)

dummy_plugin/dummy.py

@@ -1,18 +1,17 @@
-import tempfile
-import shutil
 import os
+import shutil
+import tempfile
 
-from evaluation_system.api.plugin import PluginAbstract
 from evaluation_system.api.parameters import (
-    ParameterDictionary,
-    Integer,
+    Directory,
     Float,
+    Integer,
+    ParameterDictionary,
     String,
-    Directory,
 )
-
-from evaluation_system.model.user import User
+from evaluation_system.api.plugin import PluginAbstract
 from evaluation_system.model.db import UserDB
+from evaluation_system.model.user import User
 
 
 class DummyPlugin(PluginAbstract):

history/admin.py

@@ -1,8 +1,9 @@
 from django.contrib import admin
-from history.models import History, Configuration
 from django.contrib.auth.models import User
 from django.utils.html import format_html
 
+from history.models import Configuration, History
+
 
 class HistoryAmdin(admin.ModelAdmin):
     list_display = (

history/models.py

@@ -1,7 +1,7 @@
 from evaluation_system.model.history.models import (
+    Configuration,
     History,
     HistoryTag,
     Result,
     ResultTag,
-    Configuration,
 )

history/templatetags/dialogtags.py

@@ -1,9 +1,10 @@
+import json
+
 from django import template
-from django_evaluation.ldaptools import get_ldap_object
 from django.utils.safestring import mark_safe
-from django_evaluation import settings
 
-import json
+from django_evaluation import settings
+from django_evaluation.ldaptools import get_ldap_object
 
 register = template.Library()
 

history/templatetags/resulttags.py

@@ -1,18 +1,17 @@
+import re
+
 from django import template
-from django.utils.safestring import mark_safe
+from django.template.loader import render_to_string
 from django.utils.encoding import force_str
 from django.utils.html import conditional_escape
-from django.template.loader import render_to_string
-from base.LdapUser import LdapUser
+from django.utils.safestring import mark_safe
+from evaluation_system.misc.exceptions import PluginManagerException
+
 from base.exceptions import UserNotFoundError
+from base.LdapUser import LdapUser
 from django_evaluation import settings
-
-from history.utils import FileDict
 from history.models import HistoryTag
-
-from evaluation_system.misc.exceptions import PluginManagerException
-
-import re
+from history.utils import FileDict
 
 register = template.Library()
 

history/urls.py

@@ -1,10 +1,10 @@
-from django.urls import re_path as url
 from django.contrib.auth.decorators import login_required
+from django.urls import re_path as url
 from django.views.decorators.cache import never_cache
+
 from history import views
 from plugins.views_api import ShareResultsByMail
 
-
 urlpatterns = [
     url(
         r"^$", never_cache(login_required(views.HistoryTable.as_view())), name="history"