Merge pull request #20373 from charris/prepare-for-1.22-branch

MAINT: Prepare for branching maintenance/1.22.x

3 files changed, 52 insertions, 5 deletions

diff --git a/.mailmap b/.mailmap
index 3f45904fc..fd020c818 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,20 +26,26 @@
 @sfolje0 <sfolje0@github>
 @spacescientist <aspacescientist@protonmail.com> <spacescientist@pm.me>
 @tautaus <sunt9751@gmail.com>
+@vinith2 <85550536+vinith2@users.noreply.github.com>
 @xoviat <49173759+xoviat@users.noreply.github.com>
 @xoviat <49173759+xoviat@users.noreply.github.com> <xoviat@users.noreply.github.com>
+@yan-wyb <yan-wyb@foxmail.com>
 @yetanothercheer <yetanothercheer@protonmail.com>
 Aaron Baecker <abaecker@localhost>
 Aarthi Agurusa <agurusa@gmail.com>
+Ajay DS <turingman@protonmail.com>
+Ajay DS <turingman@protonmail.com> <ajayds2001@gmail.com>
 Alan Fontenot <logeaux@yahoo.com>
 Alan Fontenot <logeaux@yahoo.com> <36168460+logeaux@users.noreply.github.com>
 Abdul Muneer <abdulmuneer@gmail.com>
 Abhilash Barigidad <abhilash.ub@gmail.com>
 Abhilash Barigidad <abhilash.ub@gmail.com> <64172584+abhilash42@users.noreply.github.com>
 Abhinav Reddy <abhinav071197@gmail.com>
+Abel Aoun <aoun@cerfacs.fr>
 Adam Ginsburg <adam.g.ginsburg@gmail.com> <keflavich@gmail.com>
 Aerik Pawson <45904740+aerikpawson@users.noreply.github.com>
 Albert Jornet Puig <albert.jornet@ic3.cat>
+Alberto Rubiales <arubiales11@gmail.com>
 Alex Rockhill <aprockhill206@gmail.com>
 Alex Griffing <argriffi@ncsu.edu>
 Alex Griffing <argriffi@ncsu.edu> <argriffing@gmail.com>
@@ -78,7 +84,9 @@ Anne Bonner <bonn0062@yahoo.com> <35413198+bonn0062@users.noreply.github.com>
 Anthony Vo <anthonyhvo12@gmail.com> <43098273+anthonyhvo12@users.noreply.github.com>
 Antoine Pitrou <antoine@python.org> <pitrou@free.fr>
 Anže Starič <anze.staric@gmail.com>
+Arfy Slowy <slowy.arfy@gmail.com>
 Aron Ahmadia <aron@ahmadia.net>
+Arun Palaniappen <arun.palaniappan1999@gmail.com>
 Arun Persaud <apersaud@lbl.gov> <arun@nubati.net>
 Ashutosh Singh <ashutoshsinghrkt@gmail.com>
 Ashutosh Singh <ashutoshsinghrkt@gmail.com> <55102089+Ashutosh619-sudo@users.noreply.github.com>
@@ -98,6 +106,7 @@ Bertrand Lefebvre <bertrand.l3f@gmail.com>
 Bharat Raghunathan <bharatraghunthan9767@gmail.com>
 Bharat Raghunathan <bharatraghunthan9767@gmail.com> <bharatr@symphonyai.com>
 Bob Eldering <eldering@jive.eu>
+Brent Brewington <brent.brewington@gmail.com>
 Brett R Murphy <bmurphy@enthought.com>
 Brigitta Sipocz <bsipocz@gmail.com> <b.sipocz@gmail.com>
 Brian Soto <iambriansoto@gmail.com>
@@ -111,6 +120,7 @@ Carl Leake <leakec57@gmail.com>
 Charles Stern <62192187+cisaacstern@users.noreply.github.com>
 Chris Barker <Chris.Barker@noaa.gov> <chris.barker@local>
 Chris Burns <chris.burns@localhost>
+Chris Fu (傅立业) <17433201@qq.com>
 Chris Holland <chrisholland3553@gmail.com> <41524756+ChrisAHolland@users.noreply.github.com>
 Chris Kerr <debdepba@dasganma.tk> <cjk34@cam.ac.uk>
 Chris Vavaliaris <cv1038@wildcats.unh.edu>
