Skip to content

Commit d9ccd25

Browse files
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
1 parent 40c2664 commit d9ccd25

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

cadquery/occ_impl/sketch_solver.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Tuple, Union, Any, Callable, List, Optional, Iterable, Dict, Sequence
22
from typing import Literal
3-
from nptyping import NDArray as Array
4-
from nptyping import Float
3+
from numpy.typing import NDArray as Array
4+
from numpy import float64 as Float
55
from itertools import accumulate, chain
66
from math import sin, cos, radians
77

@@ -263,12 +263,12 @@ def __init__(
263263
self.ixs = [0] + list(accumulate(len(e) for e in self.entities))
264264

265265
def _cost(
266-
self, x0: Array[Any, Float]
266+
self, x0: Array[Float]
267267
) -> Tuple[
268-
Callable[[Array[Any, Float]], float],
269-
Callable[[Array[Any, Float], Array[Any, Float]], None],
270-
Array[Any, Float],
271-
Array[Any, Float],
268+
Callable[[Array[Float]], float],
269+
Callable[[Array[Float], Array[Float]], None],
270+
Array[Float],
271+
Array[Float],
272272
]:
273273

274274
ixs = self.ixs

conda/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ requirements:
2222
- ezdxf
2323
- ipython
2424
- typing_extensions
25-
- nptyping >=2.0.1
2625
- nlopt
2726
- multimethod >=1.11,<2.0
2827
- casadi
28+
- typish
2929

3030
test:
3131
requires:

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ dependencies:
1515
- pytest-cov
1616
- ezdxf
1717
- typing_extensions
18-
- nptyping=2.0.1
1918
- nlopt
2019
- path
2120
- casadi
21+
- typish
2222
- multimethod >=1.11,<2.0
2323
- typed-ast
2424
- regex

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"ezdxf",
3131
"multimethod>=1.11,<2.0",
3232
"nlopt",
33-
"nptyping==2.0.1",
3433
"typish",
3534
"casadi",
3635
"path",

0 commit comments

Comments
 (0)