Move {setup,install}_requires from setupext.py to setup.py.

anntzer · anntzer · commit a9875d4ebd03 · 2019-02-28T14:43:33.000+01:00
The Numpy class in setupext.py serves two purposes: declare a
setup_requires and an install_requires on numpy, and provide a
add_flags() (effectively static) method to link extension modules to
numpy.

Instead, we can just merge the setup and install_requires together
with all other install_requires, and move all of them to setup.py
(deleting the machinery to grab setup_requires and install_requires
from multiple places), and make the add_flags() method a free function
(add_numpy_flags()).
diff --git a/setup.py b/setup.py
@@ -58,7 +58,6 @@
     setupext.Matplotlib(),
     setupext.Python(),
     setupext.Platform(),
-    setupext.Numpy(),
     setupext.LibAgg(),
     setupext.FreeType(),
     setupext.FT2Font(),
@@ -176,21 +175,13 @@ def run(self):
     packages = []
     namespace_packages = []
     py_modules = []
-    # Dummy extension to trigger build_ext, which will swap it out with real
-    # extensions that can depend on numpy for the build.
-    ext_modules = [Extension('', [])]
     package_data = {}
-    package_dir = {'': 'lib'}
-    install_requires = []
-    setup_requires = []
 
     # If the user just queries for information, don't bother figuring out which
     # packages to build or install.
-    if (any('--' + opt in sys.argv for opt in
-            Distribution.display_option_names + ['help']) or
-            'clean' in sys.argv):
-        setup_requires = []
-    else:
+    if not (any('--' + opt in sys.argv
+                for opt in [*Distribution.display_option_names, 'help'])
+            or 'clean' in sys.argv):
         # Go through all of the packages and figure out which ones we are
         # going to build/install.
         print_line()
@@ -243,8 +234,6 @@ def run(self):
             for key, val in data.items():
                 package_data.setdefault(key, [])
                 package_data[key] = list(set(val + package_data[key]))
-            install_requires.extend(package.get_install_requires())
-            setup_requires.extend(package.get_setup_requires())
 
         # Write the default matplotlibrc file
         with open('matplotlibrc.template') as fd:
@@ -266,6 +255,7 @@ def run(self):
         author="John D. Hunter, Michael Droettboom",
         author_email="matplotlib-users@python.org",
         url="http://matplotlib.org",
+        download_url="http://matplotlib.org/users/installing.html",
         long_description="""
         Matplotlib strives to produce publication quality 2D graphics
         for interactive graphing, scientific publishing, user interface
@@ -277,16 +267,24 @@ def run(self):
         namespace_packages=namespace_packages,
         platforms='any',
         py_modules=py_modules,
-        ext_modules=ext_modules,
-        package_dir=package_dir,
+        # Dummy extension to trigger build_ext, which will swap it out with
+        # real extensions that can depend on numpy for the build.
+        ext_modules=[Extension("", [])],
+        package_dir={"": "lib"},
         package_data=package_data,
         classifiers=classifiers,
-        download_url="http://matplotlib.org/users/installing.html",
 
         python_requires='>=3.6',
-        # List third-party Python packages that we require
-        install_requires=install_requires,
-        setup_requires=setup_requires,
+        setup_requires=[
+            "numpy>=1.11",
+        ],
+        install_requires=[
+            "cycler>=0.10",
+            "kiwisolver>=1.0.1",
+            "numpy>=1.11",
+            "pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6",
+            "python-dateutil>=2.1",
+        ],
 
         # matplotlib has C/C++ extensions, so it's not zip safe.
         # Telling setuptools this prevents it from doing an automatic
diff --git a/setupext.py b/setupext.py
@@ -507,22 +507,6 @@ def get_extension(self):
         """
         return None
 
-    def get_install_requires(self):
-        """
-        Get a list of Python packages that we require.
-        pip/easy_install will attempt to download and install this
-        package if it is not installed.
-        """
-        return []
-
-    def get_setup_requires(self):
-        """
-        Get a list of Python packages that we require at build time.
-        pip/easy_install will attempt to download and install this
-        package if it is not installed.
-        """
-        return []
-
     def _check_for_pkg_config(self, package, include_file, min_version=None,
                               version=None):
         """
@@ -739,14 +723,6 @@ def get_package_data(self):
             ],
         }
 
-    def get_install_requires(self):
-        return [
-            "cycler>=0.10",
-            "kiwisolver>=1.0.1",
-            "pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6",
-            "python-dateutil>=2.1",
-        ]
-
 
 class SampleData(OptionalPackage):
     """
