diff --git a/.circleci/config.yml b/.circleci/config.yml index 713b160661fd..4a0f262a4eb7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,6 +105,13 @@ commands: - run: name: Install Matplotlib command: python -m pip install --user -ve . + - save_cache: + key: build-deps-1 + paths: + # FreeType 2.6.1 tarball. + - ~/.cache/matplotlib/0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014 + # Qhull 2020.2 tarball. + - ~/.cache/matplotlib/b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e doc-build: steps: diff --git a/setupext.py b/setupext.py index cbac6f76731a..0d85f479d106 100644 --- a/setupext.py +++ b/setupext.py @@ -168,14 +168,16 @@ def get_and_extract_tarball(urls, sha, dirname): '2.10.1': '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110', } -# This is the version of FreeType to use when building a local -# version. It must match the value in -# lib/matplotlib.__init__.py and also needs to be changed below in the -# embedded windows build script (grep for "REMINDER" in this file) +# This is the version of FreeType to use when building a local version. It +# must match the value in lib/matplotlib.__init__.py and also needs to be +# changed below in the embedded windows build script (grep for "REMINDER" in +# this file). Also update the cache path in `.circleci/config.yml`. LOCAL_FREETYPE_VERSION = '2.6.1' LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown') +# Also update the cache path in `.circleci/config.yml`. LOCAL_QHULL_VERSION = '2020.2' +LOCAL_QHULL_HASH = 'b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e' # Matplotlib build options, which can be altered using mplsetup.cfg @@ -688,7 +690,7 @@ def do_custom_build(self, env): toplevel = get_and_extract_tarball( urls=["http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz"], - sha="b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e", + sha=LOCAL_QHULL_HASH, dirname=f"qhull-{LOCAL_QHULL_VERSION}", ) shutil.copyfile(toplevel / "COPYING.txt", "LICENSE/LICENSE_QHULL")