Get rid of nptyping (#1617)
* Get rid of nptyping * Remove nptyping from environment.yml * Remove nptyping from setup.py * Remove nptyping from meta.yaml * Add typish to meta.yaml * Add typish to environment.yml
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
from typing import Tuple, Union, Any, Callable, List, Optional, Iterable, Dict, Sequence
|
||||
from typing import Literal
|
||||
from nptyping import NDArray as Array
|
||||
from nptyping import Float
|
||||
from numpy.typing import NDArray as Array
|
||||
from numpy import float64 as Float
|
||||
from itertools import accumulate, chain
|
||||
from math import sin, cos, radians
|
||||
|
||||
@ -263,12 +263,12 @@ class SketchConstraintSolver(object):
|
||||
self.ixs = [0] + list(accumulate(len(e) for e in self.entities))
|
||||
|
||||
def _cost(
|
||||
self, x0: Array[Any, Float]
|
||||
self, x0: Array[Float]
|
||||
) -> Tuple[
|
||||
Callable[[Array[Any, Float]], float],
|
||||
Callable[[Array[Any, Float], Array[Any, Float]], None],
|
||||
Array[Any, Float],
|
||||
Array[Any, Float],
|
||||
Callable[[Array[Float]], float],
|
||||
Callable[[Array[Float], Array[Float]], None],
|
||||
Array[Float],
|
||||
Array[Float],
|
||||
]:
|
||||
|
||||
ixs = self.ixs
|
||||
|
@ -22,10 +22,10 @@ requirements:
|
||||
- ezdxf
|
||||
- ipython
|
||||
- typing_extensions
|
||||
- nptyping >=2.0.1
|
||||
- nlopt
|
||||
- multimethod >=1.11,<2.0
|
||||
- casadi
|
||||
- typish
|
||||
|
||||
test:
|
||||
requires:
|
||||
|
@ -15,10 +15,10 @@ dependencies:
|
||||
- pytest-cov
|
||||
- ezdxf
|
||||
- typing_extensions
|
||||
- nptyping=2.0.1
|
||||
- nlopt
|
||||
- path
|
||||
- casadi
|
||||
- typish
|
||||
- multimethod >=1.11,<2.0
|
||||
- typed-ast
|
||||
- regex
|
||||
|
Reference in New Issue
Block a user