@@ -137,6 +147,8 @@ Daniel Rasmussen <daniel.rasmussen@appliedbrainresearch.com>
 Daniel G. A. Smith <dgasmith@icloud.com>
 Daniel G. A. Smith <dgasmith@icloud.com> <malorian@me.com>
 Dario Mory <daaawx@gmail.com>
+David Badnar <bdvd001@gmail.com>
+David Cortes <david.cortes.rivera@gmail.com>
 David Huard <david.huard@gmail.com> dhuard <dhuard@localhost>
 David M Cooke <cookedm@localhost>
 David Nicholson <davidjn@google.com> <dnic12345@gmail.com>
@@ -161,6 +173,9 @@ Erik M. Bray <erik.m.bray@gmail.com> <embray@stsci.edu>
 Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@linuxlaptop.(none)>
 Eric Quintero <eric.antonio.quintero@gmail.com>
 Ernest N. Mamikonyan <ernest.mamikonyan@gmail.com>
+Eskild Eriksen <eskild.eriksen122@gmail.com>
+Eskild Eriksen <eskild.eriksen122@gmail.com> <42120229+iameskild@users.noreply.github.com>
+Eskild Eriksen <eskild.eriksen122@gmail.com> <eskild@doublee.io>
 Etienne Guesnet <etienne.guesnet.external@atos.net> <51407514+EGuesnet@users.noreply.github.com>
 Eva Jau <evaj@posteo.de>
 Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeni@burovski.me>
@@ -173,6 +188,7 @@ Friedrich Dunne <dunneff@tcd.ie> dunneff <dunneff@tcd.ie>
 Frederic Bastien <nouiz@nouiz.org> Frederic <nouiz@nouiz.org>
 FX Coudert <fxcoudert@gmail.com>
 Gael Varoquaux <gael.varoquaux@normalesup.org>
+Gagandeep Singh <gdp.1807@gmail.com>
 Gerrit Holl <gerrit.holl@gmail.com> <gerrit.holl@utoronto.ca>
 Gerrit Holl <gerrit.holl@gmail.com> <g.holl@reading.ac.uk>
 Giuseppe Venturini <ggventurini@users.noreply.github.com>
@@ -185,6 +201,7 @@ Greg Young <gfyoung17@gmail.com> <gfyoung@mit.edu>
 Gregory R. Lee <grlee77@gmail.com>
 Gregory R. Lee <grlee77@gmail.com> <gregory.lee@cchmc.org>
 Guo Ci <zguoci@gmail.com> guoci <zguoci@gmail.com>
+Guo Shuai <gs0801@foxmail.com>
 Hameer Abbasi <einstein.edison@gmail.com> <hameerabbasi@yahoo.com>
 Han Genuit <hangenuit@gmail.com>
 Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
@@ -193,7 +210,9 @@ Hemil Desai <desai38@purdue.edu>
 Hiroyuki V. Yamazaki <hiroyuki.vincent.yamazaki@gmail.com>
 Hugo van Kemenade <hugovk@users.noreply.github.com>
 I-Shen Leong <i-shenl@activestate.com>
+Imen Rajhi <imen.rajhi.ir@gmail.com>
 Inessa Pawson <albuscode@gmail.com>
+Irina Maria Mocan <28827042+IrinaMaria@users.noreply.github.com>
 Irvin Probst <irvin.probst@ensta-bretagne.fr>
 Isabela Presedo-Floyd <irpf.design@gmail.com> <ipresedo@calpoly.edu>
 Gerhard Hobler <gerhard.hobler@tuwien.ac.at>
@@ -220,6 +239,7 @@ Jeremy Lay <jlay80@gmail.com>
 Jérémie du Boisberranger <jeremie.du-boisberranger@inria.fr> jeremiedbb <34657725+jeremiedbb@users.noreply.github.com>
 Jérome Eertmans <jeertmans@icloud.com>
 Jerome Kelleher <jerome.kelleher@ed.ac.uk>
+Jessi J Zhao <35235453+jessijzhao@users.noreply.github.com>
 Johannes Hampp <johannes.hampp@zeu.uni-giessen.de> <42553970+euronion@users.noreply.github.com>
 Johannes Schönberger <hannesschoenberger@gmail.com> <jschoenberger@demuc.de>
 Johann Faouzi <johann.faouzi@gmail.com> <johann.faouzi@icm-institute.org>
