From b4fde1b1b956e18945c46893e32e729ea481a219 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Tue, 8 Sep 2020 21:38:37 +0200
Subject: [PATCH] Fix lint job
---
aleksis/core/apps.py | 2 +-
aleksis/core/settings.py | 2 +-
aleksis/core/util/core_helpers.py | 1 -
tox.ini | 5 ++---
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/aleksis/core/apps.py b/aleksis/core/apps.py
index 030e56d6d..e627b0a2e 100644
--- a/aleksis/core/apps.py
+++ b/aleksis/core/apps.py
@@ -14,7 +14,7 @@ from .registries import (
site_preferences_registry,
)
from .util.apps import AppConfig
-from .util.core_helpers import get_site_preferences, has_person, lazy_preference
+from .util.core_helpers import get_site_preferences, has_person
from .util.sass_helpers import clean_scss
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index ec1dc61ed..8826bc9ea 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -208,7 +208,7 @@ if _settings.get("ldap.uri", None):
NestedGroupOfNamesType,
NestedGroupOfUniqueNamesType,
PosixGroupType,
- ) # noqa
+ )
# Enable Django's integration to LDAP
AUTHENTICATION_BACKENDS.append("django_auth_ldap.backend.LDAPBackend")
diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py
index 788a4debe..37ab87eec 100644
--- a/aleksis/core/util/core_helpers.py
+++ b/aleksis/core/util/core_helpers.py
@@ -365,7 +365,6 @@ def queryset_rules_filter(
obj: Union[HttpRequest, Model], queryset: QuerySet, perm: str
) -> QuerySet:
"""Filter queryset by user and permission."""
-
wanted_objects = set()
if isinstance(obj, HttpRequest) and hasattr(obj, "user"):
obj = obj.user
diff --git a/tox.ini b/tox.ini
index 3729453a3..eca63a758 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ setenv =
[testenv:lint]
commands =
- poetry run black --check --diff aleksis/
- - poetry run isort -c --diff --stdout -rc aleksis/
+ - poetry run isort -c --diff --stdout aleksis/
poetry run flake8 {posargs} aleksis/
[testenv:security]
@@ -40,7 +40,7 @@ commands = poetry run make -C docs/ html {posargs}
[testenv:reformat]
commands =
- poetry run isort -rc aleksis/
+ poetry run isort aleksis/
poetry run black aleksis/
[flake8]
@@ -52,7 +52,6 @@ ignore = BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107,RST215,RS
line_length = 100
multi_line_output = 3
include_trailing_comma = 1
-use_parantheses = 1
default_section = THIRDPARTY
known_first_party = aleksis
known_django = django
--
GitLab