summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2021-11-04 15:06:03 -0600
committerGitHub <noreply@github.com>2021-11-04 15:06:03 -0600
commitc0b003e9c787ccab27f6fe57c154d7b881da5795 (patch)
tree2e96a8e29dc8a701ee08b700fd514443a8fe8253
parent5d3c424dbc10bb21aeb7d8f9feb6ee2fc305e0d9 (diff)
parent0a7fba9722868a3bf4c1d0032e76c1378a09218b (diff)
downloadnumpy-1.21.4.tar.gz
Merge pull request #20304 from charris/prepare-1.21.4-release-2v1.21.4
REL: Prepare for NumPy 1.21.4 release (2)
-rw-r--r--doc/changelog/1.21.4-changelog.rst6
-rw-r--r--doc/source/release/1.21.4-notes.rst7
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/changelog/1.21.4-changelog.rst b/doc/changelog/1.21.4-changelog.rst
index 50d0e252c..ecc1d1d92 100644
--- a/doc/changelog/1.21.4-changelog.rst
+++ b/doc/changelog/1.21.4-changelog.rst
@@ -16,12 +16,14 @@ names contributed a patch for the first time.
Pull requests merged
====================
-A total of 7 pull requests were merged for this release.
+A total of 9 pull requests were merged for this release.
* `#20278 <https://github.com/numpy/numpy/pull/20278>`__: BUG: Fix shadowed reference of `dtype` in type stub
* `#20293 <https://github.com/numpy/numpy/pull/20293>`__: BUG: Fix headers for universal2 builds
* `#20294 <https://github.com/numpy/numpy/pull/20294>`__: BUG: ``VOID_nonzero`` could sometimes mutate alignment flag
* `#20295 <https://github.com/numpy/numpy/pull/20295>`__: BUG: Do not use nonzero fastpath on unaligned arrays
-* `#20296 <https://github.com/numpy/numpy/pull/20296>`__: BUG: Distuils patch to allow for 2 as a minor version (!)
+* `#20296 <https://github.com/numpy/numpy/pull/20296>`__: BUG: Distutils patch to allow for 2 as a minor version (!)
* `#20297 <https://github.com/numpy/numpy/pull/20297>`__: BUG, SIMD: Fix 64-bit/8-bit integer division by a scalar
* `#20298 <https://github.com/numpy/numpy/pull/20298>`__: BUG, SIMD: Workaround broadcasting SIMD 64-bit integers on MSVC...
+* `#20300 <https://github.com/numpy/numpy/pull/20300>`__: REL: Prepare for the NumPy 1.21.4 release.
+* `#20302 <https://github.com/numpy/numpy/pull/20302>`__: TST: Fix a `Arrayterator` typing test failure
diff --git a/doc/source/release/1.21.4-notes.rst b/doc/source/release/1.21.4-notes.rst
index 0811680f7..dd8abdb82 100644
--- a/doc/source/release/1.21.4-notes.rst
+++ b/doc/source/release/1.21.4-notes.rst
@@ -16,7 +16,6 @@ The Python versions supported in this release are 3.7-3.10. If you want to
compile your own version using gcc-11, you will need to use gcc-11.2+ to avoid
problems.
-
Contributors
============
@@ -34,12 +33,14 @@ names contributed a patch for the first time.
Pull requests merged
====================
-A total of 7 pull requests were merged for this release.
+A total of 9 pull requests were merged for this release.
* `#20278 <https://github.com/numpy/numpy/pull/20278>`__: BUG: Fix shadowed reference of `dtype` in type stub
* `#20293 <https://github.com/numpy/numpy/pull/20293>`__: BUG: Fix headers for universal2 builds
* `#20294 <https://github.com/numpy/numpy/pull/20294>`__: BUG: ``VOID_nonzero`` could sometimes mutate alignment flag
* `#20295 <https://github.com/numpy/numpy/pull/20295>`__: BUG: Do not use nonzero fastpath on unaligned arrays
-* `#20296 <https://github.com/numpy/numpy/pull/20296>`__: BUG: Distuils patch to allow for 2 as a minor version (!)
+* `#20296 <https://github.com/numpy/numpy/pull/20296>`__: BUG: Distutils patch to allow for 2 as a minor version (!)
* `#20297 <https://github.com/numpy/numpy/pull/20297>`__: BUG, SIMD: Fix 64-bit/8-bit integer division by a scalar
* `#20298 <https://github.com/numpy/numpy/pull/20298>`__: BUG, SIMD: Workaround broadcasting SIMD 64-bit integers on MSVC...
+* `#20300 <https://github.com/numpy/numpy/pull/20300>`__: REL: Prepare for the NumPy 1.21.4 release.
+* `#20302 <https://github.com/numpy/numpy/pull/20302>`__: TST: Fix a `Arrayterator` typing test failure