Merge pull request #253 from ajhynes7/edit_pre_commit

Edit pre-commit

.pre-commit-config.yaml

@@ -8,12 +8,15 @@ repos:
           - id: check-merge-conflict
           - id: check-yaml
           - id: end-of-file-fixer
+          - id: no-commit-to-branch
+            args: [--branch, master]
           - id: requirements-txt-fixer
           - id: trailing-whitespace
     - repo: https://github.com/asottile/reorder_python_imports
       rev: v2.4.0
       hooks:
           - id: reorder-python-imports
+            args: [--application-directories, ".:src"]
     - repo: https://github.com/psf/black
       rev: 20.8b1
       hooks:

src/skspatial/_functions.py

@@ -7,6 +7,7 @@
 from typing import Callable
 
 import numpy as np
+
 from skspatial.typing import array_like
 
 

src/skspatial/measurement.py

@@ -1,5 +1,6 @@
 """Measurements using spatial objects."""
 import numpy as np
+
 from skspatial.objects import Vector
 from skspatial.typing import array_like
 

src/skspatial/objects/_base_array.py

@@ -4,6 +4,7 @@
 from typing import TypeVar
 
 import numpy as np
+
 from skspatial._functions import _allclose
 from skspatial.objects._base_spatial import _BaseSpatial
 from skspatial.typing import array_like

src/skspatial/objects/_base_line_plane.py

@@ -2,6 +2,7 @@
 import inspect
 
 import numpy as np
+
 from skspatial._functions import _contains_point
 from skspatial._functions import _sum_squares
 from skspatial.objects._base_spatial import _BaseSpatial

src/skspatial/objects/_base_sphere.py

@@ -1,5 +1,6 @@
 """Module for base class of Circle and Sphere."""
 import numpy as np
+
 from skspatial._functions import _contains_point
 from skspatial.objects._base_spatial import _BaseSpatial
 from skspatial.objects.point import Point

src/skspatial/objects/_mixins.py

@@ -3,6 +3,7 @@
 from typing import Tuple
 
 import numpy as np
+
 from skspatial._functions import _mesh_to_points
 from skspatial.objects.points import Points
 

src/skspatial/objects/circle.py

@@ -5,6 +5,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from matplotlib.axes import Axes
+
 from skspatial._functions import np_float
 from skspatial.objects._base_sphere import _BaseSphere
 from skspatial.objects.line import Line

src/skspatial/objects/cylinder.py

@@ -5,6 +5,7 @@
 
 import numpy as np
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial._functions import _solve_quadratic
 from skspatial.objects._base_spatial import _BaseSpatial
 from skspatial.objects._mixins import _ToPointsMixin

src/skspatial/objects/line.py

@@ -2,6 +2,7 @@
 import numpy as np
 from matplotlib.axes import Axes
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial.objects._base_line_plane import _BaseLinePlane
 from skspatial.objects.point import Point
 from skspatial.objects.points import Points

src/skspatial/objects/plane.py

@@ -4,6 +4,7 @@
 
 import numpy as np
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial.objects._base_line_plane import _BaseLinePlane
 from skspatial.objects._mixins import _ToPointsMixin
 from skspatial.objects.line import Line

src/skspatial/objects/point.py

@@ -2,6 +2,7 @@
 import numpy as np
 from matplotlib.axes import Axes
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial.objects._base_array import _BaseArray1D
 from skspatial.objects.vector import Vector
 from skspatial.plotting import _scatter_2d

src/skspatial/objects/points.py

@@ -5,6 +5,7 @@
 from matplotlib.axes import Axes
 from mpl_toolkits.mplot3d import Axes3D
 from numpy.linalg import matrix_rank
+
 from skspatial.objects._base_array import _BaseArray2D
 from skspatial.objects.point import Point
 from skspatial.plotting import _scatter_2d

src/skspatial/objects/sphere.py

@@ -4,6 +4,7 @@
 
 import numpy as np
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial._functions import np_float
 from skspatial.objects._base_sphere import _BaseSphere
 from skspatial.objects._mixins import _ToPointsMixin

src/skspatial/objects/triangle.py

@@ -6,6 +6,7 @@
 import numpy as np
 from matplotlib.axes import Axes
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial._functions import np_float
 from skspatial.objects._base_spatial import _BaseSpatial
 from skspatial.objects.line import Line