@@ -231,6 +251,7 @@ Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com>
 Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> <joseph.r.fox-rabinovitz@nasa.gov>
 Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> <madphysicist@users.noreply.github.com>
 Joseph Martinot-Lagarde <contrebasse@gmail.com> <joseph.martinot-lagarde@onera.fr>
+Joshua Himmens <joshua.himmens@gmail.com>
 Julian Taylor <juliantaylor108@gmail.com>
 Julian Taylor <juliantaylor108@gmail.com> <jtaylor.debian@googlemail.com>
 Julian Taylor <juliantaylor108@gmail.com> <jtaylor108@googlemail.com>
@@ -244,6 +265,9 @@ Kasia Leszek <kati.leszek@gmail.com>
 Kasia Leszek <kati.leszek@gmail.com> <39829548+katleszek@users.noreply.github.com>
 Karan Dhir <karan.dhir@berkeley.edu> <kurrandhir@gmail.com>
 Keller Meier <max.kellermeier@hotmail.de>
+Kenny Huynh <hkennyv@gmail.com>
+Kevin Granados <kevingranados62@gmail.com>
+Kevin Granados <kevingranados62@gmail.com> <54990613+NectDz@users.noreply.github.com>
 Kevin Sheppard <kevin.k.sheppard@gmail.com> <bashtage@users.noreply.github.com>
 Kevin Sheppard <kevin.k.sheppard@gmail.com> <kevin.sheppard@gmail.com>
 Kerem Hallaç <hallackerem@gmail.com>
@@ -254,6 +278,7 @@ Konrad Kapp <k_kapp@yahoo.com>
 Kriti Singh <kritisingh1.ks@gmail.com>
 Kmol Yuan <pyslvs@gmail.com>
 Kumud Lakara <55556183+kumudlakara@users.noreply.github.com>
+Lalit Musmade <lalitmusmade2@gmail.com>
 Lars Buitinck <larsmans@gmail.com> Lars Buitinck <l.buitinck@esciencecenter.nl>
 Lars Buitinck <larsmans@gmail.com> Lars Buitinck <L.J.Buitinck@uva.nl>
 Lars Grüter <lagru@mailbox.org>
@@ -265,18 +290,24 @@ Luke Zoltan Kelley <lkelley@cfa.harvard.edu>
 Madhulika Jain Chambers <madhulikajain@gmail.com> <53166646+madhulikajc@users.noreply.github.com>
 Magdalena Proszewska <magdalena.proszewska@gmail.com>
 Magdalena Proszewska <magdalena.proszewska@gmail.com> <38814059+mproszewska@users.noreply.github.com>
+Malik Idrees Hasan Khan <77000356+MalikIdreesHasanKhan@users.noreply.github.com>C
 Manoj Kumar <manojkumarsivaraj334@gmail.com>
 Marcin Podhajski <podhajskimarcin@gmail.com> <36967358+m-podhajski@users.noreply.github.com>
+Margret Pax <pax.margret@tutanota.com>
+Margret Pax <pax.margret@tutanota.com> <13646646+paxcodes@users.noreply.github.com>
 Mark DePristo <mdepristo@synapdx.com>
 Mark Weissman <mw9050@gmail.com>
 Mark Wiebe <mwwiebe@gmail.com>
 Mark Wiebe <mwwiebe@gmail.com> <mwiebe@continuum.io>
 Mark Wiebe <mwwiebe@gmail.com> <mwiebe@enthought.com>
 Mark Wiebe <mwwiebe@gmail.com> <mwiebe@georg.(none)>
+Mars Lee <mlee@quansight.com>
+Mars Lee <mlee@quansight.com> <46167686+MarsBarLee@users.noreply.github.com>
 Martin Goodson <martingoodson@gmail.com>
 Martin Reinecke <martin@mpa-garching.mpg.de>
 Martin Teichmann <martin.teichmann@xfel.eu> <lkb.teichmann@gmail.com>
 Mary Conley <sleeplessinseattle.dev@gmail.com>
+Masashi Kishimoto <drehbleistift@gmail.com>
 Matheus Vieira Portela <matheus.v.portela@gmail.com>
 Mathieu Lamarre <mlamarre@ea.com> <mathieu@vlam3d.com>
 Matías Ríos <riosm@dickinson.edu>
