From a69d3af7e383d53a28217ff6c83149c06baf04d6 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Mon, 11 Apr 2022 09:39:25 -0600 Subject: [PATCH] REL: Prepare for NumPy 1.21.6 release. - Create 1.21.6-changelog.rst. - Update 1.21.6-notes.rst. - Fix circleci doc builds. - Change azure-pipelines Mac vmImage to macOS-1015. --- .circleci/config.yml | 2 +- azure-pipelines.yml | 2 +- doc/changelog/1.21.6-changelog.rst | 15 +++++++++ doc/source/conf.py | 2 +- doc/source/release/1.21.6-notes.rst | 42 +++----------------------- doc/source/user/absolute_beginners.rst | 2 +- 6 files changed, 24 insertions(+), 41 deletions(-) create mode 100644 doc/changelog/1.21.6-changelog.rst diff --git a/.circleci/config.yml b/.circleci/config.yml index fdb85be98be6..74c81e2b63dc 100644 --- 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 index 14a59e8800af..834c6dd9546a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -116,7 +116,7 @@ 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: diff --git a/doc/changelog/1.21.6-changelog.rst b/doc/changelog/1.21.6-changelog.rst new file mode 100644 index 000000000000..5d869ee0fe50 --- /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 `__: REV: Revert pull request #20464 from charris/backport-20354 diff --git a/doc/source/conf.py b/doc/source/conf.py index 5ba7f70b8ff5..8fa537969a86 100644 --- 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 index 9731ff674d7a..6683969a280e 100644 --- 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 index d97b92617b77..ec3e232c8f35 100644 --- 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 ::