Skip to content

Commit f4054a9

Browse files
vlgmodvlgmod
committed
Replace pybind11-stubgen by mypy.stubgen
pybind11-stubgen in deprecated sizmailov/pybind11-stubgen#31 mypy.stubgen doesn't support numpy 2 python/mypy#17396 python/mypy#17538
1 parent 3c5aaee commit f4054a9

File tree

5 files changed

+1904
-3747
lines changed

5 files changed

+1904
-3747
lines changed

‎.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ build:ubuntu-python:
361361
- pip install -r requirements-gitlab.txt
362362
- pip install . --config-settings="--global-option=CMAKE_TOOLCHAIN_FILE=$VCPKG_LOCAL_GIT/scripts/buildsystems/vcpkg.cmake" --config-settings="--global-option=cmake_build_type=Release" --config-settings="--global-option=vcpkg_triplet=x64-linux-release" --no-clean -v
363363
- python -m unittest discover test/python
364-
- pybind11-stubgen pyurx --output-dir=python
365-
- if [[ ! -z "$(git status --porcelain)" ]]; then echo "Run pybind11-stubgen before commit."; echo "$(git status --porcelain)"; git diff; exit 1; fi
364+
- stubgen -p pyurx -o python
365+
- if [[ ! -z "$(git status --porcelain)" ]]; then echo "Run `stubgen -p pyurx -o python` before commit."; echo "$(git status --porcelain)"; git diff; exit 1; fi
366366

367367
build:windows-matlab-static:
368368
stage: build

