summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2020-11-03 09:20:31 -0700
committerGitHub <noreply@github.com>2020-11-03 09:20:31 -0700
commit8b15e57718042c75af22a25a7d604fa0f938f16e (patch)
tree0595ce56ac5659b47faef356664d012690ac73ec
parentd62b0ee88b20e5946fe49f0ba533b3e547e4d4f1 (diff)
parent66b17fbc9666b150c71bb94f2492fd880b2641e4 (diff)
downloadnumpy-8b15e57718042c75af22a25a7d604fa0f938f16e.tar.gz
Merge pull request #17701 from BvB93/pyi
BUG: Fixed an issue where `.pyi` files were ignored by numpy sub-packages
-rw-r--r--numpy/distutils/setup.py1
-rw-r--r--numpy/f2py/setup.py1
-rw-r--r--numpy/fft/setup.py1
-rw-r--r--numpy/lib/setup.py1
-rw-r--r--numpy/linalg/setup.py1
-rw-r--r--numpy/ma/setup.py1
-rw-r--r--numpy/matrixlib/setup.py1
-rw-r--r--numpy/polynomial/setup.py1
-rw-r--r--numpy/random/setup.py1
-rwxr-xr-xnumpy/testing/setup.py1
-rw-r--r--numpy/typing/setup.py1
-rw-r--r--numpy/typing/tests/test_isfile.py34
12 files changed, 45 insertions, 0 deletions
diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py
index 798c3686f..522756fc9 100644
--- a/numpy/distutils/setup.py
+++ b/numpy/distutils/setup.py
@@ -8,6 +8,7 @@ def configuration(parent_package='',top_path=None):
config.add_data_files('site.cfg')
config.add_data_files('mingw/gfortran_vs2003_hack.c')
config.add_data_dir('checks')
+ config.add_data_files('*.pyi')
config.make_config_py()
return config
diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py
index 80b47e527..0a35db477 100644
--- a/numpy/f2py/setup.py
+++ b/numpy/f2py/setup.py
@@ -30,6 +30,7 @@ def configuration(parent_package='', top_path=None):
config.add_data_files(
'src/fortranobject.c',
'src/fortranobject.h')
+ config.add_data_files('*.pyi')
return config
diff --git a/numpy/fft/setup.py b/numpy/fft/setup.py
index 9ed824e4f..477948a09 100644
--- a/numpy/fft/setup.py
+++ b/numpy/fft/setup.py
@@ -14,6 +14,7 @@ def configuration(parent_package='',top_path=None):
define_macros=defs,
)
+ config.add_data_files('*.pyi')
return config
if __name__ == '__main__':
diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py
index b3f441f38..7520b72d7 100644
--- a/numpy/lib/setup.py
+++ b/numpy/lib/setup.py
@@ -4,6 +4,7 @@ def configuration(parent_package='',top_path=None):
config = Configuration('lib', parent_package, top_path)
config.add_subpackage('tests')
config.add_data_dir('tests/data')
+ config.add_data_files('*.pyi')
return config
if __name__ == '__main__':
diff --git a/numpy/linalg/setup.py b/numpy/linalg/setup.py
index bb070ed9d..5c9f2a4cb 100644
--- a/numpy/linalg/setup.py
+++ b/numpy/linalg/setup.py
@@ -80,6 +80,7 @@ def configuration(parent_package='', top_path=None):
extra_info=lapack_info,
libraries=['npymath'],
)
+ config.add_data_files('*.pyi')
return config
if __name__ == '__main__':
diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py
index d3f34c874..018d38cdd 100644
--- a/numpy/ma/setup.py
+++ b/numpy/ma/setup.py
@@ -3,6 +3,7 @@ def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('ma', parent_package, top_path)
config.add_subpackage('tests')
+ config.add_data_files('*.pyi')
return config
if __name__ == "__main__":
diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py
index 19b3bb2de..4fed75de1 100644
--- a/numpy/matrixlib/setup.py
+++ b/numpy/matrixlib/setup.py
@@ -3,6 +3,7 @@ def configuration(parent_package='', top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('matrixlib', parent_package, top_path)
config.add_subpackage('tests')
+ config.add_data_files('*.pyi')
return config
if __name__ == "__main__":
diff --git a/numpy/polynomial/setup.py b/numpy/polynomial/setup.py
index 641464518..b58e867a1 100644
--- a/numpy/polynomial/setup.py
+++ b/numpy/polynomial/setup.py
@@ -2,6 +2,7 @@ def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('polynomial', parent_package, top_path)
config.add_subpackage('tests')
+ config.add_data_files('*.pyi')
return config
if __name__ == '__main__':
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index 88ddb1268..bfd08e469 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -137,6 +137,7 @@ def configuration(parent_package='', top_path=None):
define_macros=defs + LEGACY_DEFS,
)
config.add_data_files(*depends)
+ config.add_data_files('*.pyi')
return config
diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py
index 13191f13f..7652a94a2 100755
--- a/numpy/testing/setup.py
+++ b/numpy/testing/setup.py
@@ -6,6 +6,7 @@ def configuration(parent_package='',top_path=None):
config.add_subpackage('_private')
config.add_subpackage('tests')
+ config.add_data_files('*.pyi')
return config
if __name__ == '__main__':
diff --git a/numpy/typing/setup.py b/numpy/typing/setup.py
index c444e769f..694a756dc 100644
--- a/numpy/typing/setup.py
+++ b/numpy/typing/setup.py
@@ -3,6 +3,7 @@ def configuration(parent_package='', top_path=None):
config = Configuration('typing', parent_package, top_path)
config.add_subpackage('tests')
config.add_data_dir('tests/data')
+ config.add_data_files('*.pyi')
return config
diff --git a/numpy/typing/tests/test_isfile.py b/numpy/typing/tests/test_isfile.py
new file mode 100644
index 000000000..e6b80f995
--- /dev/null
+++ b/numpy/typing/tests/test_isfile.py
@@ -0,0 +1,34 @@
+import os
+from pathlib import Path
+
+import numpy as np
+from numpy.testing import assert_
+
+ROOT = Path(np.__file__).parents[0]
+FILES = [
+ ROOT / "py.typed",
+ ROOT / "__init__.pyi",
+ ROOT / "char.pyi",
+ ROOT / "ctypeslib.pyi",
+ ROOT / "emath.pyi",
+ ROOT / "rec.pyi",
+ ROOT / "version.pyi",
+ ROOT / "core" / "__init__.pyi",
+ ROOT / "distutils" / "__init__.pyi",
+ ROOT / "f2py" / "__init__.pyi",
+ ROOT / "fft" / "__init__.pyi",
+ ROOT / "lib" / "__init__.pyi",
+ ROOT / "linalg" / "__init__.pyi",
+ ROOT / "ma" / "__init__.pyi",
+ ROOT / "matrixlib" / "__init__.pyi",
+ ROOT / "polynomial" / "__init__.pyi",
+ ROOT / "random" / "__init__.pyi",
+ ROOT / "testing" / "__init__.pyi",
+]
+
+
+class TestIsFile:
+ def test_isfile(self):
+ """Test if all ``.pyi`` files are properly installed."""
+ for file in FILES:
+ assert_(os.path.isfile(file))