From 1222bed88eb29cde43a81dd208448dc903c53de2 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 9 May 2022 00:57:07 +0900 Subject: [PATCH 1/2] Bump version --- CHANGES | 21 +++++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 424a12eaae6..bc32362ae1c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 5.1.0 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 5.0.0 beta2 (in development) ==================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index fff00a85579..3fd1fe0f044 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -21,8 +21,8 @@ warnings.filterwarnings('ignore', 'The frontend.Option class .*', DeprecationWarning, module='docutils.frontend') -__version__ = '5.0.0+' -__released__ = '5.0.0' # used when Sphinx builds its own docs +__version__ = '5.1.0+' +__released__ = '5.1.0' # used when Sphinx builds its own docs #: Version info for better programmatic use. #: @@ -32,7 +32,7 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (5, 0, 0, 'beta', 2) +version_info = (5, 1, 0, 'beta', 0) package_dir = path.abspath(path.dirname(__file__)) From b0ae5480c5b3a2778bf6b9aef428b42c0e6d8ac9 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Tue, 10 May 2022 17:35:00 -0400 Subject: [PATCH 2/2] Epub: Add WebP mime type When building docs with WebP images using the EPUB builder results in this warning: `WARNING: unknown mimetype for _images/.webp, ignoring` This commit fixes this by adding the mapping for webp-files to the correct mime type. --- sphinx/builders/_epub_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sphinx/builders/_epub_base.py b/sphinx/builders/_epub_base.py index 4bb602fe0c4..78d3d89a0ee 100644 --- a/sphinx/builders/_epub_base.py +++ b/sphinx/builders/_epub_base.py @@ -56,6 +56,7 @@ '.xhtml': 'application/xhtml+xml', '.css': 'text/css', '.png': 'image/png', + '.webp': 'image/webp', '.gif': 'image/gif', '.svg': 'image/svg+xml', '.jpg': 'image/jpeg',