@@ -285,11 +316,13 @@ Matt Ord <Matthew.ord1@gmail.com> <55235095+Matt-Ord@users.noreply.github.com>
 Matt Hancock <not.matt.hancock@gmail.com> <mhancock743@gmail.com>
 Martino Sorbaro <martino.sorbaro@ed.ac.uk>
 Mattheus Ueckermann <empeeu@yahoo.com>
+Matthew Barber <quitesimplymatt@gmail.com>
 Matthew Harrigan <harrigan.matthew@gmail.com>
 Matthias Bussonnier <bussonniermatthias@gmail.com> <mbussonnier@ucmerced.edu>
 Matti Picus <matti.picus@gmail.com>
 Maximilian Konrad <maximilianlukaskonrad@hotmail.de>
-Melissa Weber Mendonça <melissawm@gmail.com> <melissawm@gmail.com>
+Melissa Weber Mendonça <melissawm@gmail.com>
+Melissa Weber Mendonça <melissawm@gmail.com> <melissawm.github@gmail.com>
 Meltem Eren Copur <mecopur@outlook.com>
 Michael Behrisch <oss@behrisch.de> behrisch <behrisch@users.sourceforge.net>
 Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
@@ -307,8 +340,8 @@ Mircea Akos Bruma <bruma.mircea.a@gmail.com>
 Mircea Akos Bruma <bruma.mircea.a@gmail.com> <akos@debian-gnu-linux-vm.localdomain>
 Mitchell Faas <Faas.Mitchell@gmail.com> <35742861+Mitchell-Faas@users.noreply.github.com>
 Muhammad Kasim <firman.kasim@gmail.com>
-Masashi Kishimoto <drehbleistift@gmail.com>
-Mukulikaa Parhari <mukulikapahari@gmail.com> <60316606+Mukulikaa@users.noreply.github.com>
+Mukulika Pahari <mukulikapahari@gmail.com>
+Mukulika Pahari <mukulikapahari@gmail.com> <60316606+Mukulikaa@users.noreply.github.com>
 Nathaniel J. Smith <njs@pobox.com>
 Naveen Arunachalam <notatroll.troll@gmail.com> naveenarun <notatroll.troll@gmail.com>
 Neil Girdhar <mistersheik@gmail.com>
@@ -337,6 +370,8 @@ Pierre GM <pierregmcode@gmail.com> pierregm <pierregm@localhost>
 Piotr Gaiński <dociebieaniuszlem@gmail.com>
 Piotr Gaiński <dociebieaniuszlem@gmail.com> Pan Jan <rumcajsgajos@gmail.com>
 Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
+Prathmesh Shirsat <patushir@gmail.com>
+Prathmesh Shirsat <patushir@gmail.com> <55539563+Fayyr@users.noreply.github.com>
 Przemyslaw Bartosik <sendthenote@gmail.com>
 Raghuveer Devulapalli <me.raghuveer@gmail.com> <raghuveer.devulapalli@intel.com>
 Raghuveer Devulapalli <me.raghuveer@gmail.com> <44766858+r-devulap@users.noreply.github.com>
@@ -352,6 +387,7 @@ Robert T. McGibbon <rmcgibbo@gmail.com>
 Roland Kaufmann <rka081+numpy@uib.no> <roland.kaufmann@uni.no>
 Roman Yurchak <rth.yurchak@gmail.com> <rth.yurchak@pm.me>
 Ronan Lamy <ronan.lamy@gmail.com> Ronan Lamy <Ronan.Lamy@normalesup.org>
+Roy Jacobson <roi.jacobson1@gmail.com>
 Russell Hewett <rhewett@mit.edu>
 Ryan Blakemore <rbtnet@gmail.com>
 Ryan Polley <rypolley@gmail.com> <rypolley+github@gmail.com>
@@ -367,8 +403,13 @@ Sami Salonen <ssalonen@gmail.com> <sami.salonen@eniram.fi>
 Sanchez Gonzalez Alvaro <as12513@imperial.ac.uk>
 Saullo Giovani <saullogiovani@gmail.com>
 Saurabh Mehta <e.samehta@gmail.com>
+Sayantika Banik <sayantikabanik122@gmail.com>
 Sebastian Berg <sebastian@sipsolutions.net>