@@ -788,27 +764,18 @@ def get_package_data(self):
         }
 
 
-class Numpy(SetupPackage):
-    name = "numpy"
-
-    def add_flags(self, ext):
-        import numpy as np
-        ext.include_dirs.append(np.get_include())
-        ext.define_macros.extend([
-            # Ensure that PY_ARRAY_UNIQUE_SYMBOL is uniquely defined for each
-            # extension.
-            ('PY_ARRAY_UNIQUE_SYMBOL',
-             'MPL_' + ext.name.replace('.', '_') + '_ARRAY_API'),
-            ('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION'),
-            # Allow NumPy's printf format specifiers in C++.
-            ('__STDC_FORMAT_MACROS', 1),
-        ])
-
-    def get_setup_requires(self):
-        return ['numpy>=1.11']
-
-    def get_install_requires(self):
-        return ['numpy>=1.11']
+def add_numpy_flags(ext):
+    import numpy as np
+    ext.include_dirs.append(np.get_include())
+    ext.define_macros.extend([
+        # Ensure that PY_ARRAY_UNIQUE_SYMBOL is uniquely defined for each
+        # extension.
+        ('PY_ARRAY_UNIQUE_SYMBOL',
+         'MPL_' + ext.name.replace('.', '_') + '_ARRAY_API'),
+        ('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION'),
+        # Allow NumPy's printf format specifiers in C++.
+        ('__STDC_FORMAT_MACROS', 1),
+    ])
 
 
 class LibAgg(SetupPackage):
@@ -993,7 +960,7 @@ def get_extension(self):
             ]
         ext = make_extension('matplotlib.ft2font', sources)
         FreeType().add_flags(ext)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         LibAgg().add_flags(ext, add_sources=False)
         return ext
 
@@ -1019,7 +986,7 @@ def get_extension(self):
         pkg_config.setup_extension(
             ext, 'libpng', default_libraries=['png', 'z'],
             alt_exec='libpng-config --ldflags')
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         return ext
 
 
@@ -1047,7 +1014,7 @@ def get_extension(self):
             'extern/ttconv/ttutil.cpp'
             ]
         ext = make_extension('matplotlib.ttconv', sources)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         ext.include_dirs.insert(0, 'extern')
         return ext
 
@@ -1062,7 +1029,7 @@ def get_extension(self):
             ]
 
         ext = make_extension('matplotlib._path', sources)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         LibAgg().add_flags(ext)
         return ext
 
@@ -1078,7 +1045,7 @@ def get_extension(self):
             'src/py_converters.cpp'
             ]
         ext = make_extension('matplotlib._image', sources)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         LibAgg().add_flags(ext)
 
         return ext
@@ -1094,7 +1061,7 @@ def get_extension(self):
             'src/py_converters.cpp',
             ]
         ext = make_extension('matplotlib._contour', sources)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         LibAgg().add_flags(ext, add_sources=False)
         return ext
 
@@ -1106,7 +1073,7 @@ def get_extension(self):
         sources = ['src/qhull_wrap.c']
         ext = make_extension('matplotlib._qhull', sources,
                              define_macros=[('MPL_DEVNULL', os.devnull)])
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         Qhull().add_flags(ext)
         return ext
 
@@ -1121,7 +1088,7 @@ def get_extension(self):
             "src/mplutils.cpp"
             ]
         ext = make_extension('matplotlib._tri', sources)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         return ext
 
 
@@ -1137,7 +1104,7 @@ def get_extension(self):
             "src/_backend_agg_wrapper.cpp"
             ]
         ext = make_extension('matplotlib.backends._backend_agg', sources)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         LibAgg().add_flags(ext)
         FreeType().add_flags(ext)
         return ext
@@ -1158,7 +1125,7 @@ def get_extension(self):
 
         ext = make_extension('matplotlib.backends._tkagg', sources)
         self.add_flags(ext)
-        Numpy().add_flags(ext)
+        add_numpy_flags(ext)
         LibAgg().add_flags(ext, add_sources=False)
         return ext
 
