|
22 | 22 |
|
23 | 23 | def _get_xdg_cache_dir():
|
24 | 24 | """
|
25 |
| - Return the XDG cache directory. |
| 25 | + Return the `XDG cache directory`__. |
26 | 26 |
|
27 |
| - See https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html |
| 27 | + __ https://specifications.freedesktop.org/basedir-spec/latest/ |
28 | 28 | """
|
29 | 29 | cache_dir = os.environ.get('XDG_CACHE_HOME')
|
30 | 30 | if not cache_dir:
|
@@ -177,7 +177,8 @@ def get_and_extract_tarball(urls, sha, dirname):
|
177 | 177 |
|
178 | 178 | # Also update the cache path in `.circleci/config.yml`.
|
179 | 179 | LOCAL_QHULL_VERSION = '2020.2'
|
180 |
| -LOCAL_QHULL_HASH = 'b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e' |
| 180 | +LOCAL_QHULL_HASH = ( |
| 181 | + 'b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e') |
181 | 182 |
|
182 | 183 |
|
183 | 184 | # Matplotlib build options, which can be altered using mplsetup.cfg
|
@@ -649,18 +650,19 @@ def do_custom_build(self, env):
|
649 | 650 | 'x64' if platform.architecture()[0] == '64bit' else 'Win32')
|
650 | 651 | base_path = Path("build/freetype-2.6.1/builds/windows")
|
651 | 652 | vc = 'vc2010'
|
652 |
| - sln_path = ( |
653 |
| - base_path / vc / "freetype.sln" |
654 |
| - ) |
| 653 | + sln_path = base_path / vc / "freetype.sln" |
655 | 654 | # https://developercommunity.visualstudio.com/comments/190992/view.html
|
656 |
| - (sln_path.parent / "Directory.Build.props").write_text(""" |
657 |
| -<Project> |
658 |
| - <PropertyGroup> |
659 |
| - <!-- The following line *cannot* be split over multiple lines. --> |
660 |
| - <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> |
661 |
| - </PropertyGroup> |
662 |
| -</Project> |
663 |
| -""") |
| 655 | + (sln_path.parent / "Directory.Build.props").write_text( |
| 656 | + "<Project>" |
| 657 | + "<PropertyGroup>" |
| 658 | + # WindowsTargetPlatformVersion must be given on a single line. |
| 659 | + "<WindowsTargetPlatformVersion>$(" |
| 660 | + "[Microsoft.Build.Utilities.ToolLocationHelper]" |
| 661 | + "::GetLatestSDKTargetPlatformVersion('Windows', '10.0')" |
| 662 | + ")</WindowsTargetPlatformVersion>" |
| 663 | + "</PropertyGroup>" |
| 664 | + "</Project>" |
| 665 | + ) |
664 | 666 | # It is not a trivial task to determine PlatformToolset to plug it
|
665 | 667 | # into msbuild command, and Directory.Build.props will not override
|
666 | 668 | # the value in the project file.
|
@@ -713,7 +715,8 @@ def do_custom_build(self, env):
|
713 | 715 | for ext in self._extensions_to_update:
|
714 | 716 | qhull_path = Path(f'build/qhull-{LOCAL_QHULL_VERSION}/src')
|
715 | 717 | ext.include_dirs.insert(0, str(qhull_path))
|
716 |
| - ext.sources.extend(map(str, sorted(qhull_path.glob('libqhull_r/*.c')))) |
| 718 | + ext.sources.extend( |
| 719 | + map(str, sorted(qhull_path.glob('libqhull_r/*.c')))) |
717 | 720 | if sysconfig.get_config_var("LIBM") == "-lm":
|
718 | 721 | ext.libraries.extend("m")
|
719 | 722 |
|
|
0 commit comments