Merge branch 'master' into patch-2

cadquery/occ_impl/sketch_solver.py

@@ -1,6 +1,7 @@
 from typing import Tuple, Union, Any, Callable, List, Optional, Iterable, Dict, Sequence
 from typing_extensions import Literal
 from nptyping import NDArray as Array
+from nptyping import Float
 from itertools import accumulate, chain
 from math import sin, cos, radians
 
@@ -262,12 +263,12 @@ def __init__(
  self.ixs = [0] + list(accumulate(len(e) for e in self.entities))
 
  def _cost(
- self, x0: Array[(Any,), float]
+ self, x0: Array[Any, Float]
  ) -> Tuple[
- Callable[[Array[(Any,), float]], float],
- Callable[[Array[(Any,), float], Array[(Any,), float]], None],
- Array[(Any,), float],
- Array[(Any,), float],
+ Callable[[Array[Any, Float]], float],
+ Callable[[Array[Any, Float], Array[Any, Float]], None],
+ Array[Any, Float],
+ Array[Any, Float],
  ]:
 
  ixs = self.ixs

cadquery/occ_impl/solver.py

@@ -11,6 +11,7 @@
  Type,
 )
 from nptyping import NDArray as Array
+from nptyping import Float
 from math import radians
 from typish import instance_of, get_type
 from numpy import array, eye, pi
@@ -448,8 +449,8 @@ def _build_transform(
  def _cost(
  self,
  ) -> Tuple[
- Callable[[Array[(Any,), float]], float],
- Callable[[Array[(Any,), float], Array[(Any,), float]], None],
+ Callable[[Array[Any, Float]], float],
+ Callable[[Array[Any, Float], Array[Any, Float]], None],
  ]:
 
  constraints = self.constraints

conda/meta.yaml

@@ -20,7 +20,7 @@ requirements:
  - ezdxf
  - ipython
  - typing_extensions
- - nptyping
+ - nptyping >=2.0.0
  - nlopt
  - multimethod 1.6
 

environment.yml

@@ -19,7 +19,7 @@ dependencies:
  - ezdxf
  - ipython
  - typing_extensions
- - nptyping
+ - nptyping>=2.0.0
  - nlopt
  - path
  - pip