diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-05-20 10:57:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 10:57:06 -0600 |
| commit | 08772f91455db66810995db5e9d0671f91e027ed (patch) | |
| tree | 29e9acb5a726391bb34047b53e2824d82c36e621 | |
| parent | 60f2f4d985bf1d5124d532c9f420fe4fa03123a7 (diff) | |
| parent | f15e388baf8400ac21875a175c1d37c4f6524395 (diff) | |
| download | numpy-08772f91455db66810995db5e9d0671f91e027ed.tar.gz | |
Merge pull request #21549 from charris/prepare-for-1.22.4-1v1.22.4
REL: Prepare for the NumPy 1.22.4 release, second try.
| -rw-r--r-- | doc/changelog/1.22.4-changelog.rst | 4 | ||||
| -rw-r--r-- | doc/source/release/1.22.4-notes.rst | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/changelog/1.22.4-changelog.rst b/doc/changelog/1.22.4-changelog.rst index 2050155e9..0f3e54ebb 100644 --- a/doc/changelog/1.22.4-changelog.rst +++ b/doc/changelog/1.22.4-changelog.rst @@ -21,7 +21,7 @@ names contributed a patch for the first time. Pull requests merged ==================== -A total of 20 pull requests were merged for this release. +A total of 22 pull requests were merged for this release. * `#21191 <https://github.com/numpy/numpy/pull/21191>`__: TYP, BUG: Fix ``np.lib.stride_tricks`` re-exported under the... * `#21192 <https://github.com/numpy/numpy/pull/21192>`__: TST: Bump mypy from 0.931 to 0.940 @@ -43,3 +43,5 @@ A total of 20 pull requests were merged for this release. * `#21512 <https://github.com/numpy/numpy/pull/21512>`__: DOC: Proposal - make the doc landing page cards more similar... * `#21525 <https://github.com/numpy/numpy/pull/21525>`__: MAINT: Update Cython version to 0.29.30. * `#21536 <https://github.com/numpy/numpy/pull/21536>`__: BUG: Fix GCC error during build configuration +* `#21541 <https://github.com/numpy/numpy/pull/21541>`__: REL: Prepare for the NumPy 1.22.4 release. +* `#21547 <https://github.com/numpy/numpy/pull/21547>`__: MAINT: Skip tests that fail on PyPy. diff --git a/doc/source/release/1.22.4-notes.rst b/doc/source/release/1.22.4-notes.rst index 5c2650f0a..a13d0a862 100644 --- a/doc/source/release/1.22.4-notes.rst +++ b/doc/source/release/1.22.4-notes.rst @@ -35,7 +35,7 @@ names contributed a patch for the first time. Pull requests merged ==================== -A total of 20 pull requests were merged for this release. +A total of 22 pull requests were merged for this release. * `#21191 <https://github.com/numpy/numpy/pull/21191>`__: TYP, BUG: Fix ``np.lib.stride_tricks`` re-exported under the... * `#21192 <https://github.com/numpy/numpy/pull/21192>`__: TST: Bump mypy from 0.931 to 0.940 @@ -57,4 +57,6 @@ A total of 20 pull requests were merged for this release. * `#21512 <https://github.com/numpy/numpy/pull/21512>`__: DOC: Proposal - make the doc landing page cards more similar... * `#21525 <https://github.com/numpy/numpy/pull/21525>`__: MAINT: Update Cython version to 0.29.30. * `#21536 <https://github.com/numpy/numpy/pull/21536>`__: BUG: Fix GCC error during build configuration +* `#21541 <https://github.com/numpy/numpy/pull/21541>`__: REL: Prepare for the NumPy 1.22.4 release. +* `#21547 <https://github.com/numpy/numpy/pull/21547>`__: MAINT: Skip tests that fail on PyPy. |