Skip to content

More shortening of setup.py prints. #14673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2019
Merged

More shortening of setup.py prints. #14673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@
__version__ = versioneer.get_version()


# These are the packages in the order we want to display them. This
# list may contain strings to create section headers for the display.
# These are the packages in the order we want to display them.
mpl_packages = [
'Building Matplotlib',
setupext.Matplotlib(),
setupext.Python(),
setupext.Platform(),
Expand All @@ -67,10 +65,8 @@
setupext.Contour(),
setupext.QhullWrap(),
setupext.Tri(),
'Optional subpackages',
setupext.SampleData(),
setupext.Tests(),
'Optional backend extensions',
setupext.BackendAgg(),
setupext.BackendTkAgg(),
setupext.BackendMacOSX(),
Expand Down Expand Up @@ -178,29 +174,23 @@ def run(self):
print_raw()
print_raw("Edit setup.cfg to change the build options; "
"suppress output with --quiet.")
print_raw()
print_raw("BUILDING MATPLOTLIB")

good_packages = []
for package in mpl_packages:
if isinstance(package, str):
print_raw('')
print_raw(package.upper())
try:
result = package.check()
if result is not None:
print_status(package.name, 'yes [%s]' % result)
except setupext.CheckFailed as e:
print_status(package.name, 'no [%s]' % str(e))
if not package.optional:
sys.exit("Failed to build %s" % package.name)
else:
try:
result = package.check()
if result is not None:
message = 'yes [%s]' % result
print_status(package.name, message)
except setupext.CheckFailed as e:
msg = str(e).strip()
if len(msg):
print_status(package.name, 'no [%s]' % msg)
else:
print_status(package.name, 'no')
if not package.optional:
sys.exit("Failed to build %s" % package.name)
else:
good_packages.append(package)
print_raw('')
good_packages.append(package)

print_raw()

# Now collect all of the information we need to build all of the
# packages.
Expand Down