1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake scripts: format with black

Browse Source 
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>
This commit is contained in:
Frederik Gladhorn 2019-10-10 17:15:58 +02:00
parent 2d1aee8595
commit ffb28b9930
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/cmake/Makefile
View File

@ -1,9 +1,15 @@
test: flake8 mypy pytest test: flake8 mypy pytest black_format_check
coverage: coverage:
pytest --cov . pytest --cov .
format:
black *.py --line-length 100
black_format_check:
black *.py --line-length 100 --check
flake8: flake8:
flake8 *.py --ignore=E501,E266,E203,W503 flake8 *.py --ignore=E501,E266,E203,W503

15
util/cmake/helper.py
View File

@ -281,7 +281,9 @@ _qt_library_map = [
), ),
LibraryMapping("quickwidgets", "Qt6", "Qt::QuickWidgets", extra=["COMPONENTS", "QuickWidgets"]), LibraryMapping("quickwidgets", "Qt6", "Qt::QuickWidgets", extra=["COMPONENTS", "QuickWidgets"]),
LibraryMapping("render", "Qt6", "Qt::3DRender", extra=["COMPONENTS", "3DRender"]), 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("script", "Qt6", "Qt::Script", extra=["COMPONENTS", "Script"]),
LibraryMapping("scripttools", "Qt6", "Qt::ScriptTools", extra=["COMPONENTS", "ScriptTools"]), LibraryMapping("scripttools", "Qt6", "Qt::ScriptTools", extra=["COMPONENTS", "ScriptTools"]),
LibraryMapping("scxml", "Qt6", "Qt::Scxml", extra=["COMPONENTS", "Scxml"]), LibraryMapping("scxml", "Qt6", "Qt::Scxml", extra=["COMPONENTS", "Scxml"]),
@ -312,7 +314,10 @@ _qt_library_map = [
"waylandclient", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"] "waylandclient", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"]
), ),
LibraryMapping( LibraryMapping(
"waylandcompositor", "Qt6", "Qt::WaylandCompositor", extra=["COMPONENTS", "WaylandCompositor"] "waylandcompositor",
"Qt6",
"Qt::WaylandCompositor",
extra=["COMPONENTS", "WaylandCompositor"],
), ),
LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", extra=["COMPONENTS", "WebChannel"]), LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", extra=["COMPONENTS", "WebChannel"]),
LibraryMapping("webengine", "Qt6", "Qt::WebEngine", extra=["COMPONENTS", "WebEngine"]), LibraryMapping("webengine", "Qt6", "Qt::WebEngine", extra=["COMPONENTS", "WebEngine"]),
@ -417,7 +422,9 @@ _library_map = [
LibraryMapping("wayland-client", "Wayland", "Wayland::Client"), LibraryMapping("wayland-client", "Wayland", "Wayland::Client"),
LibraryMapping("wayland-cursor", "Wayland", "Wayland::Cursor"), LibraryMapping("wayland-cursor", "Wayland", "Wayland::Cursor"),
LibraryMapping("wayland-egl", "Wayland", "Wayland::Egl"), 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("x11", "X11", "X11::X11"),
LibraryMapping("x11sm", "X11", "${X11_SM_LIB} ${X11_ICE_LIB}", resultVariable="X11_SM"), LibraryMapping("x11sm", "X11", "${X11_SM_LIB} ${X11_ICE_LIB}", resultVariable="X11_SM"),
LibraryMapping( LibraryMapping(
@ -495,7 +502,7 @@ _library_map = [
"xcb_xkb", "XCB", "XCB::XKB", extra=["COMPONENTS", "XKB"], resultVariable="XCB_XKB" "xcb_xkb", "XCB", "XCB::XKB", extra=["COMPONENTS", "XKB"], resultVariable="XCB_XKB"
), ),
LibraryMapping("xcb_xlib", "X11_XCB", "X11::XCB"), 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_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_x11", "XKB", "XKB::XKB", extra=["0.4.1"]), # see also xkbcommon
LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.4.1"]), LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.4.1"]),

2
util/cmake/requirements.txt
View File

@ -4,3 +4,5 @@ mypy; python_version >= '3.7'
pyparsing; python_version >= '3.7' pyparsing; python_version >= '3.7'
sympy; python_version >= '3.7' sympy; python_version >= '3.7'
portalocker; python_version >= '3.7' portalocker; python_version >= '3.7'
black; python_version >= '3.7'