Merge pull request #237 from python-adaptive/power-up-pre-commit

jbweston · web-flow · commit 96362346594b · 2019-12-12T15:24:24.000+01:00
Power up pre-commit
diff --git a/.isort.cfg b/.isort.cfg
@@ -0,0 +1,2 @@
+[settings]
+known_third_party = PIL,atomicwrites,holoviews,ipykernel,matplotlib,nbconvert,numpy,pytest,scipy,setuptools,skopt,sortedcollections,sortedcontainers,zmq
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,16 +1,43 @@
 repos:
--   repo: https://github.com/ambv/black
-    rev: 19.3b0
-    hooks:
-    - id: black
-      language_version: python3.7
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v2.4.0
     hooks:
-    -   id: end-of-file-fixer
     -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-docstring-first
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: check-ast
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.8
+    rev: 3.7.9
     hooks:
     -   id: flake8
-        args: ['--max-line-length=500', '--ignore=E203,E266,E501,W503', '--max-complexity=18', '--select=B,C,E,F,W,T4,B9']
+        args:
+          - --max-line-length=500
+          - --ignore=E203,E266,E501,W503
+          - --max-complexity=18
+          - --select=B,C,E,F,W,T4,B9
+-   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
+    hooks:
+    -   id: pyupgrade
+        args: ['--py36-plus']
+-   repo: https://github.com/pre-commit/mirrors-isort
+    rev: v4.3.21
+    hooks:
+    -   id: isort
+        args:
+          - --multi-line=3
+          - --trailing-comma
+          - --force-grid-wrap=0
+          - --use-parentheses
+          - --line-width=88
+-   repo: https://github.com/asottile/seed-isort-config
+    rev: v1.9.3
+    hooks:
+    -   id: seed-isort-config
diff --git a/adaptive/__init__.py b/adaptive/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from contextlib import suppress
 
 from adaptive import learner, runner, utils
diff --git a/adaptive/_version.py b/adaptive/_version.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of 'miniver': https://github.com/jbweston/miniver
 #
 import os
diff --git a/adaptive/learner/__init__.py b/adaptive/learner/__init__.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from contextlib import suppress
 
 from adaptive.learner.average_learner import AverageLearner
diff --git a/adaptive/learner/average_learner.py b/adaptive/learner/average_learner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from math import sqrt
 
 import numpy as np
diff --git a/adaptive/learner/balancing_learner.py b/adaptive/learner/balancing_learner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import itertools
 from collections import defaultdict
 from collections.abc import Iterable
diff --git a/adaptive/learner/base_learner.py b/adaptive/learner/base_learner.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
-
 import abc
 from contextlib import suppress
 from copy import deepcopy
 
-from adaptive.utils import load, save, _RequireAttrsABCMeta
+from adaptive.utils import _RequireAttrsABCMeta, load, save
 
 
 def uses_nth_neighbors(n):
diff --git a/adaptive/learner/data_saver.py b/adaptive/learner/data_saver.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import functools
 from collections import OrderedDict
 
diff --git a/adaptive/learner/integrator_coeffs.py b/adaptive/learner/integrator_coeffs.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on an adaptive quadrature algorithm by Pedro Gonnet
 
 from collections import defaultdict
diff --git a/adaptive/learner/integrator_learner.py b/adaptive/learner/integrator_learner.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Based on an adaptive quadrature algorithm by Pedro Gonnet
 
 import sys
@@ -572,9 +571,15 @@ def _get_data(self):
         )
 
     def _set_data(self, data):
-        self.priority_split, self.data, self.pending_points, self._stack, x_mapping, self.ivals, self.first_ival = (
-            data
-        )
+        (
+            self.priority_split,
+            self.data,
+            self.pending_points,
+            self._stack,
+            x_mapping,
+            self.ivals,
+            self.first_ival,
+        ) = data
 
         # Add the pending_points to the _stack such that they are evaluated again
         for x in self.pending_points:
diff --git a/adaptive/learner/learner1D.py b/adaptive/learner/learner1D.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import itertools
 import math
 from collections.abc import Iterable
diff --git a/adaptive/learner/learner2D.py b/adaptive/learner/learner2D.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import itertools
 import warnings
 from collections import OrderedDict
