Merge pull request #24955 from charris/backport-24923

charris · web-flow · commit 87e17067defd · 2023-10-18T18:56:36.000-06:00
ENH: Add Cython enumeration for NPY_FR_GENERIC
diff --git a/numpy/__init__.cython-30.pxd b/numpy/__init__.cython-30.pxd
@@ -852,6 +852,7 @@ cdef extern from "numpy/arrayscalars.h":
         NPY_FR_ps
         NPY_FR_fs
         NPY_FR_as
+        NPY_FR_GENERIC
 
 
 #
diff --git a/numpy/__init__.pxd b/numpy/__init__.pxd
@@ -810,6 +810,7 @@ cdef extern from "numpy/arrayscalars.h":
         NPY_FR_ps
         NPY_FR_fs
         NPY_FR_as
+        NPY_FR_GENERIC
 
 
 #

Original file line number	Diff line number	Diff line change
`@@ -852,6 +852,7 @@ cdef extern from "numpy/arrayscalars.h":`
`852`	`852`	`NPY_FR_ps`
`853`	`853`	`NPY_FR_fs`
`854`	`854`	`NPY_FR_as`
	`855`	`+ NPY_FR_GENERIC`
`855`	`856`
`856`	`857`
`857`	`858`	`#`
Original file line number	Diff line number	Diff line change
`@@ -810,6 +810,7 @@ cdef extern from "numpy/arrayscalars.h":`
`810`	`810`	`NPY_FR_ps`
`811`	`811`	`NPY_FR_fs`
`812`	`812`	`NPY_FR_as`
	`813`	`+ NPY_FR_GENERIC`
`813`	`814`
`814`	`815`
`815`	`816`	`#`