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

Commit c072f88

Browse filesBrowse files
authored
Merge pull request #13262 from anntzer/less-setupext
Shorten setupext and remove uninformative build log entries.
2 parents e1d6dbe + daf76bb commit c072f88
Copy full SHA for c072f88

File tree

Expand file treeCollapse file tree

2 files changed

+14
-33
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+14
-33
lines changed

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@
4848
setupext.Matplotlib(),
4949
setupext.Python(),
5050
setupext.Platform(),
51-
'Required dependencies and extensions',
5251
setupext.Numpy(),
53-
setupext.InstallRequires(),
5452
setupext.LibAgg(),
5553
setupext.FreeType(),
5654
setupext.FT2Font(),

‎setupext.py

Copy file name to clipboardExpand all lines: setupext.py
+14-31Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -167,18 +167,18 @@ def is_min_version(found, minversion):
167167
# Define the display functions only if display_status is True.
168168
if options['display_status']:
169169
def print_line(char='='):
170-
print(char * 79)
170+
print(char * 80)
171171

172172
def print_status(package, status):
173-
initial_indent = "%18s: " % package
174-
indent = ' ' * 24
175-
print(textwrap.fill(str(status), width=79,
173+
initial_indent = "%12s: " % package
174+
indent = ' ' * 18
175+
print(textwrap.fill(str(status), width=80,
176176
initial_indent=initial_indent,
177177
subsequent_indent=indent))
178178

179179
def print_message(message):
180-
indent = ' ' * 24 + "* "
181-
print(textwrap.fill(str(message), width=79,
180+
indent = ' ' * 18 + "* "
181+
print(textwrap.fill(str(message), width=80,
182182
initial_indent=indent,
183183
subsequent_indent=indent))
184184

@@ -593,16 +593,6 @@ class Python(SetupPackage):
593593
name = "python"
594594

595595
def check(self):
596-
if sys.version_info < (3, 5):
597-
error = """
598-
Matplotlib 3.0+ does not support Python 2.x, 3.0, 3.1, 3.2, 3.3, or 3.4.
599-
Beginning with Matplotlib 3.0, Python 3.5 and above is required.
600-
601-
This may be due to an out of date pip.
602-
603-
Make sure you have pip >= 9.0.1.
604-
"""
605-
raise CheckFailed(error)
606596
return sys.version
607597

608598

@@ -638,6 +628,14 @@ def get_package_data(self):
638628
],
639629
}
640630

631+
def get_install_requires(self):
632+
return [
633+
"cycler>=0.10",
634+
"kiwisolver>=1.0.1",
635+
"pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6",
636+
"python-dateutil>=2.1",
637+
]
638+
641639

642640
class SampleData(OptionalPackage):
643641
"""
@@ -1107,21 +1105,6 @@ def get_extension(self):
11071105
return ext
11081106

11091107

1110-
class InstallRequires(SetupPackage):
1111-
name = "install_requires"
1112-
1113-
def check(self):
1114-
return "handled by setuptools"
1115-
1116-
def get_install_requires(self):
1117-
return [
1118-
"cycler>=0.10",
1119-
"kiwisolver>=1.0.1",
1120-
"pyparsing>=2.0.1,!=2.0.4,!=2.1.2,!=2.1.6",
1121-
"python-dateutil>=2.1",
1122-
]
1123-
1124-
11251108
class BackendAgg(OptionalBackendPackage):
11261109
name = "agg"
11271110
force = True

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.