diff --git a/CHANGES.rst b/CHANGES.rst index 0453eea..3a621f3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Changelog 5.5 (unreleased) ---------------- +- Update configuration for version 5 of ``isort`` + 5.4 (2020-02-06) ---------------- diff --git a/setup.cfg b/setup.cfg index e5e6cfe..64b368a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,6 @@ known_third_party = six default_section = ZOPE line_length = 79 lines_after_imports = 2 -not_skip = - __init__.py [flake8] ignore = diff --git a/src/Products/SiteErrorLog/SiteErrorLog.py b/src/Products/SiteErrorLog/SiteErrorLog.py index a259c7f..3733b89 100644 --- a/src/Products/SiteErrorLog/SiteErrorLog.py +++ b/src/Products/SiteErrorLog/SiteErrorLog.py @@ -28,13 +28,14 @@ from Acquisition import aq_base from App.Dialogs import MessageDialog from OFS.SimpleItem import SimpleItem -from Products.PageTemplates.PageTemplateFile import PageTemplateFile from transaction.interfaces import TransientError from zExceptions.ExceptionFormatter import format_exception from zope.component import adapter from zope.event import notify from ZPublisher.interfaces import IPubFailure +from Products.PageTemplates.PageTemplateFile import PageTemplateFile + from .interfaces import ErrorRaisedEvent diff --git a/src/Products/SiteErrorLog/tests/testInitialization.py b/src/Products/SiteErrorLog/tests/testInitialization.py index d6e3641..337d951 100644 --- a/src/Products/SiteErrorLog/tests/testInitialization.py +++ b/src/Products/SiteErrorLog/tests/testInitialization.py @@ -17,13 +17,14 @@ import tempfile import unittest -import Products from App.config import getConfiguration from App.config import setConfiguration from OFS.Application import AppInitializer from OFS.Application import Application from Zope2.Startup.options import ZopeWSGIOptions +import Products + test_cfg = """ instancehome {instance_home} diff --git a/tox.ini b/tox.ini index c1ffa88..08f12f4 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,7 @@ basepython = python3.6 commands_pre = mkdir -p {toxinidir}/parts/flake8 commands = - isort --check-only --diff --recursive {toxinidir}/src setup.py + isort --check-only --diff {toxinidir}/src setup.py - flake8 --format=html src setup.py flake8 src setup.py deps = @@ -52,7 +52,6 @@ deps = flake8-debugger flake8-deprecated flake8-todo - flake8-isort mccabe flake8-blind-except flake8-commas