aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2023-01-06 11:39:54 -0800
committerDylan Baker <dylan@pnwbakers.com>2023-01-10 09:53:22 -0800
commit6ed6c8cdbaed1976f47e685b66d032e3174d5e89 (patch)
treee85f1af4f04700db5717affd526db71d606f98c5
parente8a88f53205d5d9092ccd16faa5cf89af72d2951 (diff)
downloadmeson-6ed6c8cdbaed1976f47e685b66d032e3174d5e89.zip
meson-6ed6c8cdbaed1976f47e685b66d032e3174d5e89.tar.gz
meson-6ed6c8cdbaed1976f47e685b66d032e3174d5e89.tar.bz2
modules: fully type the Qt* modules
The base module is fully typed, but the numbered version are not, though it's pretty trivial to do so.
-rw-r--r--mesonbuild/modules/qt4.py12
-rw-r--r--mesonbuild/modules/qt5.py12
-rw-r--r--mesonbuild/modules/qt6.py11
-rwxr-xr-xrun_mypy.py3
4 files changed, 29 insertions, 9 deletions
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py
index b8948f7..6bdf1c5 100644
--- a/mesonbuild/modules/qt4.py
+++ b/mesonbuild/modules/qt4.py
@@ -12,17 +12,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import annotations
+import typing as T
+
from .qt import QtBaseModule
from . import ModuleInfo
+if T.TYPE_CHECKING:
+ from ..interpreter import Interpreter
+
class Qt4Module(QtBaseModule):
INFO = ModuleInfo('qt4')
- def __init__(self, interpreter):
+ def __init__(self, interpreter: Interpreter):
QtBaseModule.__init__(self, interpreter, qt_version=4)
-def initialize(*args, **kwargs):
- return Qt4Module(*args, **kwargs)
+def initialize(interp: Interpreter) -> Qt4Module:
+ return Qt4Module(interp)
diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py
index 3933ea0..d9f0a5e 100644
--- a/mesonbuild/modules/qt5.py
+++ b/mesonbuild/modules/qt5.py
@@ -12,17 +12,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import annotations
+import typing as T
+
from .qt import QtBaseModule
from . import ModuleInfo
+if T.TYPE_CHECKING:
+ from ..interpreter import Interpreter
+
class Qt5Module(QtBaseModule):
INFO = ModuleInfo('qt5')
- def __init__(self, interpreter):
+ def __init__(self, interpreter: Interpreter):
QtBaseModule.__init__(self, interpreter, qt_version=5)
-def initialize(*args, **kwargs):
- return Qt5Module(*args, **kwargs)
+def initialize(interp: Interpreter) -> Qt5Module:
+ return Qt5Module(interp)
diff --git a/mesonbuild/modules/qt6.py b/mesonbuild/modules/qt6.py
index 66fc43f..cafc531 100644
--- a/mesonbuild/modules/qt6.py
+++ b/mesonbuild/modules/qt6.py
@@ -12,17 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+from __future__ import annotations
+import typing as T
+
from .qt import QtBaseModule
from . import ModuleInfo
+if T.TYPE_CHECKING:
+ from ..interpreter import Interpreter
class Qt6Module(QtBaseModule):
INFO = ModuleInfo('qt6', '0.57.0')
- def __init__(self, interpreter):
+ def __init__(self, interpreter: Interpreter):
QtBaseModule.__init__(self, interpreter, qt_version=6)
-def initialize(*args, **kwargs):
- return Qt6Module(*args, **kwargs)
+def initialize(interp: Interpreter) -> Qt6Module:
+ return Qt6Module(interp)
diff --git a/run_mypy.py b/run_mypy.py
index 119ee39..cb974f3 100755
--- a/run_mypy.py
+++ b/run_mypy.py
@@ -51,6 +51,9 @@ modules = [
'mesonbuild/modules/modtest.py',
'mesonbuild/modules/pkgconfig.py',
'mesonbuild/modules/qt.py',
+ 'mesonbuild/modules/qt4.py',
+ 'mesonbuild/modules/qt5.py',
+ 'mesonbuild/modules/qt6.py',
'mesonbuild/modules/rust.py',
'mesonbuild/modules/sourceset.py',
'mesonbuild/modules/wayland.py',