From d6dc2683a32c56e83f2907ac80f82897760bcb9a Mon Sep 17 00:00:00 2001 From: Etienne Pot Date: Tue, 28 May 2024 07:36:08 -0700 Subject: [PATCH] Fix ipynb FUTURE_COPYBARA_INTEGRATE_REVIEW=https://github.com/google/mediapy/pull/43 from hhoppe:main 58b8a07206903584e20516a858af4ff3fbac4a75 PiperOrigin-RevId: 637894612 --- mediapy/__init__.py | 29 +- mediapy/mediapy_examples.py | 328 +++++++++ mediapy_examples.ipynb | 1271 +++++++++++++++++++++++------------ mediapy_test.py | 93 ++- pyproject.toml | 7 + 5 files changed, 1241 insertions(+), 487 deletions(-) create mode 100644 mediapy/mediapy_examples.py diff --git a/mediapy/__init__.py b/mediapy/__init__.py index afbbf0b..94c0191 100644 --- a/mediapy/__init__.py +++ b/mediapy/__init__.py @@ -104,7 +104,7 @@ from __future__ import annotations __docformat__ = 'google' -__version__ = '1.2.0' +__version__ = '1.2.1' __version_info__ = tuple(int(num) for num in __version__.split('.')) import base64 @@ -116,6 +116,7 @@ import itertools import math import numbers +import os # Package only needed for typing.TYPE_CHECKING. import pathlib import re import shlex @@ -134,11 +135,9 @@ import PIL.Image import PIL.ImageOps -if typing.TYPE_CHECKING: - import os # pylint: disable=g-bad-import-order if not hasattr(PIL.Image, 'Resampling'): # Allow Pillow<9.0. - PIL.Image.Resampling = PIL.Image + PIL.Image.Resampling = PIL.Image # type: ignore # Selected and reordered here for pdoc documentation. __all__ = [ @@ -189,7 +188,7 @@ _IPYTHON_HTML_SIZE_LIMIT = 20_000_000 _T = typing.TypeVar('_T') -_Path = typing.Union[str, 'os.PathLike[str]'] +_Path = typing.Union[str, os.PathLike[str]] _IMAGE_COMPARISON_HTML = """\