+Sebastian Schleehauf <slepton@posteo.de>
+Serge Guelton <serge.guelton@telecom-bretagne.eu>
 Sergei Vorfolomeev <svorfolomeev@vmssoftware.com> <39548292+vorfol@users.noreply.github.com>
+Shubham Gupta <mastershubham@gmail.com>
+Shubham Gupta <mastershubham@gmail.com> <63910248+shubham11941140@users.noreply.github.com>
 Shekhar Prasad Rajak <shekharrajak@live.com>
 Shen Zhou <shen_zhou@u.nus.edu>
 Shota Kawabuchi <shota.kawabuchi+GitHub@gmail.com>
@@ -389,6 +430,8 @@ Stuart Archibald <stuart.archibald@googlemail.com> <stuart@opengamma.com>
 Stuart Archibald <stuart.archibald@googlemail.com> <stuartarchibald@users.noreply.github.com>
 SuryaChand P <psschand@gmail.com>
 Takanori Hirano <takanori17h@gmail.com>
+Theodoros Nikolaou <nikolaoutheod@gmail.com>
+David Cortes <david.cortes.rivera@gmail.com>
 Thomas A Caswell <tcaswell@gmail.com> <tcaswell@bnl.gov>
 Thomas Kluyver <takowl@gmail.com> <thomas@kluyver.me.uk>
 Thomas Orgis <thomas.orgis@uni-hamburg.de>
@@ -413,6 +456,7 @@ Varun Nayyar <nayyarv@gmail.com> <nayyarv@users.noreply.github.com>
 Vrinda Narayan <talk2vrinda@gmail.com> <vrinda18120@iiitd.ac.in>
 Vrinda Narayan <talk2vrinda@gmail.com> <48102157+vrindaaa@users.noreply.github.com>
 Wansoo Kim <rladhkstn8@gmail.com>
+Warren Weckesser <warren.weckesser@gmail.com>
 Warren Weckesser <warren.weckesser@gmail.com> <warren.weckesser@enthought.com>
 Weitang Li <liwt31@163.com>
 Wendell Smith <wendellwsmith@gmail.com> <wackywendell@gmail.com>
@@ -428,6 +472,7 @@ Yuji Kanagawa <yuji.kngw.80s.revive@gmail.com>
 Yury Kirienko <yury.kirienko@gmail.com>
 Zac Hatfield-Dodds <zac.hatfield.dodds@gmail.com>
 Zé Vinícius <jvmirca@gmail.com>
+Zhang Na <zhangna@loongson.cn>
 Zixu Zhao <zixu.zhao.tireless@gmail.com>
 Ziyan Zhou <ziyan.zhou@mujin.co.jp>
 Zieji Pohz <poh.ziji@gmail.com>
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt
index f0a128d3d..e7b3ef697 100644
--- a/numpy/core/code_generators/cversions.txt
+++ b/numpy/core/code_generators/cversions.txt
@@ -1,6 +1,8 @@
 # Hash below were defined from numpy_api_order.txt and ufunc_api_order.txt
 # When adding a new version here for a new minor release, also add the same
-# version as NPY_x_y_API_VERSION in numpyconfig.h
+# version as NPY_x_y_API_VERSION in numpyconfig.h and C_API_VERSION in
+# setup_common.py.
+
 0x00000001 = 603580d224763e58c5e7147f804dc0f5
 0x00000002 = 8ecb29306758515ae69749c803a75da1
 0x00000003 = bf22c0d05b31625d2a7015988d61ce5a
diff --git a/numpy/core/include/numpy/numpyconfig.h b/numpy/core/include/numpy/numpyconfig.h
index 1c3686769..f761555b9 100644
--- a/numpy/core/include/numpy/numpyconfig.h
+++ b/numpy/core/include/numpy/numpyconfig.h
@@ -56,6 +56,6 @@
 #define NPY_1_19_API_VERSION 0x00000008
 #define NPY_1_20_API_VERSION 0x0000000e
 #define NPY_1_21_API_VERSION 0x0000000e
-#define NPY_1_22_API_VERSION 0x0000000e
+#define NPY_1_22_API_VERSION 0x0000000f
 
 #endif  /* NUMPY_CORE_INCLUDE_NUMPY_NPY_NUMPYCONFIG_H_ */