Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Shorten setupext and remove uninformative build log entries. #13262

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
Feb 7, 2019
Merged

Shorten setupext and remove uninformative build log entries. #13262

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions 2 setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@
setupext.Matplotlib(),
setupext.Python(),
setupext.Platform(),
'Required dependencies and extensions',
setupext.Numpy(),
setupext.InstallRequires(),
setupext.LibAgg(),
setupext.FreeType(),
setupext.FT2Font(),
Expand Down
45 changes: 14 additions & 31 deletions 45 setupext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to match the message width below... for which the change is explained in the commit/PR message.


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))

Expand Down Expand Up @@ -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


Expand Down Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.