Skip to content

Commit 72f19ef

Browse files
authored
👽️ scipy 1.16 updates for _lib (#525)
2 parents 5e4d919 + f23d305 commit 72f19ef

File tree

4 files changed

+11
-65
lines changed

4 files changed

+11
-65
lines changed

.mypyignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ scipy\.conftest
66
scipy\.((_|\w)+\.)+(__test__|test|tests(\..+)?)
77

88
# git submodules and bundled 3rd party libs
9-
scipy\._lib\.(array_api_compat|array_api_extra|cobyqa).*
9+
scipy\._lib\.(array_api_compat|array_api_extra|cobyqa|pyprima).*
1010
scipy\.fft\._pocketfft\..*
1111

1212
# namespace pollution

.mypyignore-todo

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
scipy._lib._finite_differences
2-
scipy._lib._util.ComplexWarning
3-
scipy._lib._util.DTypePromotionError
4-
scipy._lib._util.VisibleDeprecationWarning
5-
scipy._lib._util.np_vecdot
6-
scipy._lib.pyprima
7-
scipy._lib.pyprima.cobyla
8-
scipy._lib.pyprima.cobyla.cobyla
9-
scipy._lib.pyprima.cobyla.cobylb
10-
scipy._lib.pyprima.cobyla.geometry
11-
scipy._lib.pyprima.cobyla.initialize
12-
scipy._lib.pyprima.cobyla.trustregion
13-
scipy._lib.pyprima.cobyla.update
14-
scipy._lib.pyprima.common
15-
scipy._lib.pyprima.common.checkbreak
16-
scipy._lib.pyprima.common.consts
17-
scipy._lib.pyprima.common.evaluate
18-
scipy._lib.pyprima.common.history
19-
scipy._lib.pyprima.common.infos
20-
scipy._lib.pyprima.common.linalg
21-
scipy._lib.pyprima.common.message
22-
scipy._lib.pyprima.common.powalg
23-
scipy._lib.pyprima.common.preproc
24-
scipy._lib.pyprima.common.present
25-
scipy._lib.pyprima.common.ratio
26-
scipy._lib.pyprima.common.redrho
27-
scipy._lib.pyprima.common.selectx
28-
291
scipy.cluster.vq.whiten
302

313
scipy.interpolate.RectBivariateSpline.__init__

scipy-stubs/_lib/_finite_differences.pyi

Lines changed: 0 additions & 32 deletions
This file was deleted.

scipy-stubs/_lib/_util.pyi

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import optype as op
99
import optype.numpy as onp
1010
import optype.numpy.compat as npc
1111
from numpy.random import Generator as Generator # implicit re-export
12-
from optype.numpy.compat import DTypePromotionError as DTypePromotionError # implicit re-export
1312
from scipy._typing import RNG, EnterSelfMixin
1413

1514
_AnyRNGT = TypeVar("_AnyRNGT", np.random.RandomState, np.random.Generator)
@@ -38,9 +37,6 @@ GeneratorType = TypeVar("GeneratorType", bound=_RNG) # noqa: PYI001 # oof
3837

3938
###
4039

41-
class ComplexWarning(RuntimeWarning): ...
42-
class VisibleDeprecationWarning(UserWarning): ...
43-
4440
class AxisError(ValueError, IndexError):
4541
_msg: Final[str | None]
4642
axis: Final[int | None]
@@ -121,3 +117,13 @@ def normalize_axis_index(axis: int, ndim: onp.NDim) -> onp.NDim: ...
121117
def normalize_axis_index(axis: int | _AxisT, ndim: _AxisT) -> _AxisT: ...
122118
@overload
123119
def normalize_axis_index(axis: _AxisT, ndim: onp.NDim | _AxisT) -> _AxisT: ...
120+
@overload
121+
def np_vecdot(x1: onp.ToIntStrict1D, x2: onp.ToIntStrict1D, /, *, axis: op.CanIndex = -1) -> np.integer: ...
122+
@overload
123+
def np_vecdot(x1: onp.ToFloatStrict1D, x2: onp.ToJustFloatStrict1D, /, *, axis: op.CanIndex = -1) -> npc.floating: ...
124+
@overload
125+
def np_vecdot(x1: onp.ToJustFloatStrict1D, x2: onp.ToFloatStrict1D, /, *, axis: op.CanIndex = -1) -> npc.floating: ...
126+
@overload
127+
def np_vecdot(x1: onp.ToComplexStrict1D, x2: onp.ToJustComplexStrict1D, /, *, axis: op.CanIndex = -1) -> npc.complexfloating: ...
128+
@overload
129+
def np_vecdot(x1: onp.ToJustComplexStrict1D, x2: onp.ToComplexStrict1D, /, *, axis: op.CanIndex = -1) -> npc.complexfloating: ...

0 commit comments

Comments
 (0)