summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2022-04-12 13:36:12 -0600
committerGitHub <noreply@github.com>2022-04-12 13:36:12 -0600
commit5ffb84c3057a187b01acdeaa628137193df12098 (patch)
tree879c9b71edb1c022806a8c794754a0b9bdac2b23
parentb991d0992a56272531e18613cc26b0ba085459ef (diff)
parent3736b3b9db73e7c06029c4ab49f2b63f1862d521 (diff)
downloadnumpy-5ffb84c3057a187b01acdeaa628137193df12098.tar.gz
Merge pull request #21331 from charris/post-1.21.6-release-update
REL: Update main after 1.21.6 release.
-rw-r--r--doc/changelog/1.21.6-changelog.rst15
-rw-r--r--doc/source/release.rst1
-rw-r--r--doc/source/release/1.21.6-notes.rst13
3 files changed, 29 insertions, 0 deletions
diff --git a/doc/changelog/1.21.6-changelog.rst b/doc/changelog/1.21.6-changelog.rst
new file mode 100644
index 000000000..5d869ee0f
--- /dev/null
+++ b/doc/changelog/1.21.6-changelog.rst
@@ -0,0 +1,15 @@
+
+Contributors
+============
+
+A total of 1 people contributed to this release. People with a "+" by their
+names contributed a patch for the first time.
+
+* Charles Harris
+
+Pull requests merged
+====================
+
+A total of 1 pull requests were merged for this release.
+
+* `#21318 <https://github.com/numpy/numpy/pull/21318>`__: REV: Revert pull request #20464 from charris/backport-20354
diff --git a/doc/source/release.rst b/doc/source/release.rst
index 3fb8ad287..c90e0bc19 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -10,6 +10,7 @@ Release notes
1.22.2 <release/1.22.2-notes>
1.22.1 <release/1.22.1-notes>
1.22.0 <release/1.22.0-notes>
+ 1.21.6 <release/1.21.6-notes>
1.21.5 <release/1.21.5-notes>
1.21.4 <release/1.21.4-notes>
1.21.3 <release/1.21.3-notes>
diff --git a/doc/source/release/1.21.6-notes.rst b/doc/source/release/1.21.6-notes.rst
new file mode 100644
index 000000000..6683969a2
--- /dev/null
+++ b/doc/source/release/1.21.6-notes.rst
@@ -0,0 +1,13 @@
+.. currentmodule:: numpy
+
+==========================
+NumPy 1.21.6 Release Notes
+==========================
+
+NumPy 1.21.6 is a very small release that achieves two things:
+
+- Backs out the mistaken backport of C++ code into 1.21.5.
+- Provides a 32 bit Windows wheel for Python 3.10.
+
+The provision of the 32 bit wheel is intended to make life easier
+for oldest-supported-numpy.