Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7bc1d51

Browse files
pdebuylpdebuyl
authored
Merge branch 'main' into doctest_for_pytest
2 parents 831849e + 7acb0fd commit 7bc1d51

180 files changed

Lines changed: 4597 additions & 3462 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/wheels.yml‎

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -37,50 +37,38 @@ jobs:
3737
echo "::set-output name=message::$COMMIT_MSG"
3838
3939
build_wheels:
40-
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform }}
40+
name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
4141
needs: get_commit_message
4242
if: >-
4343
contains(needs.get_commit_message.outputs.message, '[wheel build]') ||
4444
github.event_name == 'schedule' ||
4545
github.event_name == 'workflow_dispatch'
46-
runs-on: ${{ matrix.os }}
46+
runs-on: ${{ matrix.buildplat[0] }}
4747
strategy:
4848
# Ensure that a wheel builder finishes even if another fails
4949
fail-fast: false
5050
matrix:
51+
# Github Actions doesn't support pairing matrix values together, let's improvise
52+
# https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
53+
buildplat:
54+
- [ubuntu-20.04, manylinux_x86_64]
55+
- [macos-10.15, macosx_*]
56+
- [windows-2019, win_amd64]
57+
python: ["cp38", "cp39", "cp310"]
5158
include:
52-
# manylinux builds
53-
- os: ubuntu-20.04
54-
python: "38"
55-
platform: manylinux_x86_64
56-
- os: ubuntu-20.04
57-
python: "39"
58-
platform: manylinux_x86_64
59-
- os: ubuntu-20.04
60-
python: "310"
61-
platform: manylinux_x86_64
59+
# manylinux pypy builds
60+
- buildplat: [ubuntu-20.04, manylinux_x86_64]
61+
python: pp38
6262

63-
# MacOS builds
64-
- os: macos-10.15
65-
python: "38"
66-
platform: macosx_*
67-
- os: macos-10.15
68-
python: "39"
69-
platform: macosx_*
70-
- os: macos-10.15
71-
python: "310"
72-
platform: macosx_*
63+
# MacOS PyPy builds
64+
# Disabled for now because of a PyPy bug
65+
# that prevents successful compilation
66+
#- buildplat: [macos-10.15, macosx_x86_64]
67+
# python: "pp38"
7368

74-
# Windows builds
75-
- os: windows-2019
76-
python: "38"
77-
platform: win_amd64
78-
- os: windows-2019
79-
python: "39"
80-
platform: win_amd64
81-
- os: windows-2019
82-
python: "310"
83-
platform: win_amd64
69+
# Windows PyPy builds
70+
- buildplat: [windows-2019, win_amd64]
71+
python: "pp38"
8472

8573
steps:
8674
- name: Checkout numpy
@@ -94,10 +82,10 @@ jobs:
9482
fetch-depth: 0
9583

9684
- name: Build wheels
97-
uses: pypa/cibuildwheel@v2.1.3
85+
uses: pypa/cibuildwheel@v2.3.0
9886
env:
9987
NPY_USE_BLAS_ILP64: 1
100-
CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform }}
88+
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
10189
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
10290
CIBW_ENVIRONMENT_LINUX: CFLAGS='-std=c99 -fno-strict-aliasing'
10391
LDFLAGS='-Wl,--strip-debug'

‎doc/changelog/1.21.5-changelog.rst‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Contributors
3+
============
4+
5+
A total of 7 people contributed to this release. People with a "+" by their
6+
names contributed a patch for the first time.
7+
8+
* Bas van Beek
9+
* Charles Harris
10+
* Matti Picus
11+
* Rohit Goswami +
12+
* Ross Barnowski
13+
* Sayed Adel
14+
* Sebastian Berg
15+
16+
Pull requests merged
17+
====================
18+
19+
A total of 11 pull requests were merged for this release.
20+
21+
* `#20357 <https://github.com/numpy/numpy/pull/20357>`__: MAINT: Do not forward `__(deep)copy__` calls of `_GenericAlias`...
22+
* `#20462 <https://github.com/numpy/numpy/pull/20462>`__: BUG: Fix float16 einsum fastpaths using wrong tempvar
23+
* `#20463 <https://github.com/numpy/numpy/pull/20463>`__: BUG, DIST: Print os error message when the executable not exist
24+
* `#20464 <https://github.com/numpy/numpy/pull/20464>`__: BLD: Verify the ability to compile C++ sources before initiating...
25+
* `#20465 <https://github.com/numpy/numpy/pull/20465>`__: BUG: Force ``npymath` ` to respect ``npy_longdouble``
26+
* `#20466 <https://github.com/numpy/numpy/pull/20466>`__: BUG: Fix failure to create aligned, empty structured dtype
27+
* `#20467 <https://github.com/numpy/numpy/pull/20467>`__: ENH: provide a convenience function to replace npy_load_module
28+
* `#20495 <https://github.com/numpy/numpy/pull/20495>`__: MAINT: update wheel to version that supports python3.10
29+
* `#20497 <https://github.com/numpy/numpy/pull/20497>`__: BUG: Clear errors correctly in F2PY conversions
30+
* `#20613 <https://github.com/numpy/numpy/pull/20613>`__: DEV: add a warningfilter to fix pytest workflow.
31+
* `#20618 <https://github.com/numpy/numpy/pull/20618>`__: MAINT: Help boost::python libraries at least not crash