‎pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ requires = [
66
"cmake",
77
"cmake-build-extension",
88
"importlib-metadata",
9-
"numpy",
9+
"numpy<2",
1010
"toml",
1111
"parameterized"
1212
]
@@ -16,7 +16,7 @@ name = "pyurx"
1616
version = "0.6.26.3"
1717
dependencies = [
1818
"cmake-build-extension",
19-
"numpy",
19+
"numpy<2",
2020
"parameterized",
2121
"setuptools>69.0.0,<73",
2222
"toml",

‎python/pyurx/__init__.pyi

Lines changed: 1 addition & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1 @@
1-
from __future__ import annotations
2-
import cmake_build_extension as cmake_build_extension
3-
from pyurx.bindings import GroupDataReader
4-
from pyurx.bindings import UrxAcquisition
5-
from pyurx.bindings import UrxAcquisition as Acquisition
6-
from pyurx.bindings import UrxDataType as DataType
7-
from pyurx.bindings import UrxDataType
8-
from pyurx.bindings import UrxDataset as Dataset
9-
from pyurx.bindings import UrxDataset
10-
from pyurx.bindings import UrxDoubleNan
11-
from pyurx.bindings import UrxDoubleNan as DoubleNan
12-
from pyurx.bindings import UrxElement as Element
13-
from pyurx.bindings import UrxElement
14-
from pyurx.bindings import UrxElementGeometry
15-
from pyurx.bindings import UrxElementGeometry as ElementGeometry
16-
from pyurx.bindings import UrxEvent as Event
17-
from pyurx.bindings import UrxEvent
18-
from pyurx.bindings import UrxExcitation as Excitation
19-
from pyurx.bindings import UrxExcitation
20-
from pyurx.bindings import UrxGroup as Group
21-
from pyurx.bindings import UrxGroup
22-
from pyurx.bindings import UrxGroupData
23-
from pyurx.bindings import UrxGroupData as GroupData
24-
from pyurx.bindings import UrxImpulseResponse as ImpulseResponse
25-
from pyurx.bindings import UrxImpulseResponse
26-
from pyurx.bindings import UrxProbe
27-
from pyurx.bindings import UrxProbe as Probe
28-
from pyurx.bindings import UrxProbeType
29-
from pyurx.bindings import UrxProbeType as ProbeType
30-
from pyurx.bindings import UrxReceiveSetup as ReceiveSetup
31-
from pyurx.bindings import UrxReceiveSetup
32-
from pyurx.bindings import UrxSamplingType as SamplingType
33-
from pyurx.bindings import UrxSamplingType
34-
from pyurx.bindings import UrxTransform as Transform
35-
from pyurx.bindings import UrxTransform
36-
from pyurx.bindings import UrxTransmitSetup
37-
from pyurx.bindings import UrxTransmitSetup as TransmitSetup
38-
from pyurx.bindings import UrxVector2D
39-
from pyurx.bindings import UrxVector2D as Vector2D
40-
from pyurx.bindings import UrxVector3D
41-
from pyurx.bindings import UrxVector3D as Vector3D
42-
from pyurx.bindings import UrxVersion
43-
from pyurx.bindings import UrxVersion as Version
44-
from pyurx.bindings import UrxWave as Wave
45-
from pyurx.bindings import UrxWave
46-
from pyurx.bindings import UrxWaveType
47-
from pyurx.bindings import UrxWaveType as WaveType
48-
from pyurx.bindings import VecElement
49-
from pyurx.bindings import VecElementGeometryPtr
50-
from pyurx.bindings import VecEvent
51-
from pyurx.bindings import VecExcitationPtr
52-
from pyurx.bindings import VecFloat32
53-
from pyurx.bindings import VecFloat64
54-
from pyurx.bindings import VecGroupData
55-
from pyurx.bindings import VecGroupPtr
56-
from pyurx.bindings import VecImpulseResponsePtr
57-
from pyurx.bindings import VecInt16
58-
from pyurx.bindings import VecInt32
59-
from pyurx.bindings import VecInt64
60-
from pyurx.bindings import VecInt8
61-
from pyurx.bindings import VecProbePtr
62-
from pyurx.bindings import VecString
63-
from pyurx.bindings import VecUInt16
64-
from pyurx.bindings import VecUInt32
65-
from pyurx.bindings import VecUInt64
66-
from pyurx.bindings import VecUInt8
67-
from pyurx.bindings import VecVecFloat32
68-
from pyurx.bindings import VecVecFloat64
69-
from pyurx.bindings import VecVecInt16
70-
from pyurx.bindings import VecVecInt32
71-
from pyurx.bindings import VecVecInt64
72-
from pyurx.bindings import VecVecInt8
73-
from pyurx.bindings import VecVecString
74-
from pyurx.bindings import VecVecUInt16
75-
from pyurx.bindings import VecVecUInt32
76-
from pyurx.bindings import VecVecUInt64
77-
from pyurx.bindings import VecVecUInt8
78-
from pyurx.bindings import VecVector2D
79-
from pyurx.bindings import VecVector3D
80-
from pyurx.bindings import isIso3166
81-
from pyurx.bindings import isIso8601
82-
from pyurx.bindings import loadFromFile
83-
from pyurx.bindings import pyGetFormat
84-
from pyurx.bindings import saveToFile
85-
from pyurx.bindings import sizeofDataType
86-
from pyurx.bindings import sizeofSample
87-
from . import bindings
88-
__all__ = ['Acquisition', 'DataType', 'Dataset', 'DoubleNan', 'Element', 'ElementGeometry', 'Event', 'Excitation', 'Group', 'GroupData', 'GroupDataReader', 'ImpulseResponse', 'Probe', 'ProbeType', 'ReceiveSetup', 'SamplingType', 'Transform', 'TransmitSetup', 'URX_VERSION_MAJOR', 'URX_VERSION_MINOR', 'URX_VERSION_PATCH', 'UrxAcquisition', 'UrxDataType', 'UrxDataset', 'UrxDoubleNan', 'UrxElement', 'UrxElementGeometry', 'UrxEvent', 'UrxExcitation', 'UrxGroup', 'UrxGroupData', 'UrxImpulseResponse', 'UrxProbe', 'UrxProbeType', 'UrxReceiveSetup', 'UrxSamplingType', 'UrxTransform', 'UrxTransmitSetup', 'UrxVector2D', 'UrxVector3D', 'UrxVersion', 'UrxWave', 'UrxWaveType', 'VecElement', 'VecElementGeometryPtr', 'VecEvent', 'VecExcitationPtr', 'VecFloat32', 'VecFloat64', 'VecGroupData', 'VecGroupPtr', 'VecImpulseResponsePtr', 'VecInt16', 'VecInt32', 'VecInt64', 'VecInt8', 'VecProbePtr', 'VecString', 'VecUInt16', 'VecUInt32', 'VecUInt64', 'VecUInt8', 'VecVecFloat32', 'VecVecFloat64', 'VecVecInt16', 'VecVecInt32', 'VecVecInt64', 'VecVecInt8', 'VecVecString', 'VecVecUInt16', 'VecVecUInt32', 'VecVecUInt64', 'VecVecUInt8', 'VecVector2D', 'VecVector3D', 'Vector2D', 'Vector3D', 'Version', 'Wave', 'WaveType', 'bindings', 'cmake_build_extension', 'isIso3166', 'isIso8601', 'loadFromFile', 'pyGetFormat', 'saveToFile', 'sizeofDataType', 'sizeofSample']
89-
URX_VERSION_MAJOR: int = 1
90-
URX_VERSION_MINOR: int = 0
91-
URX_VERSION_PATCH: int = 0
1+
from .bindings import *

0 commit comments

Comments
 (0)