diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-10 17:15:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-11 08:13:54 +0000 |
| commit | ffb28b99303a7ba68d249c5da0e74587058dcde5 (patch) | |
| tree | 8c9eb3d5d33e692e54e57e575849be419d1236c9 | |
| parent | 2d1aee85958c7a3ea7e322c06f882185e40aa1ac (diff) | |
cmake scripts: format with black
There is agreement to use black for formatting, run it and make flake8
happy with its output.
Change-Id: I800d764a50cacba0eac1d8efb5c1dee0cf10a4ad
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | util/cmake/Makefile | 8 | ||||
| -rw-r--r-- | util/cmake/helper.py | 15 | ||||
| -rw-r--r-- | util/cmake/requirements.txt | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/util/cmake/Makefile b/util/cmake/Makefile index 67affa0e95..2243ad111e 100644 --- a/util/cmake/Makefile +++ b/util/cmake/Makefile @@ -1,9 +1,15 @@ -test: flake8 mypy pytest +test: flake8 mypy pytest black_format_check coverage: pytest --cov . +format: + black *.py --line-length 100 + +black_format_check: + black *.py --line-length 100 --check + flake8: flake8 *.py --ignore=E501,E266,E203,W503 diff --git a/util/cmake/helper.py b/util/cmake/helper.py index b6cfb33860..ed044755b6 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -281,7 +281,9 @@ _qt_library_map = [ ), LibraryMapping("quickwidgets", "Qt6", "Qt::QuickWidgets", extra=["COMPONENTS", "QuickWidgets"]), LibraryMapping("render", "Qt6", "Qt::3DRender", extra=["COMPONENTS", "3DRender"]), - LibraryMapping("remoteobjects", "Qt6", "Qt::RemoteObjects", extra=["COMPONENTS", "RemoteObjects"]), + LibraryMapping( + "remoteobjects", "Qt6", "Qt::RemoteObjects", extra=["COMPONENTS", "RemoteObjects"] + ), LibraryMapping("script", "Qt6", "Qt::Script", extra=["COMPONENTS", "Script"]), LibraryMapping("scripttools", "Qt6", "Qt::ScriptTools", extra=["COMPONENTS", "ScriptTools"]), LibraryMapping("scxml", "Qt6", "Qt::Scxml", extra=["COMPONENTS", "Scxml"]), @@ -312,7 +314,10 @@ _qt_library_map = [ "waylandclient", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"] ), LibraryMapping( - "waylandcompositor", "Qt6", "Qt::WaylandCompositor", extra=["COMPONENTS", "WaylandCompositor"] + "waylandcompositor", + "Qt6", + "Qt::WaylandCompositor", + extra=["COMPONENTS", "WaylandCompositor"], ), LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", extra=["COMPONENTS", "WebChannel"]), LibraryMapping("webengine", "Qt6", "Qt::WebEngine", extra=["COMPONENTS", "WebEngine"]), @@ -417,7 +422,9 @@ _library_map = [ LibraryMapping("wayland-client", "Wayland", "Wayland::Client"), LibraryMapping("wayland-cursor", "Wayland", "Wayland::Cursor"), LibraryMapping("wayland-egl", "Wayland", "Wayland::Egl"), - LibraryMapping('wayland-kms', 'Waylandkms', 'PkgConfig::Waylandkms'), # TODO: check if this actually works + LibraryMapping( + "wayland-kms", "Waylandkms", "PkgConfig::Waylandkms" + ), # TODO: check if this actually works LibraryMapping("x11", "X11", "X11::X11"), LibraryMapping("x11sm", "X11", "${X11_SM_LIB} ${X11_ICE_LIB}", resultVariable="X11_SM"), LibraryMapping( @@ -495,7 +502,7 @@ _library_map = [ "xcb_xkb", "XCB", "XCB::XKB", extra=["COMPONENTS", "XKB"], resultVariable="XCB_XKB" ), LibraryMapping("xcb_xlib", "X11_XCB", "X11::XCB"), - LibraryMapping('xcomposite', 'XComposite', 'PkgConfig::XComposite'), + LibraryMapping("xcomposite", "XComposite", "PkgConfig::XComposite"), LibraryMapping("xkbcommon_evdev", "XKB", "XKB::XKB", extra=["0.4.1"]), # see also xkbcommon LibraryMapping("xkbcommon_x11", "XKB", "XKB::XKB", extra=["0.4.1"]), # see also xkbcommon LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.4.1"]), diff --git a/util/cmake/requirements.txt b/util/cmake/requirements.txt index 16febdd4a3..16fb99a08c 100644 --- a/util/cmake/requirements.txt +++ b/util/cmake/requirements.txt @@ -4,3 +4,5 @@ mypy; python_version >= '3.7' pyparsing; python_version >= '3.7' sympy; python_version >= '3.7' portalocker; python_version >= '3.7' +black; python_version >= '3.7' + |