Merge f2py part with numpy

3 files changed, 35 insertions, 51 deletions

diff --git a/contrib/python/numpy/py3/numpy/f2py/ya.make b/contrib/python/numpy/py3/numpy/f2py/ya.make
deleted file mode 100644
index 13d0c761af..0000000000
--- a/contrib/python/numpy/py3/numpy/f2py/ya.make
+++ /dev/null
@@ -1,36 +0,0 @@
-PY3_PROGRAM()
-
-LICENSE(BSD-3-Clause)
-
-PEERDIR(
-    contrib/python/numpy
-)
-
-PY_SRCS(
-    NAMESPACE numpy.f2py
-    __init__.py
-    __main__.py
-    __version__.py
-    _backends/__init__.py
-    _backends/_backend.py
-    _backends/_distutils.py
-    _backends/_meson.py
-    _isocbind.py
-    auxfuncs.py
-    capi_maps.py
-    cb_rules.py
-    cfuncs.py
-    common_rules.py
-    crackfortran.py
-    diagnose.py
-    f2py2e.py
-    f90mod_rules.py
-    func2subr.py
-    rules.py
-    symbolic.py
-    use_rules.py
-)
-
-NO_LINT()
-
-END()
diff --git a/contrib/python/numpy/py3/numpy/tests/test_public_api.py b/contrib/python/numpy/py3/numpy/tests/test_public_api.py
index 522a240fbf..79d05407e5 100644
--- a/contrib/python/numpy/py3/numpy/tests/test_public_api.py
+++ b/contrib/python/numpy/py3/numpy/tests/test_public_api.py
@@ -134,7 +134,7 @@ PUBLIC_MODULES = ['numpy.' + s for s in [
     "doc.ufuncs",
     "dtypes",
     "exceptions",
-    #"f2py",
+    "f2py",
     "fft",
     "lib",
     "lib.format",  # was this meant to be public?
@@ -201,19 +201,19 @@ PRIVATE_BUT_PRESENT_MODULES = ['numpy.' + s for s in [
     "core.records",
     "core.shape_base",
     "core.umath",
-    #"f2py.auxfuncs",
-    #"f2py.capi_maps",
-    #"f2py.cb_rules",
-    #"f2py.cfuncs",
-    #"f2py.common_rules",
-    #"f2py.crackfortran",
-    #"f2py.diagnose",
-    #"f2py.f2py2e",
-    #"f2py.f90mod_rules",
-    #"f2py.func2subr",
-    #"f2py.rules",
-    #"f2py.symbolic",
-    #"f2py.use_rules",
+    "f2py.auxfuncs",
+    "f2py.capi_maps",
+    "f2py.cb_rules",
+    "f2py.cfuncs",
+    "f2py.common_rules",
+    "f2py.crackfortran",
+    "f2py.diagnose",
+    "f2py.f2py2e",
+    "f2py.f90mod_rules",
+    "f2py.func2subr",
+    "f2py.rules",
+    "f2py.symbolic",
+    "f2py.use_rules",
     "fft.helper",
     "lib.arraypad",
     "lib.arraysetops",
diff --git a/contrib/python/numpy/py3/ya.make b/contrib/python/numpy/py3/ya.make
index 2eb36a5912..c6b2f9cd4a 100644
--- a/contrib/python/numpy/py3/ya.make
+++ b/contrib/python/numpy/py3/ya.make
@@ -231,6 +231,27 @@ PY_SRCS(
     numpy/dtypes.pyi
     numpy/exceptions.py
     numpy/exceptions.pyi
+    numpy/f2py/__init__.py
+    numpy/f2py/__main__.py
+    numpy/f2py/__version__.py
+    numpy/f2py/_backends/__init__.py
+    numpy/f2py/_backends/_backend.py
+    numpy/f2py/_backends/_distutils.py
+    numpy/f2py/_backends/_meson.py
+    numpy/f2py/_isocbind.py
+    numpy/f2py/auxfuncs.py
+    numpy/f2py/capi_maps.py
+    numpy/f2py/cb_rules.py
+    numpy/f2py/cfuncs.py
+    numpy/f2py/common_rules.py
+    numpy/f2py/crackfortran.py
+    numpy/f2py/diagnose.py
+    numpy/f2py/f2py2e.py
+    numpy/f2py/f90mod_rules.py
+    numpy/f2py/func2subr.py
+    numpy/f2py/rules.py
+    numpy/f2py/symbolic.py
+    numpy/f2py/use_rules.py
     numpy/fft/__init__.py
     numpy/fft/__init__.pyi
     numpy/fft/_pocketfft.py
@@ -545,7 +566,6 @@ RESOURCE_FILES(
 END()
 
 RECURSE(
-    numpy/f2py
     numpy/random
 )