From 7f3d2920ffb99213f9fcb881ac6030c1e2c77255 Mon Sep 17 00:00:00 2001 From: Craig Davies Date: Mon, 6 Jul 2020 16:01:04 -0400 Subject: [PATCH] Fix lint errors due to using isort 5.0 Removed `not_skip` and `recursive` from `tox.ini` to fix TypeError: __init__() got an unexpected keyword argument 'not_skip' * recursive Prior to version 5.0.0, isort wouldn't automatically traverse directories. The --recursive option was necessary to tell it to do so. In 5.0.0 directories are automatically traversed for all Python files, and as such this option is no longer necessary and should simply be removed. * not_skip In an earlier version isort had a default skip of __init__.py. To get around that many projects wanted a way to not skip __init__.py or any other files that were automatically skipped in the future by isort. isort no longer has any default skips, so if the value here is __init__.py you can simply remove the setting. https://timothycrosley.github.io/isort/docs/upgrade_guides/5.0.0/ --- tox.ini | 3 +-- wagtailsharing/helpers.py | 1 + wagtailsharing/tests/test_helpers.py | 1 + wagtailsharing/tests/test_models.py | 1 + wagtailsharing/tests/test_urls.py | 5 +++-- wagtailsharing/tests/test_views.py | 1 + wagtailsharing/tests/test_wagtail_hooks.py | 1 + wagtailsharing/tests/urls.py | 1 + wagtailsharing/urls.py | 1 + wagtailsharing/views.py | 1 + wagtailsharing/wagtail_hooks.py | 1 + 11 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 5c0e434..1065542 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ deps= commands= black --check wagtailsharing setup.py flake8 wagtailsharing - isort --check-only --diff --recursive wagtailsharing + isort --check-only --diff wagtailsharing [flake8] ignore=E731,W503,W504 @@ -50,7 +50,6 @@ lines_after_imports=2 include_trailing_comma=1 multi_line_output=3 skip=.tox,migrations -not_skip=__init__.py use_parentheses=1 known_django=django known_future_library=future diff --git a/wagtailsharing/helpers.py b/wagtailsharing/helpers.py index 077a46c..582db55 100644 --- a/wagtailsharing/helpers.py +++ b/wagtailsharing/helpers.py @@ -1,4 +1,5 @@ from wagtail.core.models import Site + from wagtailsharing.models import SharingSite diff --git a/wagtailsharing/tests/test_helpers.py b/wagtailsharing/tests/test_helpers.py index 92e17a0..85ac98f 100644 --- a/wagtailsharing/tests/test_helpers.py +++ b/wagtailsharing/tests/test_helpers.py @@ -2,6 +2,7 @@ from wagtail.core.models import Site from wagtail.tests.testapp.models import SimplePage + from wagtailsharing.helpers import get_sharing_url from wagtailsharing.models import SharingSite from wagtailsharing.tests.helpers import create_draft_page diff --git a/wagtailsharing/tests/test_models.py b/wagtailsharing/tests/test_models.py index b2fb523..7542148 100644 --- a/wagtailsharing/tests/test_models.py +++ b/wagtailsharing/tests/test_models.py @@ -2,6 +2,7 @@ from django.test import RequestFactory, TestCase from wagtail.core.models import Site + from wagtailsharing.models import SharingSite diff --git a/wagtailsharing/tests/test_urls.py b/wagtailsharing/tests/test_urls.py index d905b44..ca1a75c 100644 --- a/wagtailsharing/tests/test_urls.py +++ b/wagtailsharing/tests/test_urls.py @@ -2,9 +2,10 @@ from django.test import TestCase -import wagtail.core.urls as wagtail_core_urls -import wagtailsharing.urls from mock import patch +from wagtail.core import urls as wagtail_core_urls + +import wagtailsharing.urls try: diff --git a/wagtailsharing/tests/test_views.py b/wagtailsharing/tests/test_views.py index cd171b8..e75a7e3 100644 --- a/wagtailsharing/tests/test_views.py +++ b/wagtailsharing/tests/test_views.py @@ -4,6 +4,7 @@ from mock import patch from wagtail.core.models import Site from wagtail.tests.utils import WagtailTestUtils + from wagtailsharing.models import SharingSite from wagtailsharing.tests.helpers import ( create_draft_page, diff --git a/wagtailsharing/tests/test_wagtail_hooks.py b/wagtailsharing/tests/test_wagtail_hooks.py index de7eec7..8531042 100644 --- a/wagtailsharing/tests/test_wagtail_hooks.py +++ b/wagtailsharing/tests/test_wagtail_hooks.py @@ -4,6 +4,7 @@ from mock import Mock, patch from wagtail.tests.testapp.models import SimplePage + from wagtailsharing.wagtail_hooks import add_sharing_banner, add_sharing_link diff --git a/wagtailsharing/tests/urls.py b/wagtailsharing/tests/urls.py index f1d752b..914ab50 100644 --- a/wagtailsharing/tests/urls.py +++ b/wagtailsharing/tests/urls.py @@ -1,4 +1,5 @@ from wagtail.admin import urls as wagtailadmin_urls + from wagtailsharing import urls as wagtailsharing_urls diff --git a/wagtailsharing/urls.py b/wagtailsharing/urls.py index 0539e33..07bddf6 100644 --- a/wagtailsharing/urls.py +++ b/wagtailsharing/urls.py @@ -2,6 +2,7 @@ serve_pattern, urlpatterns as wagtailcore_urlpatterns, ) + from wagtailsharing.views import ServeView diff --git a/wagtailsharing/views.py b/wagtailsharing/views.py index 18d87aa..1d5a4be 100644 --- a/wagtailsharing/views.py +++ b/wagtailsharing/views.py @@ -7,6 +7,7 @@ from wagtail.core import hooks from wagtail.core.url_routing import RouteResult from wagtail.core.views import serve as wagtail_serve + from wagtailsharing.models import SharingSite diff --git a/wagtailsharing/wagtail_hooks.py b/wagtailsharing/wagtail_hooks.py index 72cc138..bd439fd 100644 --- a/wagtailsharing/wagtail_hooks.py +++ b/wagtailsharing/wagtail_hooks.py @@ -8,6 +8,7 @@ from wagtail.admin import widgets as wagtailadmin_widgets from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.core import hooks + from wagtailsharing.helpers import get_sharing_url from wagtailsharing.models import SharingSite