From 1c7ccf92cfb0a320aa6acaba9e3b15e8849e5048 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 6 Dec 2023 20:40:49 +0200 Subject: [PATCH] Ruff autofix after Black --preview --- winbuild/build_prepare.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 824a22c1606..a617d0e8e7c 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -117,7 +117,7 @@ def cmd_msbuild( "patch": { r"CMakeLists.txt": { # libjpeg-turbo does not detect MSVC x86_arm64 cross-compiler correctly - 'if(MSVC_IDE AND CMAKE_GENERATOR_PLATFORM MATCHES "arm64")': ( # noqa: E501 + 'if(MSVC_IDE AND CMAKE_GENERATOR_PLATFORM MATCHES "arm64")': ( "if({architecture} STREQUAL ARM64)" ), }, @@ -195,19 +195,19 @@ def cmd_msbuild( "patch": { r"libtiff\tif_lzma.c": { # link against liblzma.lib - "#ifdef LZMA_SUPPORT": ( # noqa: E501 + "#ifdef LZMA_SUPPORT": ( '#ifdef LZMA_SUPPORT\n#pragma comment(lib, "liblzma.lib")' ), }, r"libtiff\tif_webp.c": { # link against webp.lib - "#ifdef WEBP_SUPPORT": ( # noqa: E501 + "#ifdef WEBP_SUPPORT": ( '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "webp.lib")' ), }, r"test\CMakeLists.txt": { "add_executable(test_write_read_tags ../placeholder.h)": "", - "target_sources(test_write_read_tags PRIVATE test_write_read_tags.c)": ( # noqa: E501 + "target_sources(test_write_read_tags PRIVATE test_write_read_tags.c)": ( "" ), "target_link_libraries(test_write_read_tags PRIVATE tiff)": "", @@ -257,11 +257,11 @@ def cmd_msbuild( "patch": { r"builds\windows\vc2010\freetype.vcxproj": { # freetype setting is /MD for .dll and /MT for .lib, we need /MD - "MultiThreaded": ( # noqa: E501 + "MultiThreaded": ( "MultiThreadedDLL" ), # freetype doesn't specify SDK version, MSBuild may guess incorrectly - '': ( # noqa: E501 + '': ( '\n ' " $(WindowsSDKVersion)" ), @@ -269,14 +269,14 @@ def cmd_msbuild( r"builds\windows\vc2010\freetype.user.props": { "": "FT_CONFIG_OPTION_SYSTEM_ZLIB;FT_CONFIG_OPTION_USE_PNG;FT_CONFIG_OPTION_USE_HARFBUZZ;FT_CONFIG_OPTION_USE_BROTLI", # noqa: E501 "": r"{dir_harfbuzz}\src;{inc_dir}", # noqa: E501 - "": ( # noqa: E501 + "": ( "{lib_dir}" ), "": "zlib.lib;libpng16.lib;brotlicommon.lib;brotlidec.lib", # noqa: E501 }, r"src/autofit/afshaper.c": { # link against harfbuzz.lib - "#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ": ( # noqa: E501 + "#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ": ( "#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ\n#pragma comment(lib," ' "harfbuzz.lib")' ), @@ -302,11 +302,11 @@ def cmd_msbuild( "patch": { r"Projects\VC2022\lcms2_static\lcms2_static.vcxproj": { # default is /MD for x86 and /MT for x64, we need /MD always - "MultiThreaded": ( # noqa: E501 + "MultiThreaded": ( "MultiThreadedDLL" ), # retarget to default toolset (selected by vcvarsall.bat) - "v143": ( # noqa: E501 + "v143": ( "$(DefaultPlatformToolset)" ), # retarget to latest (selected by vcvarsall.bat) @@ -331,7 +331,7 @@ def cmd_msbuild( "license": "LICENSE", "patch": { r"src\lib\openjp2\ht_dec.c": { - "#ifdef OPJ_COMPILER_MSVC\n return (OPJ_UINT32)__popcnt(val);": ( # noqa: E501 + "#ifdef OPJ_COMPILER_MSVC\n return (OPJ_UINT32)__popcnt(val);": ( "#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) ||" " defined(_M_AMD64))\n return (OPJ_UINT32)__popcnt(val);" ), @@ -357,7 +357,7 @@ def cmd_msbuild( "if(OPENMP_FOUND)": "if(false)", "install": "#install", # libimagequant does not detect MSVC x86_arm64 cross-compiler correctly - "if(${{CMAKE_SYSTEM_PROCESSOR}} STREQUAL ARM64)": ( # noqa: E501 + "if(${{CMAKE_SYSTEM_PROCESSOR}} STREQUAL ARM64)": ( "if({architecture} STREQUAL ARM64)" ), }