diff --git a/adaptive/learner/learnerND.py b/adaptive/learner/learnerND.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import functools
 import itertools
 import random
@@ -340,8 +338,8 @@ def __init__(self, func, bounds, loss_per_simplex=None):
         self._min_value = None
         self._max_value = None
         self._output_multiplier = (
-            1
-        )  # If we do not know anything, do not scale the values
+            1  # If we do not know anything, do not scale the values
+        )
         self._recompute_losses_factor = 1.1
 
         # create a private random number generator with fixed seed
diff --git a/adaptive/learner/skopt_learner.py b/adaptive/learner/skopt_learner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import collections
 
 import numpy as np
diff --git a/adaptive/learner/triangulation.py b/adaptive/learner/triangulation.py
@@ -228,7 +228,7 @@ def simplex_volume_in_embedding(vertices) -> float:
     # Make matrix and find volume
     sq_dists_mat = scipy.spatial.distance.squareform(bordered)
 
-    coeff = -(-2) ** (num_verts - 1) * factorial(num_verts - 1) ** 2
+    coeff = -((-2) ** (num_verts - 1)) * factorial(num_verts - 1) ** 2
     vol_square = fast_det(sq_dists_mat) / coeff
 
     if vol_square < 0:
diff --git a/adaptive/notebook_integration.py b/adaptive/notebook_integration.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import asyncio
 import datetime
 import importlib
diff --git a/adaptive/runner.py b/adaptive/runner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import abc
 import asyncio
 import concurrent.futures as concurrent
diff --git a/adaptive/tests/test_average_learner.py b/adaptive/tests/test_average_learner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import random
 
 import numpy as np
diff --git a/adaptive/tests/test_balancing_learner.py b/adaptive/tests/test_balancing_learner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import pytest
 
 from adaptive.learner import BalancingLearner, Learner1D
diff --git a/adaptive/tests/test_cquad.py b/adaptive/tests/test_cquad.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from functools import partial
 from operator import attrgetter
 
diff --git a/adaptive/tests/test_learner1d.py b/adaptive/tests/test_learner1d.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import random
 
 import numpy as np
diff --git a/adaptive/tests/test_learnernd.py b/adaptive/tests/test_learnernd.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import numpy as np
 import scipy.spatial
 
diff --git a/adaptive/tests/test_learners.py b/adaptive/tests/test_learners.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import collections
 import functools as ft
 import inspect
@@ -129,15 +127,15 @@ def linear_with_peak(x, d: uniform(-1, 1)):
 def ring_of_fire(xy, d: uniform(0.2, 1)):
     a = 0.2
     x, y = xy
-    return x + math.exp(-(x ** 2 + y ** 2 - d ** 2) ** 2 / a ** 4)
+    return x + math.exp(-((x ** 2 + y ** 2 - d ** 2) ** 2) / a ** 4)
 
 
 @learn_with(LearnerND, bounds=((-1, 1), (-1, 1), (-1, 1)))
 @learn_with(SequenceLearner, sequence=np.random.rand(1000, 3))
 def sphere_of_fire(xyz, d: uniform(0.2, 1)):
     a = 0.2
     x, y, z = xyz
-    return x + math.exp(-(x ** 2 + y ** 2 + z ** 2 - d ** 2) ** 2 / a ** 4) + z ** 2
+    return x + math.exp(-((x ** 2 + y ** 2 + z ** 2 - d ** 2) ** 2) / a ** 4) + z ** 2
 
 
 @learn_with(SequenceLearner, sequence=range(1000))
diff --git a/adaptive/tests/test_notebook_integration.py b/adaptive/tests/test_notebook_integration.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import ipykernel.iostream
 import zmq
 
diff --git a/adaptive/tests/test_runner.py b/adaptive/tests/test_runner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import asyncio
 import time
 
diff --git a/adaptive/tests/test_skopt_learner.py b/adaptive/tests/test_skopt_learner.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import numpy as np
 import pytest
 
diff --git a/adaptive/tests/test_triangulation.py b/adaptive/tests/test_triangulation.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import itertools
 from collections import Counter
 from math import factorial
