Merge pull request #21323 from charris/prepare-1.21.6-release

REL: Prepare for NumPy 1.21.6 release.
numpy · Apr 11, 2022 · ef0ec78 · ef0ec78
2 parents 68ff2d3 + 24a8ec0
commit ef0ec78
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 45 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,8 +33,8 @@ jobs:
             . venv/bin/activate
             pip install --progress-bar=off --upgrade pip 'setuptools<49.2.0'
             pip install --progress-bar=off -r test_requirements.txt
-            pip install .
             pip install --progress-bar=off -r doc_requirements.txt
+            pip install .
 
       - run:
           name: create release notes

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -116,15 +116,15 @@ stages:
       # the docs even though i.e., numba uses another in their
       # azure config for mac os -- Microsoft has indicated
       # they will patch this issue
-      vmImage: macOS-10.14
+      vmImage: 'macOS-1015'
     strategy:
       maxParallel: 3
       matrix:
-          Python37:
-            PYTHON_VERSION: '3.7'
+          Python38:
+            PYTHON_VERSION: '3.8'
             USE_OPENBLAS: '1'
-          Python37-ILP64:
-            PYTHON_VERSION: '3.7'
+          Python38-ILP64:
+            PYTHON_VERSION: '3.8'
             NPY_USE_BLAS_ILP64: '1'
             USE_OPENBLAS: '1'
     steps:

diff --git a/doc/changelog/1.21.6-changelog.rst 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/conf.py b/doc/source/conf.py
@@ -288,7 +288,7 @@ def setup(app):
 intersphinx_mapping = {
     'neps': ('https://numpy.org/neps', None),
     'python': ('https://docs.python.org/dev', None),
-    'scipy': ('https://docs.scipy.org/doc/scipy/reference', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy', None),
     'matplotlib': ('https://matplotlib.org/stable', None),
     'imageio': ('https://imageio.readthedocs.io/en/stable', None),
     'skimage': ('https://scikit-image.org/docs/stable', None),

diff --git a/doc/source/release/1.21.6-notes.rst b/doc/source/release/1.21.6-notes.rst
@@ -4,42 +4,10 @@
 NumPy 1.21.6 Release Notes
 ==========================
 
+NumPy 1.21.6 is a very small release that achieves two things:
 
-Highlights
-==========
+- Backs out the mistaken backport of C++ code into 1.21.5.
+- Provides a 32 bit Windows wheel for Python 3.10.
 
-
-New functions
-=============
-
-
-Deprecations
-============
-
-
-Future Changes
-==============
-
-
-Expired deprecations
-====================
-
-
-Compatibility notes
-===================
-
-
-C API changes
-=============
-
-
-New Features
-============
-
-
-Improvements
-============
-
-
-Changes
-=======
+The provision of the 32 bit wheel is intended to make life easier
+for oldest-supported-numpy.
diff --git a/doc/source/user/absolute_beginners.rst b/doc/source/user/absolute_beginners.rst
@@ -1583,7 +1583,7 @@ If you created this array "a" ::
 
 .. for doctests
    The continuous integration truncates dataframe display without this setting.
-   >>> pd.set_option('max_columns', 10)
+   >>> pd.set_option('display.max_columns', 10)
 
 You could create a Pandas dataframe ::