Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 43c2dcf

Browse filesBrowse files
VascoConceicaoVascoConceicao
authored
Merge branch 'numpy:main' into bugfix/maskedarray-printoptions
2 parents 759cad2 + 57fe332 commit 43c2dcf
Copy full SHA for 43c2dcf

32 files changed

+276
-233
lines changed

‎.github/workflows/wheels.yml

Copy file name to clipboardExpand all lines: .github/workflows/wheels.yml
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,15 @@ jobs:
9191
- [macos-14, macosx_arm64, accelerate] # always use accelerate
9292
- [windows-2019, win_amd64, ""]
9393
- [windows-2019, win32, ""]
94+
- [windows-11-arm, win_arm64, ""]
9495
python: ["cp311", "cp312", "cp313", "cp313t", "pp311"]
9596
exclude:
9697
# Don't build PyPy 32-bit windows
9798
- buildplat: [windows-2019, win32, ""]
9899
python: "pp311"
100+
# Don't build PyPy arm64 windows
101+
- buildplat: [windows-11-arm, win_arm64, ""]
102+
python: "pp311"
99103
# No PyPy on musllinux images
100104
- buildplat: [ ubuntu-22.04, musllinux_x86_64, "" ]
101105
python: "pp311"
@@ -121,6 +125,12 @@ jobs:
121125
with:
122126
architecture: 'x86'
123127

128+
- name: Setup MSVC arm64
129+
if: ${{ matrix.buildplat[1] == 'win_arm64' }}
130+
uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1
131+
with:
132+
architecture: 'arm64'
133+
124134
- name: pkg-config-for-win
125135
run: |
126136
choco install -y --no-progress --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
@@ -181,6 +191,7 @@ jobs:
181191
path: ./wheelhouse/*.whl
182192

183193
- uses: mamba-org/setup-micromamba@0dea6379afdaffa5d528b3d1dabc45da37f443fc
194+
if: ${{ matrix.buildplat[1] != 'win_arm64' }} # unsupported platform at the moment
184195
with:
185196
# for installation of anaconda-client, required for upload to
186197
# anaconda.org

‎.github/workflows/windows.yml

Copy file name to clipboardExpand all lines: .github/workflows/windows.yml
+15-7Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,17 @@ jobs:
9696
run: |
9797
spin test -- --timeout=600 --durations=10
9898
99-
msvc_32bit_python_no_openblas:
100-
name: MSVC, 32-bit Python, no BLAS
101-
runs-on: windows-2019
99+
msvc_python_no_openblas:
100+
name: MSVC, ${{ matrix.architecture }} Python , no BLAS
101+
runs-on: ${{ matrix.os }}
102+
strategy:
103+
fail-fast: false
104+
matrix:
105+
include:
106+
- os: windows-2019
107+
architecture: x86
108+
- os: windows-11-arm
109+
architecture: arm64
102110
# To enable this job on a fork, comment out:
103111
if: github.repository == 'numpy/numpy'
104112
steps:
@@ -109,16 +117,16 @@ jobs:
109117
fetch-tags: true
110118
persist-credentials: false
111119

112-
- name: Setup Python (32-bit)
120+
- name: Setup Python
113121
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
114122
with:
115123
python-version: '3.11'
116-
architecture: 'x86'
124+
architecture: ${{ matrix.architecture }}
117125

118-
- name: Setup MSVC (32-bit)
126+
- name: Setup MSVC
119127
uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1
120128
with:
121-
architecture: 'x86'
129+
architecture: ${{ matrix.architecture }}
122130

123131
- name: Build and install
124132
run: |

‎doc/source/reference/maskedarray.baseclass.rst

Copy file name to clipboardExpand all lines: doc/source/reference/maskedarray.baseclass.rst
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ Arithmetic:
264264
MaskedArray.__rsub__
265265
MaskedArray.__mul__
266266
MaskedArray.__rmul__
267-
MaskedArray.__div__
268267
MaskedArray.__truediv__
269268
MaskedArray.__rtruediv__
270269
MaskedArray.__floordiv__
@@ -296,7 +295,6 @@ Arithmetic, in-place:
296295
MaskedArray.__iadd__
297296
MaskedArray.__isub__
298297
MaskedArray.__imul__
299-
MaskedArray.__idiv__
300298
MaskedArray.__itruediv__
301299
MaskedArray.__ifloordiv__
302300
MaskedArray.__imod__

‎numpy/__init__.pyi

Copy file name to clipboardExpand all lines: numpy/__init__.pyi
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5243,9 +5243,7 @@ class poly1d:
52435243
def __pow__(self, val: _FloatLike_co, /) -> poly1d: ... # Integral floats are accepted
52445244
def __sub__(self, other: ArrayLike, /) -> poly1d: ...
52455245
def __rsub__(self, other: ArrayLike, /) -> poly1d: ...
5246-
def __div__(self, other: ArrayLike, /) -> poly1d: ...
52475246
def __truediv__(self, other: ArrayLike, /) -> poly1d: ...
5248-
def __rdiv__(self, other: ArrayLike, /) -> poly1d: ...
52495247
def __rtruediv__(self, other: ArrayLike, /) -> poly1d: ...
52505248
def __getitem__(self, val: int, /) -> Any: ...
52515249
def __setitem__(self, key: int, val: Any, /) -> None: ...

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.