Merge pull request #287 from python-adaptive/update-pre-commit

Author: github-actions[bot]

.pre-commit-config.yaml

@@ -1,32 +1,33 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.4.0
+    rev: v3.2.0
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-docstring-first
-    -   id: check-yaml
-    -   id: debug-statements
-    -   id: check-ast
+        -   id: check-docstring-first
+        -   id: check-ast
+        -   id: check-json
+        -   id: check-yaml
+        -   id: debug-statements
+        -   id: end-of-file-fixer
+        -   id: trailing-whitespace
 -   repo: https://github.com/ambv/black
     rev: 19.10b0
     hooks:
     - id: black
       language_version: python3.7
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.25.2
+    rev: v2.7.2
     hooks:
     -   id: pyupgrade
         args: ['--py36-plus']
 -   repo: https://github.com/asottile/seed-isort-config
-    rev: v1.9.3
+    rev: v2.2.0
     hooks:
     -   id: seed-isort-config
 -   repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.3.2
     hooks:
     -   id: isort
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 3.8.3
     hooks:
     -   id: flake8

adaptive/notebook_integration.py

@@ -64,8 +64,8 @@ def ensure_plotly():
         import plotly
 
         if not _plotly_enabled:
-            import plotly.graph_objs
             import plotly.figure_factory
+            import plotly.graph_objs
             import plotly.offline
 
             # This injects javascript and should happen only once

adaptive/tests/test_cquad.py

@@ -161,8 +161,8 @@ def test_adding_points_and_skip_one_point():
 # XXX: This *should* pass (https://github.com/python-adaptive/adaptive/issues/55)
 @pytest.mark.xfail
 def test_tell_in_random_order(first_add_33=False):
-    from operator import attrgetter
     import random
+    from operator import attrgetter
 
     tol = 1e-10
     for f, a, b in ([f0, 0, 3], [f21, 0, 1], [f24, 0, 3], [f7, 0, 1]):

adaptive/tests/unit/test_triangulation.py

@@ -63,10 +63,11 @@ def test_triangulation_find_opposing_vertices_raises_if_simplex_is_invalid():
 
 
 def test_circumsphere():
-    from adaptive.learner.triangulation import circumsphere, fast_norm
     from numpy import allclose
     from numpy.random import normal, uniform
 
+    from adaptive.learner.triangulation import circumsphere, fast_norm
+
     def generate_random_sphere_points(dim, radius=0):
         """https://math.stackexchange.com/a/1585996"""
 

benchmarks/asv.conf.json

@@ -14,7 +14,7 @@
         "holoviews": ["1.9.1"],
         "scipy": ["0.19.1"],
         "ipyparallel": ["6.0.2"],
-        "sortedcontainers": ["1.5.7"],
+        "sortedcontainers": ["1.5.7"]
     },
     "benchmark_dir": "benchmarks",
     "env_dir": "env",

tox.ini

@@ -54,7 +54,7 @@ commands = pre-commit run --all-files --show-diff-on-failure
 
 [flake8]
 max-line-length = 100
-ignore = E501, W503, E203, E266
+ignore = E501, W503, E203, E266, E741
 max-complexity = 18
 select = B, C, E, F, W, T4, B9
 exclude = .git, .tox, __pycache__, dist