Skip to content

FIX: account for deprecations of constant in Pillow 9.1 #22766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 4, 2022
Merged

FIX: account for deprecations of constant in Pillow 9.1 #22766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb99770
FIX: account for constant deprecations in Pillow 9.1
tacaswell Apr 1, 2022
a367714
FIX: leaking temporary files in animation saving
tacaswell Apr 1, 2022
e3fea7e
CI: add pip list to azure pipeline
tacaswell Apr 1, 2022
f930098
STY: fix whitespace
tacaswell Apr 1, 2022
bd6f04b
MNT: shorter version of Pillow API shims
tacaswell Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ stages:
- script: env
displayName: 'print env'

- script: pip list
displayName: 'print pip'

- bash: |
PYTHONFAULTHANDLER=1 python -m pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 ||
[[ "$PYTHON_VERSION" = 'Pre' ]]
Expand Down
18 changes: 10 additions & 8 deletions lib/matplotlib/animation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# * Can blit be enabled for movies?
# * Need to consider event sources to allow clicking through multiple figures


import abc
import base64
import contextlib
Expand Down Expand Up @@ -468,14 +469,15 @@ def grab_frame(self, **savefig_kwargs):
def finish(self):
# Call run here now that all frame grabbing is done. All temp files
# are available to be assembled.
self._run()
super().finish() # Will call clean-up

def _cleanup(self): # Inline to finish() once cleanup() is removed.
super()._cleanup()
if self._tmpdir:
_log.debug('MovieWriter: clearing temporary path=%s', self._tmpdir)
self._tmpdir.cleanup()
try:
self._run()
super().finish()
finally:
if self._tmpdir:
_log.debug(
'MovieWriter: clearing temporary path=%s', self._tmpdir
)
self._tmpdir.cleanup()


@writers.register('pillow')
Expand Down
9 changes: 7 additions & 2 deletions lib/matplotlib/backends/backend_pdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,8 +1700,13 @@ def _writeImg(self, data, id, smask=None):
# Convert to indexed color if there are 256 colors or fewer
# This can significantly reduce the file size
num_colors = len(img_colors)
img = img.convert(mode='P', dither=Image.NONE,
palette=Image.ADAPTIVE, colors=num_colors)
# These constants were converted to IntEnums and deprecated in
# Pillow 9.2
dither = getattr(Image, 'Dither', Image).NONE
pmode = getattr(Image, 'Palette', Image).ADAPTIVE
img = img.convert(
mode='P', dither=dither, palette=pmode, colors=num_colors
)
png_data, bit_depth, palette = self._writePng(img)
if bit_depth is None or palette is None:
raise RuntimeError("invalid PNG header")
Expand Down