‎doc/neps/nep-0031-uarray.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ This is different from monkeypatching in a few different ways:
302302
so there is at least the loose sense of an API contract. Monkeypatching
303303
does not provide this ability.
304304
* There is the ability of locally switching the backend.
305-
* It has been `suggested <http://numpy-discussion.10968.n7.nabble.com/NEP-31-Context-local-and-global-overrides-of-the-NumPy-API-tp47452p47472.html>`_
305+
* It has been `suggested <https://mail.python.org/archives/list/[email protected]/message/PS7EN3CRT6XERNTCN56MAYOXFFFEC55G/>`_
306306
that the reason that 1.17 hasn't landed in the Anaconda defaults channel is
307307
due to the incompatibility between monkeypatching and ``__array_function__``,
308308
as monkeypatching would bypass the protocol completely.
@@ -640,9 +640,9 @@ References and Footnotes
640640
641641
.. [4] NEP 13 — A Mechanism for Overriding Ufuncs: https://numpy.org/neps/nep-0013-ufunc-overrides.html
642642
643-
.. [5] Reply to Adding to the non-dispatched implementation of NumPy methods: http://numpy-discussion.10968.n7.nabble.com/Adding-to-the-non-dispatched-implementation-of-NumPy-methods-tp46816p46874.html
643+
.. [5] Reply to Adding to the non-dispatched implementation of NumPy methods: https://mail.python.org/archives/list/[email protected]/thread/5GUDMALWDIRHITG5YUOCV343J66QSX3U/#5GUDMALWDIRHITG5YUOCV343J66QSX3U
644644
645-
.. [6] Custom Dtype/Units discussion: http://numpy-discussion.10968.n7.nabble.com/Custom-Dtype-Units-discussion-td43262.html
645+
.. [6] Custom Dtype/Units discussion: https://mail.python.org/archives/list/numpy-discussion@python.org/thread/RZYCVT6C3F7UDV6NA6FEV4MC5FKS6RDA/#RZYCVT6C3F7UDV6NA6FEV4MC5FKS6RDA
646646
647647
.. [7] The epic dtype cleanup plan: https://github.com/numpy/numpy/issues/2899
648648

‎doc/neps/nep-0038-SIMD-optimizations.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ NEP 38 — Using SIMD optimization instructions for performance
88
:Status: Accepted
99
:Type: Standards
1010
:Created: 2019-11-25
11-
:Resolution: http://numpy-discussion.10968.n7.nabble.com/NEP-38-Universal-SIMD-intrinsics-td47854.html
11+
:Resolution: https://mail.python.org/archives/list/[email protected]/thread/PVWJ74UVBRZ5ZWF6MDU7EUSJXVNILAQB/#PVWJ74UVBRZ5ZWF6MDU7EUSJXVNILAQB
1212

1313

1414
Abstract

‎doc/neps/nep-0041-improved-dtype-support.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NEP 41 — First step towards a new datatype system
2323

2424
- :ref:`NEP 42 <NEP42>` describes the new design's datatype-related APIs.
2525

26-
- NEP 43 describes the new design's API for universal functions.
26+
- :ref:`NEP 43 <NEP43>` describes the new design's API for universal functions.
2727

2828

2929
Abstract

‎doc/neps/nep-0049.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ is to create a flexible enough interface without burdening normative users.
5555
.. _`issue 5312`: https://github.com/numpy/numpy/issues/5312
5656
.. _`from 2017`: https://github.com/numpy/numpy/issues/5312#issuecomment-315234656
5757
.. _`in 2005`: https://numpy-discussion.scipy.narkive.com/MvmMkJcK/numpy-arrays-data-allocation-and-simd-alignement
58-
.. _`here`: http://numpy-discussion.10968.n7.nabble.com/Aligned-configurable-memory-allocation-td39712.html
59-
.. _`and here`: http://numpy-discussion.10968.n7.nabble.com/Numpy-s-policy-for-releasing-memory-td1533.html
58+
.. _`here`: https://mail.python.org/archives/list/[email protected]/thread/YPC5BGPUMKT2MLBP6O3FMPC35LFM2CCH/#YPC5BGPUMKT2MLBP6O3FMPC35LFM2CCH
59+
.. _`and here`: https://mail.python.org/archives/list/[email protected]/thread/IQK3EPIIRE3V4BPNAMJ2ZST3NUG2MK2A/#IQK3EPIIRE3V4BPNAMJ2ZST3NUG2MK2A
6060
.. _`issue 14177`: https://github.com/numpy/numpy/issues/14177
6161
.. _`filprofiler`: https://github.com/pythonspeed/filprofiler/blob/master/design/allocator-overrides.md
6262
.. _`electric fence`: https://github.com/boundarydevices/efence

‎doc/release/upcoming_changes/20500.new_feature.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
New parameter ``ndmin`` added to ``genfromtxt``
2+
-------------------------------------------------------------------------
3+
This parameter behaves the same as ``ndmin`` from `~numpy.loadtxt`.

‎doc/release/upcoming_changes/20589.expired.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Remove deprecated ``NPY_ARRAY_UPDATEIFCOPY``
2+
--------------------------------------------
3+
4+
The array flag ``UPDATEIFCOPY`` and enum ``NPY_ARRAY_UPDATEIFCOPY`` were
5+
deprecated in 1.14. They were replaced by ``WRITEBACKIFCOPY`` which require
6+
calling ``PyArray_ResoveWritebackIfCopy`` before the array is deallocated. Also
7+
removed the associated (and deprecated) ``PyArray_XDECREF_ERR``.

0 commit comments

Comments
 (0)