Skip to content

Commit

Permalink
Merge 7f3d292 into 7ffe146
Browse files Browse the repository at this point in the history
  • Loading branch information
cwdavies committed Jul 6, 2020
2 parents 7ffe146 + 7f3d292 commit be4d1d8
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 4 deletions.
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/helpers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from wagtail.core.models import Site

from wagtailsharing.models import SharingSite


Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/tests/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.test import RequestFactory, TestCase

from wagtail.core.models import Site

from wagtailsharing.models import SharingSite


Expand Down
5 changes: 3 additions & 2 deletions wagtailsharing/tests/test_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/tests/test_wagtail_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from wagtail.admin import urls as wagtailadmin_urls

from wagtailsharing import urls as wagtailsharing_urls


Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
serve_pattern,
urlpatterns as wagtailcore_urlpatterns,
)

from wagtailsharing.views import ServeView


Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 1 addition & 0 deletions wagtailsharing/wagtail_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit be4d1d8

Please sign in to comment.