Merge pull request #13262 from anntzer/less-setupext

jklymak · web-flow · commit c072f8893134 · 2019-02-07T09:23:26.000-08:00
Shorten setupext and remove uninformative build log entries.
diff --git a/setup.py b/setup.py
@@ -48,9 +48,7 @@
     setupext.Matplotlib(),
     setupext.Python(),
     setupext.Platform(),
-    'Required dependencies and extensions',
     setupext.Numpy(),
-    setupext.InstallRequires(),
     setupext.LibAgg(),
     setupext.FreeType(),
     setupext.FT2Font(),
diff --git a/setupext.py b/setupext.py
@@ -167,18 +167,18 @@ def is_min_version(found, minversion):
 # Define the display functions only if display_status is True.
 if options['display_status']:
     def print_line(char='='):
-        print(char * 79)
+        print(char * 80)
 
     def print_status(package, status):
-        initial_indent = "%18s: " % package
-        indent = ' ' * 24
-        print(textwrap.fill(str(status), width=79,
+        initial_indent = "%12s: " % package
+        indent = ' ' * 18
+        print(textwrap.fill(str(status), width=80,
                             initial_indent=initial_indent,
                             subsequent_indent=indent))
 
     def print_message(message):
-        indent = ' ' * 24 + "* "
-        print(textwrap.fill(str(message), width=79,
+        indent = ' ' * 18 + "* "
+        print(textwrap.fill(str(message), width=80,
                             initial_indent=indent,
                             subsequent_indent=indent))
 
@@ -593,16 +593,6 @@ class Python(SetupPackage):
     name = "python"
 
     def check(self):
-        if sys.version_info < (3, 5):
-            error = """
-Matplotlib 3.0+ does not support Python 2.x, 3.0, 3.1, 3.2, 3.3, or 3.4.
-Beginning with Matplotlib 3.0, Python 3.5 and above is required.
-
-This may be due to an out of date pip.
-
-Make sure you have pip >= 9.0.1.
-"""
-            raise CheckFailed(error)
         return sys.version
 
 
@@ -638,6 +628,14 @@ 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):
     """
@@ -1107,21 +1105,6 @@ def get_extension(self):
         return ext
 
 
-class InstallRequires(SetupPackage):
-    name = "install_requires"
-
-    def check(self):
-        return "handled by setuptools"
-
-    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 BackendAgg(OptionalBackendPackage):
     name = "agg"
     force = True
