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:
AU
2024-06-28 08:44:49 +02:00
committed by GitHub
parent 40c26643ac
commit d9ccd25891
4 changed files with 9 additions and 10 deletions

View File

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

View File

@ -22,10 +22,10 @@ requirements:
- ezdxf - ezdxf
- ipython - ipython
- typing_extensions - typing_extensions
- nptyping >=2.0.1
- nlopt - nlopt
- multimethod >=1.11,<2.0 - multimethod >=1.11,<2.0
- casadi - casadi
- typish
test: test:
requires: requires:

View File

@ -15,10 +15,10 @@ dependencies:
- pytest-cov - pytest-cov
- ezdxf - ezdxf
- typing_extensions - typing_extensions
- nptyping=2.0.1
- nlopt - nlopt
- path - path
- casadi - casadi
- typish
- multimethod >=1.11,<2.0 - multimethod >=1.11,<2.0
- typed-ast - typed-ast
- regex - regex

View File

@ -30,7 +30,6 @@ if not is_rtd and not is_appveyor and not is_azure and not is_conda:
"ezdxf", "ezdxf",
"multimethod>=1.11,<2.0", "multimethod>=1.11,<2.0",
"nlopt", "nlopt",
"nptyping==2.0.1",
"typish", "typish",
"casadi", "casadi",
"path", "path",