- fixes for the new major isort release

zopefoundation · Jul 10, 2020 · 9995140 · 9995140
1 parent 8d48b8c
commit 9995140
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -31,9 +31,6 @@ force_single_line = True
 line_length = 200
 lines_after_imports = 2
 
-not_skip =
-    __init__.py
-
 [flake8]
 ignore =
     # W503 line break before binary operator: is no longer requested by PEP-8

diff --git a/tests/builtins/test_utilities.py b/tests/builtins/test_utilities.py
@@ -1,24 +1,24 @@
+import math
+import random
+import string
+
 
 def test_string_in_utility_builtins():
-    import string
     from RestrictedPython.Utilities import utility_builtins
     assert utility_builtins['string'] is string
 
 
 def test_math_in_utility_builtins():
-    import math
     from RestrictedPython.Utilities import utility_builtins
     assert utility_builtins['math'] is math
 
 
 def test_whrandom_in_utility_builtins():
-    import random
     from RestrictedPython.Utilities import utility_builtins
     assert utility_builtins['whrandom'] is random
 
 
 def test_random_in_utility_builtins():
-    import random
     from RestrictedPython.Utilities import utility_builtins
     assert utility_builtins['random'] is random
 

diff --git a/tox.ini b/tox.ini
@@ -56,7 +56,7 @@ deps =
     isort
 
 commands =
-    isort --apply --recursive {toxinidir}/src {toxinidir}/tests {posargs}
+    isort --apply {toxinidir}/src {toxinidir}/tests {posargs}
 
 [testenv:autopep8]
 skip_install = true
@@ -84,12 +84,11 @@ deps =
     flake8-deprecated
     flake8-pytest
     flake8-todo
-    flake8-isort
     mccabe
 
 commands =
     mkdir -p {toxinidir}/_build/flake8
-    - isort --check-only --recursive {toxinidir}/src {toxinidir}/tests setup.py
+    - isort --check-only --diff {toxinidir}/src {toxinidir}/tests setup.py
     - flake8 --format=html --htmldir={toxinidir}/_build/flake8 --doctests src tests setup.py
     flake8 src tests setup.py --doctests