Skip to content

Commit

Permalink
Remove workarounds for matplotlib font cache
Browse files Browse the repository at this point in the history
  • Loading branch information
tkittel committed Feb 21, 2024
1 parent 40d46c6 commit ed0ac49
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 26 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/basictest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ jobs:
run: |
python3 -m pip install numpy ncrystal matplotlib
nctool --test
python3 -c 'import numpy'
python3 -c 'import matplotlib'
python3 -c 'import matplotlib.pyplot'
#NB: import matplotlib.pyplot is also to ensure the font cache is
#triggered, so we don't get output in the middle of our unit tests
#later..
- name: Build-and-test-release
run: |
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/condatest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@ jobs:
python3 -m pip install --no-deps ./src_co
echo "sb --version: "$(sb --version)
- name: Prepare matplotlib
run: |
set -eux
python3 -c 'import matplotlib'
#Trigger fontlib cache (so we don't get output in the middle of our
#unit tests later):
python3 -c 'import matplotlib.pyplot'
- name: Build and test Core only
id: build-and-test-core-only
run: |
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/condatest_essdgproj.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ jobs:
#For dev work: python3 -m pip install --no-deps ./src_co
python3 -m pip install --no-deps ./src_co
echo "sb --version: "$(sb --version)
python3 -c 'import matplotlib'
python3 -c 'import matplotlib.pyplot'
#NB: import matplotlib.pyplot is also to ensure the font cache is
#triggered, so we don't get output in the middle of our unit tests
#later..
- name: Build and test release mode
id: build-and-test-release-mode
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/test-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@ jobs:
run: conda env update --name simplebuild_dgcode --file ./.github/resources/conda-setup_extra_for_docs.yml

- name: Install self
run: |
python3 -mpip install .
python3 -c 'import matplotlib'
python3 -c 'import matplotlib.pyplot'
#NB: import matplotlib.pyplot is also to ensure the font cache is
#triggered, so we don't get output in the middle of our unit tests
#later..
run: python3 -mpip install .

- name: Build documentation
#NB: -W to turn warnings into errors:
Expand Down
4 changes: 4 additions & 0 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,10 @@ def _snip_sbverify():
' NOT SHOWN HERE >>\n<<\n' )
fileout.write_text(edit)

#Trigger matplotlib font cache early, so we don't have that confusing output in
#the examples on the website:
import matplotlib.pyplot

run_tricorder_cmds()
generate_sbverify()
_snip_sbverify()

0 comments on commit ed0ac49

Please sign in to comment.