diff --git a/adaptive/tests/unit/test_learnernd.py b/adaptive/tests/unit/test_learnernd.py
@@ -12,7 +12,7 @@ def ring_of_fire(xy):
     a = 0.2
     d = 0.7
     x, y = xy
-    return x + math.exp(-(x ** 2 + y ** 2 - d ** 2) ** 2 / a ** 4)
+    return x + math.exp(-((x ** 2 + y ** 2 - d ** 2) ** 2) / a ** 4)
 
 
 def test_learnerND_inits_loss_depends_on_neighbors_correctly():
diff --git a/adaptive/tests/unit/test_learnernd_integration.py b/adaptive/tests/unit/test_learnernd_integration.py
@@ -11,7 +11,7 @@
 def ring_of_fire(xy, d=0.75):
     a = 0.2
     x, y = xy
-    return x + math.exp(-(x ** 2 + y ** 2 - d ** 2) ** 2 / a ** 4)
+    return x + math.exp(-((x ** 2 + y ** 2 - d ** 2) ** 2) / a ** 4)
 
 
 def test_learnerND_runs_to_10_points():
diff --git a/adaptive/utils.py b/adaptive/utils.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import abc
 import functools
 import gzip
diff --git a/benchmarks/benchmarks/benchmarks.py b/benchmarks/benchmarks/benchmarks.py
@@ -15,7 +15,7 @@ def f_1d(x, offset=offset):
 def f_2d(xy):
     x, y = xy
     a = 0.2
-    return x + np.exp(-(x ** 2 + y ** 2 - 0.75 ** 2) ** 2 / a ** 4)
+    return x + np.exp(-((x ** 2 + y ** 2 - 0.75 ** 2) ** 2) / a ** 4)
 
 
 class TimeLearner1D:
diff --git a/docs/logo.py b/docs/logo.py
@@ -8,7 +8,7 @@
 
 sys.path.insert(0, os.path.abspath(".."))  # to get adaptive on the path
 
-import adaptive  # noqa: E402
+import adaptive  # noqa: E402, isort:skip
 
 holoviews.notebook_extension("matplotlib")
 
@@ -19,7 +19,7 @@ def ring(xy):
 
         x, y = xy
         a = 0.2
-        return x + np.exp(-(x ** 2 + y ** 2 - 0.75 ** 2) ** 2 / a ** 4)
+        return x + np.exp(-((x ** 2 + y ** 2 - 0.75 ** 2) ** 2) / a ** 4)
 
     learner = adaptive.Learner2D(ring, bounds=[(-1, 1), (-1, 1)])
     adaptive.runner.simple(learner, goal=lambda l: l.loss() < 0.01)
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Configuration file for the Sphinx documentation builder.
 #
@@ -18,12 +17,11 @@
 package_path = os.path.abspath("../..")
 # Insert into sys.path so that we can import adaptive here
 sys.path.insert(0, package_path)
-
-import adaptive  # noqa: E402
-
 # Insert into PYTHONPATH so that jupyter-sphinx will pick it up
 os.environ["PYTHONPATH"] = ":".join((package_path, os.environ.get("PYTHONPATH", "")))
 
+import adaptive  # noqa: E402, isort:skip
+
 # -- Project information -----------------------------------------------------
 
 project = "adaptive"
diff --git a/setup.py b/setup.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import sys
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[settings]`
	`2`	`+known_third_party = PIL,atomicwrites,holoviews,ipykernel,matplotlib,nbconvert,numpy,pytest,scipy,setuptools,skopt,sortedcollections,sortedcontainers,zmq`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`from contextlib import suppress`
`4`	`2`
`5`	`3`	`from adaptive import learner, runner, utils`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`# This file is part of 'miniver': https://github.com/jbweston/miniver`
`3`	`2`	`#`
`4`	`3`	`import os`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`from math import sqrt`
`4`	`2`
`5`	`3`	`import numpy as np`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`import itertools`
`4`	`2`	`from collections import defaultdict`
`5`	`3`	`from collections.abc import Iterable`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`		`-`
`3`	`1`	`import functools`
`4`	`2`	`from collections import OrderedDict`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`# Based on an adaptive quadrature algorithm by Pedro Gonnet`
`3`	`2`
`4`	`3`	`from collections import defaultdict`