From 3527979f63929da684b0b5e8c5da65280991d464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Gmach?= Date: Thu, 16 Jul 2020 12:01:07 +0200 Subject: [PATCH 1/4] Update configuration for version 5 of `isort` - remove deprecated configuration options - remove duplicate isort check via flake8 - fix sort order of imports modified: CHANGES.rst modified: setup.cfg modified: src/Products/SiteErrorLog/SiteErrorLog.py modified: src/Products/SiteErrorLog/tests/testInitialization.py modified: tox.ini --- CHANGES.rst | 2 ++ setup.cfg | 2 -- src/Products/SiteErrorLog/SiteErrorLog.py | 3 ++- src/Products/SiteErrorLog/tests/testInitialization.py | 3 ++- tox.ini | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) 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 From 468645ad07ddf7a56552eea9e4b236780efd7dc0 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Thu, 16 Jul 2020 13:12:53 +0200 Subject: [PATCH 2/4] - clean up tox config and enable parallel runs with ``-pall`` --- .coveragerc | 6 ------ buildout.cfg | 5 ----- tox.ini | 15 ++++++++++----- 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index b3c4f29..0000000 --- a/.coveragerc +++ /dev/null @@ -1,6 +0,0 @@ -[run] -branch = True -source = Products.SiteErrorLog - -[report] -precision = 2 diff --git a/buildout.cfg b/buildout.cfg index 6bb4dcb..833d0c0 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -4,12 +4,7 @@ extends = develop = . parts = test - tox [test] recipe = zc.recipe.testrunner eggs = Products.SiteErrorLog - -[tox] -recipe = zc.recipe.egg -eggs = tox diff --git a/tox.ini b/tox.ini index 08f12f4..6856b0c 100644 --- a/tox.ini +++ b/tox.ini @@ -5,13 +5,12 @@ envlist = py36, py37, py38, - flake8, + lint, coverage-report, [testenv] skip_install = true commands = - {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} buildout:sources-dir={toxinidir}/develop install test coverage run {envbindir}/test --all {posargs:-vc} deps = @@ -24,17 +23,23 @@ setenv = [testenv:coverage-report] basepython = python3.6 deps = coverage +depends = + py27, + py35, + py36, + py37, + py38 setenv = COVERAGE_FILE=.coverage skip_install = true commands = coverage erase coverage combine - coverage html -i --rcfile={toxinidir}/setup.cfg + coverage html -i coverage xml -i - coverage report -i --rcfile={toxinidir}/setup.cfg + coverage report -i -[testenv:flake8] +[testenv:lint] basepython = python3.6 commands_pre = mkdir -p {toxinidir}/parts/flake8 From bb2318098f61874ca79dd5c7ee993b7c8a3b2a9e Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Thu, 16 Jul 2020 13:13:25 +0200 Subject: [PATCH 3/4] - fix imports by designating packages as belonging to the default Zope section --- setup.cfg | 3 ++- src/Products/SiteErrorLog/SiteErrorLog.py | 3 +-- src/Products/SiteErrorLog/tests/testInitialization.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 64b368a..db8c92b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,6 +11,7 @@ force_single_line = True combine_as_imports = True sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER known_third_party = six +known_zope = Products, Products.PageTemplates default_section = ZOPE line_length = 79 lines_after_imports = 2 @@ -27,7 +28,7 @@ exclude = [coverage:run] branch = True -source = src +source = Products.SiteErrorLog omit = [coverage:report] diff --git a/src/Products/SiteErrorLog/SiteErrorLog.py b/src/Products/SiteErrorLog/SiteErrorLog.py index 3733b89..a259c7f 100644 --- a/src/Products/SiteErrorLog/SiteErrorLog.py +++ b/src/Products/SiteErrorLog/SiteErrorLog.py @@ -28,14 +28,13 @@ 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 337d951..d6e3641 100644 --- a/src/Products/SiteErrorLog/tests/testInitialization.py +++ b/src/Products/SiteErrorLog/tests/testInitialization.py @@ -17,14 +17,13 @@ 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} From 6add375e44e6bba4431ea064d5f4c44d13181156 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Thu, 16 Jul 2020 13:16:40 +0200 Subject: [PATCH 4/4] - fix Travis config --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf5bff1..13af7c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,8 @@ language: python matrix: include: - python: "3.6" - env: TOXENV=flake8 + env: TOXENV=lint + after_success: - python: "2.7" env: TOXENV=py27 - python: "3.5" @@ -12,10 +13,8 @@ matrix: env: TOXENV=py36 - python: "3.7" env: TOXENV=py37 - dist: xenial - python: "3.8" env: TOXENV=py38 - dist: xenial install: - travis_retry pip install -U pip setuptools