Merge branch 'master' into bug-concat-4

Author: jbrockmendel

doc/source/whatsnew/index.rst

@@ -24,6 +24,7 @@ Version 1.2
 .. toctree::
    :maxdepth: 2
 
+   v1.2.3
    v1.2.2
    v1.2.1
    v1.2.0

doc/source/whatsnew/v1.2.2.rst

@@ -46,4 +46,4 @@ Bug fixes
 Contributors
 ~~~~~~~~~~~~
 
-.. contributors:: v1.2.1..v1.2.2|HEAD
+.. contributors:: v1.2.1..v1.2.2

doc/source/whatsnew/v1.2.3.rst

@@ -0,0 +1,48 @@
+.. _whatsnew_123:
+
+What's new in 1.2.3 (March ??, 2021)
+------------------------------------
+
+These are the changes in pandas 1.2.3. See :ref:`release` for a full changelog
+including other versions of pandas.
+
+{{ header }}
+
+.. ---------------------------------------------------------------------------
+
+.. _whatsnew_123.regressions:
+
+Fixed regressions
+~~~~~~~~~~~~~~~~~
+
+-
+-
+
+.. ---------------------------------------------------------------------------
+
+.. _whatsnew_123.bug_fixes:
+
+Bug fixes
+~~~~~~~~~
+
+-
+-
+
+.. ---------------------------------------------------------------------------
+
+.. _whatsnew_123.other:
+
+Other
+~~~~~
+
+-
+-
+
+.. ---------------------------------------------------------------------------
+
+.. _whatsnew_123.contributors:
+
+Contributors
+~~~~~~~~~~~~
+
+.. contributors:: v1.2.2..v1.2.3|HEAD

environment.yml

@@ -114,4 +114,4 @@ dependencies:
   - natsort  # DataFrame.sort_values
   - pip:
     - git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103
-    - git+https://github.com/numpy/numpydoc
+    - numpydoc < 1.2  # 2021-02-09 1.2dev breaking CI

requirements-dev.txt

@@ -77,4 +77,4 @@ pyreadstat
 tabulate>=0.8.3
 natsort
 git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103
-git+https://github.com/numpy/numpydoc
+numpydoc < 1.2