src/skspatial/objects/vector.py

@@ -5,6 +5,7 @@
 import numpy as np
 from matplotlib.axes import Axes
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial._functions import np_float
 from skspatial.objects._base_array import _BaseArray1D
 from skspatial.plotting import _connect_points_3d

src/skspatial/plotting.py

@@ -6,6 +6,7 @@
 import numpy as np
 from matplotlib.axes import Axes
 from mpl_toolkits.mplot3d import Axes3D
+
 from skspatial.typing import array_like
 
 

src/skspatial/transformation.py

@@ -3,6 +3,7 @@
 from typing import Sequence
 
 import numpy as np
+
 from skspatial.typing import array_like
 
 

tests/property/objects/test_array_1d.py

@@ -1,11 +1,11 @@
 """Test behaviour of points with vectors."""
 from hypothesis import given
+
 from skspatial.objects import Point
 from skspatial.objects import Vector
-
-from ..strategies import arrays
-from ..strategies import arrays_fixed
-from ..strategies import consistent_dim
+from tests.property.strategies import arrays
+from tests.property.strategies import arrays_fixed
+from tests.property.strategies import consistent_dim
 
 
 @given(consistent_dim(2 * [arrays_fixed]))

tests/property/objects/test_line.py

@@ -1,13 +1,13 @@
 import math
 
 from hypothesis import given
-from skspatial.objects import Line
 
-from ..constants import ATOL
-from ..strategies import consistent_dim
-from ..strategies import lines
-from ..strategies import points
-from ..strategies import vectors_nonzero
+from skspatial.objects import Line
+from tests.property.constants import ATOL
+from tests.property.strategies import consistent_dim
+from tests.property.strategies import lines
+from tests.property.strategies import points
+from tests.property.strategies import vectors_nonzero
 
 
 @given(consistent_dim([points, vectors_nonzero]))

tests/property/objects/test_plane.py

@@ -1,11 +1,11 @@
 from hypothesis import assume
 from hypothesis import given
+
 from skspatial.objects import Plane
 from skspatial.objects import Points
-
-from ..constants import ATOL
-from ..strategies import arrays_fixed
-from ..strategies import consistent_dim
+from tests.property.constants import ATOL
+from tests.property.strategies import arrays_fixed
+from tests.property.strategies import consistent_dim
 
 
 @given(consistent_dim(3 * [arrays_fixed], max_dim=3))

tests/property/objects/test_point.py

@@ -1,11 +1,11 @@
 import math
 
 from hypothesis import given
+
 from skspatial.objects import Point
 from skspatial.objects import Vector
-
-from ..strategies import arrays_fixed
-from ..strategies import consistent_dim
+from tests.property.strategies import arrays_fixed
+from tests.property.strategies import consistent_dim
 
 
 @given(consistent_dim(2 * [arrays_fixed]))

tests/property/objects/test_triangle.py

@@ -1,6 +1,6 @@
 from hypothesis import given
 
-from ..strategies import triangles
+from tests.property.strategies import triangles
 
 
 @given(triangles(2))

tests/property/objects/test_vector.py

@@ -4,16 +4,16 @@
 import pytest
 from hypothesis import assume
 from hypothesis import given
+
 from skspatial.objects import Point
 from skspatial.objects import Vector
-
-from ..constants import ATOL
-from ..strategies import arrays
-from ..strategies import arrays_fixed
-from ..strategies import arrays_fixed_nonzero
-from ..strategies import arrays_nonzero
-from ..strategies import consistent_dim
-from ..strategies import floats
+from tests.property.constants import ATOL
+from tests.property.strategies import arrays
+from tests.property.strategies import arrays_fixed
+from tests.property.strategies import arrays_fixed_nonzero
+from tests.property.strategies import arrays_nonzero
+from tests.property.strategies import consistent_dim
+from tests.property.strategies import floats
 
 
 @given(consistent_dim(2 * [arrays_fixed]))

tests/property/strategies.py

@@ -1,6 +1,7 @@
 """Custom strategies for property tests."""
 import hypothesis.strategies as st
 from hypothesis import assume
+
 from skspatial.objects import Circle
 from skspatial.objects import Line
 from skspatial.objects import Plane
