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 44803e1

Browse filesBrowse files
authored
Merge pull request #14583 from anntzer/setupextstyle
Fix overly long lines in setupext.
2 parents e565d7d + 9de7936 commit 44803e1
Copy full SHA for 44803e1

File tree

Expand file treeCollapse file tree

2 files changed

+25
-15
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+25
-15
lines changed

‎.flake8

Copy file name to clipboardExpand all lines: .flake8
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ exclude =
2828

2929
per-file-ignores =
3030
setup.py: E402
31-
setupext.py: E501
3231

3332
tools/subset.py: E221, E251, E261, E302, E501
3433

‎setupext.py

Copy file name to clipboardExpand all lines: setupext.py
+25-14Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,24 @@ def write_cache(local_fn, data):
123123

124124
# SHA256 hashes of the FreeType tarballs
125125
_freetype_hashes = {
126-
'2.6.1': '0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014',
127-
'2.6.2': '8da42fc4904e600be4b692555ae1dcbf532897da9c5b9fb5ebd3758c77e5c2d4',
128-
'2.6.3': '7942096c40ee6fea882bd4207667ad3f24bff568b96b10fd3885e11a7baad9a3',
129-
'2.6.4': '27f0e38347a1850ad57f84fc4dfed68ba0bc30c96a6fa6138ef84d485dd9a8d7',
130-
'2.6.5': '3bb24add9b9ec53636a63ea8e867ed978c4f8fdd8f1fa5ccfd41171163d4249a',
131-
'2.7': '7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4',
132-
'2.7.1': '162ef25aa64480b1189cdb261228e6c5c44f212aac4b4621e28cf2157efb59f5',
133-
'2.8': '33a28fabac471891d0523033e99c0005b95e5618dc8ffa7fa47f9dadcacb1c9b',
134-
'2.8.1': '876711d064a6a1bd74beb18dd37f219af26100f72daaebd2d86cb493d7cd7ec6',
126+
'2.6.1':
127+
'0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014',
128+
'2.6.2':
129+
'8da42fc4904e600be4b692555ae1dcbf532897da9c5b9fb5ebd3758c77e5c2d4',
130+
'2.6.3':
131+
'7942096c40ee6fea882bd4207667ad3f24bff568b96b10fd3885e11a7baad9a3',
132+
'2.6.4':
133+
'27f0e38347a1850ad57f84fc4dfed68ba0bc30c96a6fa6138ef84d485dd9a8d7',
134+
'2.6.5':
135+
'3bb24add9b9ec53636a63ea8e867ed978c4f8fdd8f1fa5ccfd41171163d4249a',
136+
'2.7':
137+
'7b657d5f872b0ab56461f3bd310bd1c5ec64619bd15f0d8e08282d494d9cfea4',
138+
'2.7.1':
139+
'162ef25aa64480b1189cdb261228e6c5c44f212aac4b4621e28cf2157efb59f5',
140+
'2.8':
141+
'33a28fabac471891d0523033e99c0005b95e5618dc8ffa7fa47f9dadcacb1c9b',
142+
'2.8.1':
143+
'876711d064a6a1bd74beb18dd37f219af26100f72daaebd2d86cb493d7cd7ec6',
135144
}
136145
# This is the version of FreeType to use when building a local
137146
# version. It must match the value in
@@ -208,9 +217,10 @@ def get_pkg_config():
208217
return None
209218
pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
210219
if shutil.which(pkg_config) is None:
211-
print("IMPORTANT WARNING:\n"
212-
" pkg-config is not installed.\n"
213-
" matplotlib may not be able to find some of its dependencies.")
220+
print(
221+
"IMPORTANT WARNING:\n"
222+
" pkg-config is not installed.\n"
223+
" Matplotlib may not be able to find some of its dependencies.")
214224
return None
215225
pkg_config_path = sysconfig.get_config_var('LIBDIR')
216226
if pkg_config_path is not None:
@@ -327,7 +337,8 @@ def get_config(cls):
327337
insensitively defined as 0, false, no, off for False).
328338
"""
329339
conf = cls.default_config
330-
if config is not None and config.has_option(cls.config_category, cls.name):
340+
if (config is not None
341+
and config.has_option(cls.config_category, cls.name)):
331342
try:
332343
conf = config.getboolean(cls.config_category, cls.name)
333344
except ValueError:
@@ -586,7 +597,7 @@ def do_custom_build(self):
586597
/t:Clean;Build /p:Configuration="Release";Platform={WinXX}
587598
"""
588599
import distutils.msvc9compiler as msvc
589-
# Note: freetype has no build profile for 2014, so we don't bother...
600+
# FreeType has no build profile for 2014, so we don't bother.
590601
vc = 'vc2010'
591602
WinXX = 'x64' if platform.architecture()[0] == '64bit' else 'Win32'
592603
xXX = 'x64' if platform.architecture()[0] == '64bit' else 'x86'

0 commit comments

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