Skip to content

Commit 7310c09

Browse files
authored
Merge pull request numpy#20373 from charris/prepare-for-1.22-branch
MAINT: Prepare for branching maintenance/1.22.x
2 parents a7e2274 + 9c8c88e commit 7310c09

File tree

3 files changed

+52
-5
lines changed

3 files changed

+52
-5
lines changed

.mailmap

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,26 @@
2626
@sfolje0 <sfolje0@github>
2727
2828
29+
2930
3031
32+
3133
@yetanothercheer <[email protected]>
3234
Aaron Baecker <abaecker@localhost>
3335
Aarthi Agurusa <[email protected]>
36+
37+
3438
Alan Fontenot <[email protected]>
3539
3640
Abdul Muneer <[email protected]>
3741
Abhilash Barigidad <[email protected]>
3842
Abhilash Barigidad <[email protected]> <[email protected]>
3943
Abhinav Reddy <[email protected]>
44+
Abel Aoun <[email protected]>
4045
4146
Aerik Pawson <[email protected]>
4247
Albert Jornet Puig <[email protected]>
48+
Alberto Rubiales <[email protected]>
4349
Alex Rockhill <[email protected]>
4450
Alex Griffing <[email protected]>
4551
@@ -78,7 +84,9 @@ Anne Bonner <[email protected]> <[email protected]>
7884
7985
8086
Anže Starič <[email protected]>
87+
Arfy Slowy <[email protected]>
8188
Aron Ahmadia <[email protected]>
89+
Arun Palaniappen <[email protected]>
8290
8391
Ashutosh Singh <[email protected]>
8492
@@ -98,6 +106,7 @@ Bertrand Lefebvre <[email protected]>
98106
Bharat Raghunathan <[email protected]>
99107
Bharat Raghunathan <[email protected]> <[email protected]>
100108
Bob Eldering <[email protected]>
109+
Brent Brewington <[email protected]>
101110
Brett R Murphy <[email protected]>
102111
103112
Brian Soto <[email protected]>
@@ -111,6 +120,7 @@ Carl Leake <[email protected]>
111120
Charles Stern <[email protected]>
112121
Chris Barker <[email protected]> <chris.barker@local>
113122
Chris Burns <chris.burns@localhost>
123+
Chris Fu (傅立业) <[email protected]>
114124
115125
116126
Chris Vavaliaris <[email protected]>
@@ -137,6 +147,8 @@ Daniel Rasmussen <[email protected]>
137147
Daniel G. A. Smith <[email protected]>
138148
Daniel G. A. Smith <[email protected]> <[email protected]>
139149
Dario Mory <[email protected]>
150+
David Badnar <[email protected]>
151+
David Cortes <[email protected]>
140152
David Huard <[email protected]> dhuard <dhuard@localhost>
141153
David M Cooke <cookedm@localhost>
142154
@@ -161,6 +173,9 @@ Erik M. Bray <[email protected]> <[email protected]>
161173
Eric Fode <[email protected]> Eric Fode <ericfode@linuxlaptop.(none)>
162174
Eric Quintero <[email protected]>
163175
Ernest N. Mamikonyan <[email protected]>
176+
Eskild Eriksen <[email protected]>
177+
178+
164179
165180
166181
Evgeni Burovski <[email protected]> Evgeni Burovski <[email protected]>
@@ -173,6 +188,7 @@ Friedrich Dunne <[email protected]> dunneff <[email protected]>
173188
Frederic Bastien <[email protected]> Frederic <[email protected]>
174189
FX Coudert <[email protected]>
175190
Gael Varoquaux <[email protected]>
191+
Gagandeep Singh <[email protected]>
176192
177193
178194
Giuseppe Venturini <[email protected]>
@@ -185,6 +201,7 @@ Greg Young <[email protected]> <[email protected]>
185201
Gregory R. Lee <[email protected]>
186202
187203
204+
Guo Shuai <[email protected]>
188205
189206
Han Genuit <[email protected]>
190207
Hanno Klemm <[email protected]> hklemm <[email protected]>
@@ -193,7 +210,9 @@ Hemil Desai <[email protected]>
193210
Hiroyuki V. Yamazaki <[email protected]>
194211
Hugo van Kemenade <[email protected]>
195212
I-Shen Leong <[email protected]>
213+
Imen Rajhi <[email protected]>
196214
Inessa Pawson <[email protected]>
215+
Irina Maria Mocan <[email protected]>
197216
Irvin Probst <[email protected]>
198217
Isabela Presedo-Floyd <[email protected]> <[email protected]>
199218
Gerhard Hobler <[email protected]>
@@ -220,6 +239,7 @@ Jeremy Lay <[email protected]>
220239
Jérémie du Boisberranger <[email protected]> jeremiedbb <[email protected]>
221240
Jérome Eertmans <[email protected]>
222241
Jerome Kelleher <[email protected]>
242+
Jessi J Zhao <[email protected]>
223243
224244
Johannes Schönberger <[email protected]> <[email protected]>
225245
@@ -231,6 +251,7 @@ Joseph Fox-Rabinovitz <[email protected]>
231251
Joseph Fox-Rabinovitz <[email protected]> <[email protected]>
232252
Joseph Fox-Rabinovitz <[email protected]> <[email protected]>
233253
Joseph Martinot-Lagarde <[email protected]> <[email protected]>
254+
Joshua Himmens <[email protected]>
234255
Julian Taylor <[email protected]>
235256
236257
@@ -244,6 +265,9 @@ Kasia Leszek <[email protected]>
244265
245266
246267
Keller Meier <[email protected]>
268+
Kenny Huynh <[email protected]>
269+
Kevin Granados <[email protected]>
270+
247271
248272
249273
Kerem Hallaç <[email protected]>
@@ -254,6 +278,7 @@ Konrad Kapp <[email protected]>
254278
Kriti Singh <[email protected]>
255279
Kmol Yuan <[email protected]>
256280
Kumud Lakara <[email protected]>
281+
Lalit Musmade <[email protected]>
257282
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
258283
Lars Buitinck <[email protected]> Lars Buitinck <[email protected]>
259284
Lars Grüter <[email protected]>
@@ -265,18 +290,24 @@ Luke Zoltan Kelley <[email protected]>
265290
Madhulika Jain Chambers <[email protected]> <[email protected]>
266291
Magdalena Proszewska <[email protected]>
267292
Magdalena Proszewska <[email protected]> <[email protected]>
293+
Malik Idrees Hasan Khan <[email protected]>C
268294
Manoj Kumar <[email protected]>
269295
296+
Margret Pax <[email protected]>
297+
270298
Mark DePristo <[email protected]>
271299
Mark Weissman <[email protected]>
272300
Mark Wiebe <[email protected]>
273301
274302
275303
Mark Wiebe <[email protected]> <mwiebe@georg.(none)>
304+
305+
276306
Martin Goodson <[email protected]>
277307
Martin Reinecke <[email protected]>
278308
279309
Mary Conley <[email protected]>
310+
Masashi Kishimoto <[email protected]>
280311
Matheus Vieira Portela <[email protected]>
281312
282313
Matías Ríos <[email protected]>
@@ -285,11 +316,13 @@ Matt Ord <[email protected]> <[email protected]>
285316
286317
Martino Sorbaro <[email protected]>
287318
Mattheus Ueckermann <[email protected]>
319+
Matthew Barber <[email protected]>
288320
Matthew Harrigan <[email protected]>
289321
Matthias Bussonnier <[email protected]> <[email protected]>
290322
Matti Picus <[email protected]>
291323
Maximilian Konrad <[email protected]>
292-
Melissa Weber Mendonça <[email protected]> <[email protected]>
324+
Melissa Weber Mendonça <[email protected]>
325+
Melissa Weber Mendonça <[email protected]> <[email protected]>
293326
Meltem Eren Copur <[email protected]>
294327
Michael Behrisch <[email protected]> behrisch <[email protected]>
295328
Michael Droettboom <[email protected]> mdroe <mdroe@localhost>
@@ -307,8 +340,8 @@ Mircea Akos Bruma <[email protected]>
307340
308341
309342
Muhammad Kasim <[email protected]>
310-
Masashi Kishimoto <drehbleistift@gmail.com>
311-
343+
Mukulika Pahari <mukulikapahari@gmail.com>
344+
312345
Nathaniel J. Smith <[email protected]>
313346
Naveen Arunachalam <[email protected]> naveenarun <[email protected]>
314347
Neil Girdhar <[email protected]>
@@ -337,6 +370,8 @@ Pierre GM <[email protected]> pierregm <pierregm@localhost>
337370
Piotr Gaiński <[email protected]>
338371
Piotr Gaiński <[email protected]> Pan Jan <[email protected]>
339372
Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
373+
Prathmesh Shirsat <[email protected]>
374+
340375
Przemyslaw Bartosik <[email protected]>
341376
Raghuveer Devulapalli <[email protected]> <[email protected]>
342377
Raghuveer Devulapalli <[email protected]> <[email protected]>
@@ -352,6 +387,7 @@ Robert T. McGibbon <[email protected]>
352387
353388
354389
Ronan Lamy <[email protected]> Ronan Lamy <[email protected]>
390+
Roy Jacobson <[email protected]>
355391
Russell Hewett <[email protected]>
356392
Ryan Blakemore <[email protected]>
357393
@@ -367,8 +403,13 @@ Sami Salonen <[email protected]> <[email protected]>
367403
Sanchez Gonzalez Alvaro <[email protected]>
368404
Saullo Giovani <[email protected]>
369405
Saurabh Mehta <[email protected]>
406+
Sayantika Banik <[email protected]>
370407
Sebastian Berg <[email protected]>
408+
Sebastian Schleehauf <[email protected]>
409+
Serge Guelton <[email protected]>
371410
Sergei Vorfolomeev <[email protected]> <[email protected]>
411+
Shubham Gupta <[email protected]>
412+
372413
Shekhar Prasad Rajak <[email protected]>
373414
Shen Zhou <[email protected]>
374415
Shota Kawabuchi <[email protected]>
@@ -389,6 +430,8 @@ Stuart Archibald <[email protected]> <[email protected]>
389430
390431
SuryaChand P <[email protected]>
391432
Takanori Hirano <[email protected]>
433+
Theodoros Nikolaou <[email protected]>
434+
David Cortes <[email protected]>
392435
393436
394437
Thomas Orgis <[email protected]>
@@ -413,6 +456,7 @@ Varun Nayyar <[email protected]> <[email protected]>
413456
414457
415458
Wansoo Kim <[email protected]>
459+
Warren Weckesser <[email protected]>
416460
417461
Weitang Li <[email protected]>
418462
@@ -428,6 +472,7 @@ Yuji Kanagawa <[email protected]>
428472
Yury Kirienko <[email protected]>
429473
Zac Hatfield-Dodds <[email protected]>
430474
Zé Vinícius <[email protected]>
475+
431476
Zixu Zhao <[email protected]>
432477
Ziyan Zhou <[email protected]>
433478
Zieji Pohz <[email protected]>

numpy/core/code_generators/cversions.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Hash below were defined from numpy_api_order.txt and ufunc_api_order.txt
22
# When adding a new version here for a new minor release, also add the same
3-
# version as NPY_x_y_API_VERSION in numpyconfig.h
3+
# version as NPY_x_y_API_VERSION in numpyconfig.h and C_API_VERSION in
4+
# setup_common.py.
5+
46
0x00000001 = 603580d224763e58c5e7147f804dc0f5
57
0x00000002 = 8ecb29306758515ae69749c803a75da1
68
0x00000003 = bf22c0d05b31625d2a7015988d61ce5a

numpy/core/include/numpy/numpyconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
#define NPY_1_19_API_VERSION 0x00000008
5757
#define NPY_1_20_API_VERSION 0x0000000e
5858
#define NPY_1_21_API_VERSION 0x0000000e
59-
#define NPY_1_22_API_VERSION 0x0000000e
59+
#define NPY_1_22_API_VERSION 0x0000000f
6060

6161
#endif /* NUMPY_CORE_INCLUDE_NUMPY_NPY_NUMPYCONFIG_H_ */

0 commit comments

Comments
 (0)