summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2020-01-21 10:53:01 -0800
committerGitHub <noreply@github.com>2020-01-21 10:53:01 -0800
commit19b96a1635ee93c487d69ab88ac5ea3a6a14e79e (patch)
treef99888343cd57e61840e619514d87f0feb010655
parent5b7d62ae8fbb5216c5fae34b09d8157bc45408d9 (diff)
parentca85d71839c2745df097cfe30f549c55ab9ae3d1 (diff)
downloadnumpy-19b96a1635ee93c487d69ab88ac5ea3a6a14e79e.tar.gz
Merge pull request #15351 from mattip/reword
DOC, BLD: reword release note, upgrade sphinx version
-rw-r--r--.circleci/config.yml2
-rw-r--r--doc/release/upcoming_changes/15217.deprecation.rst8
2 files changed, 6 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 772c3fbfd..38695bdff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
python3 -m venv venv
ln -s $(which python3) venv/bin/python3.6
. venv/bin/activate
- pip install cython sphinx==2.2.0 matplotlib ipython
+ pip install cython sphinx==2.3.1 matplotlib ipython
sudo apt-get update
sudo apt-get install -y graphviz texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra texlive-generic-extra latexmk texlive-xetex
diff --git a/doc/release/upcoming_changes/15217.deprecation.rst b/doc/release/upcoming_changes/15217.deprecation.rst
index e9dd0995d..d49de20b5 100644
--- a/doc/release/upcoming_changes/15217.deprecation.rst
+++ b/doc/release/upcoming_changes/15217.deprecation.rst
@@ -1,11 +1,13 @@
Passing ``shape=0`` to factory functions in ``numpy.rec`` is deprecated
-----------------------------------------------------------------------
-``0`` is treated as a special case by these functions, which aliases to
-``None``. In future, ``0`` will not be a special case, and will be treated
-as an array length like any other integer is. The affected functions are:
+``0`` is treated as a special case and is aliased to ``None`` in the functions:
* `numpy.core.records.fromarrays`
* `numpy.core.records.fromrecords`
* `numpy.core.records.fromstring`
* `numpy.core.records.fromfile`
+
+In future, ``0`` will not be special cased, and will be treated as an array
+length like any other integer.
+