@@ -9,10 +10,9 @@
 from skspatial.objects import Sphere
 from skspatial.objects import Triangle
 from skspatial.objects import Vector
-
-from .constants import DIM_MAX
-from .constants import DIM_MIN
-from .constants import FLOAT_MIN
+from tests.property.constants import DIM_MAX
+from tests.property.constants import DIM_MIN
+from tests.property.constants import FLOAT_MIN
 
 
 floats = st.floats(min_value=-1e4, max_value=1e4).filter(lambda x: x == 0 or abs(x) > FLOAT_MIN)
@@ -41,7 +41,7 @@ def arrays_fixed(draw, dim=2):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import arrays_fixed
+    >>> from tests.property.strategies import arrays_fixed
 
     >>> find(arrays_fixed(2), lambda x: True)
     [0.0, 0.0]
@@ -90,7 +90,7 @@ def points(draw, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import points
+    >>> from tests.property.strategies import points
 
     >>> find(points(3), lambda x: True)
     Point([0., 0., 0.])
@@ -117,7 +117,7 @@ def vectors(draw, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import vectors
+    >>> from tests.property.strategies import vectors
 
     >>> find(vectors(2), lambda x: True)
     Vector([0., 0.])
@@ -163,7 +163,7 @@ def multi_points(draw, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import multi_points
+    >>> from tests.property.strategies import multi_points
 
     >>> find(multi_points(2), lambda x: len(x) == 3)
     Points([[0., 0.],
@@ -197,7 +197,7 @@ def lines_or_planes(draw, LineOrPlane, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import lines_or_planes
+    >>> from tests.property.strategies import lines_or_planes
 
     >>> find(lines_or_planes(Line, 2), lambda x: True)
     Line(point=Point([0., 0.]), direction=Vector([0.   , 0.001]))
@@ -230,7 +230,7 @@ def lines(draw, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import lines
+    >>> from tests.property.strategies import lines
 
     >>> find(lines(dim=4), lambda x: x.direction.min() <= -1)
     Line(point=Point([0., 0., 0., 0.]), direction=Vector([ 0.,  0.,  0., -1.]))
@@ -257,7 +257,7 @@ def planes(draw, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import planes
+    >>> from tests.property.strategies import planes
 
     >>> find(planes(dim=3), lambda x: x.normal.norm() >= 5)
     Plane(point=Point([0., 0., 0.]), normal=Vector([0., 0., 5.]))
@@ -279,7 +279,7 @@ def circles(draw):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import circles
+    >>> from tests.property.strategies import circles
 
     >>> circle = find(circles(), lambda x: x.radius >= 1)
     >>> round(circle.radius)
@@ -302,7 +302,7 @@ def spheres(draw):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import spheres
+    >>> from tests.property.strategies import spheres
 
     >>> sphere = find(spheres(), lambda x: x.radius >= 1)
     >>> round(sphere.radius)
@@ -330,7 +330,7 @@ def triangles(draw, dim):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import triangles
+    >>> from tests.property.strategies import triangles
 
     >>> find(triangles(dim=2), lambda x: True)
     Triangle(point_a=Point([0., 0.]), point_b=Point([0.   , 0.001]), point_c=Point([0.001, 0.   ]))
@@ -366,7 +366,7 @@ def consistent_dim(draw, strategies, min_dim=DIM_MIN, max_dim=DIM_MAX):
     Examples
     --------
     >>> from hypothesis import find
-    >>> from .strategies import vectors, lines, planes, consistent_dim
+    >>> from tests.property.strategies import vectors, lines, planes, consistent_dim
 
     >>> find(consistent_dim([vectors, planes], min_dim=3), lambda x: True)
     [Vector([0., 0., 0.]), Plane(point=Point([0., 0., 0.]), normal=Vector([0.   , 0.   , 0.001]))]

tests/property/test_comparison.py

@@ -1,11 +1,11 @@
 from hypothesis import given
+
 from skspatial.objects import Line
 from skspatial.objects import Point
 from skspatial.objects import Points
-
-from .constants import ATOL
-from .strategies import arrays_fixed
-from .strategies import consistent_dim
+from tests.property.constants import ATOL
+from tests.property.strategies import arrays_fixed
+from tests.property.strategies import consistent_dim
 
 
 @given(consistent_dim(3 * [arrays_fixed]))