Rebuild with latest changes to mypy stubgen

LumaPictures · Aug 3, 2023 · 3c40572 · 3c40572
1 parent 37c17c4
commit 3c40572
Show file tree

Hide file tree

Showing 58 changed files with 1,481 additions and 1,447 deletions.
diff --git a/katana/stubgen_katana.py b/katana/stubgen_katana.py
@@ -156,7 +156,7 @@ def get_imports(self) -> str:
 
     def get_members(self, obj: object) -> list[tuple[str, Any]]:
         # Note that there is a mix of fixes here for C and non-C modules, but
-        # I'm not separating them because it's easy to get mixed uppp
+        # I'm not separating them because it's easy to get mixed up
         members = dict(super().get_members(obj))
 
         if self.is_c_module:

diff --git a/katana/stubgen_katana.sh b/katana/stubgen_katana.sh
@@ -8,15 +8,16 @@ if [[ "$version" == "" ]]; then
   echo "defaulting to $version"
 fi
 
-# User provided
+# Custom variables --
+MYPY_ROOT=$REPO_PATH/../mypy
 export KATANA_HOME=/luma/soft/applications/Foundry/Linux-x86_64/katana/Katana-$version
 export PATH=$KATANA_HOME:$PATH
 export foundry_LICENSE='[email protected]:[email protected]'
-
+# End custom variables --
 
 PY_SITE_DIR=$(python -c "import site,os;print(os.pathsep.join(site.getsitepackages()))")
 export REPO_PATH=$(git rev-parse --show-toplevel)
-export PYTHONPATH=$REPO_PATH:$REPO_PATH/katana:$REPO_PATH/../mypy/:$PY_SITE_DIR
+export PYTHONPATH=$REPO_PATH:$REPO_PATH/katana:$MYPY_ROOT:$PY_SITE_DIR
 
 sitedir=$KATANA_HOME/bin/python/
 outdir=${REPO_PATH}/katana/stubs

diff --git a/pyside/build.sh b/pyside/build.sh
diff --git a/pyside/setup.cfg.old b/pyside/setup.cfg.old
diff --git a/pyside/stubgen_pyside.sh b/pyside/stubgen_pyside.sh
@@ -6,7 +6,6 @@ POINT_RELEASE=5
 #pip install -U git+https://github.com/chadrik/mypy@stubgenc-all-fixes#mypy
 # pip install -U -e ../mypy
 
-echo $(which python)
 PY_SITE_DIR=$(python -c "import site,os;print(os.pathsep.join(site.getsitepackages()))")
 REPO_PATH=$(git rev-parse --show-toplevel)
 outdir=$REPO_PATH/pyside/stubs/
@@ -19,7 +18,7 @@ export PYTHONPATH=$REPO_PATH:$REPO_PATH/pyside:$MYPY_ROOT:$PY_SITE_DIR
 
 python -m stubgen_pyside -p shiboken2 -p PySide2 --include-private -o $outdir
 
-echo -e "\nclass Object:\n    pass" >> $outdir/shiboken2/shiboken2.pyi
+echo -e "\nclass Object: ..." >> $outdir/shiboken2/shiboken2.pyi
 echo -e "__version__: str" >> $outdir/PySide2/__init__.pyi
 echo -e "__version_info__: tuple[int, int, float, str, str]" >> $outdir/PySide2/__init__.pyi
 

diff --git a/pyside/stubs/PySide2/Qt3DAnimation.pyi b/pyside/stubs/PySide2/Qt3DAnimation.pyi
@@ -7,6 +7,7 @@ import collections.abc
 import shiboken2
 import typing
 T = typing.TypeVar('T')
+import typing_extensions
 
 class Qt3DAnimation(shiboken2.Object):
     class QAbstractAnimation(PySide2.QtCore.QObject):
@@ -15,7 +16,7 @@ class Qt3DAnimation(shiboken2.Object):
             MorphingAnimation: typing.ClassVar[Qt3DAnimation.QAbstractAnimation.AnimationType] = ...
             VertexBlendAnimation: typing.ClassVar[Qt3DAnimation.QAbstractAnimation.AnimationType] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QAbstractAnimation.AnimationType: ...
@@ -74,7 +75,7 @@ class Qt3DAnimation(shiboken2.Object):
         class Loops:
             Infinite: typing.ClassVar[Qt3DAnimation.QAbstractClipAnimator.Loops] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QAbstractClipAnimator.Loops: ...
@@ -145,7 +146,7 @@ class Qt3DAnimation(shiboken2.Object):
             OnOwningThread: typing.ClassVar[Qt3DAnimation.QAnimationCallback.Flag] = ...
             OnThreadPool: typing.ClassVar[Qt3DAnimation.QAnimationCallback.Flag] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QAnimationCallback.Flag: ...
@@ -187,7 +188,7 @@ class Qt3DAnimation(shiboken2.Object):
             NotReady: typing.ClassVar[Qt3DAnimation.QAnimationClipLoader.Status] = ...
             Ready: typing.ClassVar[Qt3DAnimation.QAnimationClipLoader.Status] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QAnimationClipLoader.Status: ...
@@ -298,7 +299,7 @@ class Qt3DAnimation(shiboken2.Object):
             ConstantInterpolation: typing.ClassVar[Qt3DAnimation.QKeyFrame.InterpolationType] = ...
             LinearInterpolation: typing.ClassVar[Qt3DAnimation.QKeyFrame.InterpolationType] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QKeyFrame.InterpolationType: ...
@@ -348,7 +349,7 @@ class Qt3DAnimation(shiboken2.Object):
             None_: typing.ClassVar[Qt3DAnimation.QKeyframeAnimation.RepeatMode] = ...
             Repeat: typing.ClassVar[Qt3DAnimation.QKeyframeAnimation.RepeatMode] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QKeyframeAnimation.RepeatMode: ...
@@ -432,7 +433,7 @@ class Qt3DAnimation(shiboken2.Object):
             Normalized: typing.ClassVar[Qt3DAnimation.QMorphingAnimation.Method] = ...
             Relative: typing.ClassVar[Qt3DAnimation.QMorphingAnimation.Method] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DAnimation.QMorphingAnimation.Method: ...

diff --git a/pyside/stubs/PySide2/Qt3DCore.pyi b/pyside/stubs/PySide2/Qt3DCore.pyi
@@ -5,6 +5,7 @@ import collections.abc
 import shiboken2
 import typing
 T = typing.TypeVar('T')
+import typing_extensions
 
 class Qt3DCore(shiboken2.Object):
     class ChangeFlag:
@@ -19,7 +20,7 @@ class Qt3DCore(shiboken2.Object):
         PropertyValueAdded: typing.ClassVar[Qt3DCore.ChangeFlag] = ...
         PropertyValueRemoved: typing.ClassVar[Qt3DCore.ChangeFlag] = ...
         values: typing.ClassVar[dict] = ...
-        name: None
+        name: _typeshed.Incomplete
         @classmethod
         def __init__(cls, *args, **kwargs) -> None: ...
         def __and__(self, other: typing.SupportsInt) -> Qt3DCore.ChangeFlags: ...
@@ -85,7 +86,7 @@ class Qt3DCore(shiboken2.Object):
             Automatic: typing.ClassVar[Qt3DCore.QAspectEngine.RunMode] = ...
             Manual: typing.ClassVar[Qt3DCore.QAspectEngine.RunMode] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DCore.QAspectEngine.RunMode: ...
@@ -138,7 +139,7 @@ class Qt3DCore(shiboken2.Object):
             ReadOnly: typing.ClassVar[Qt3DCore.QBackendNode.Mode] = ...
             ReadWrite: typing.ClassVar[Qt3DCore.QBackendNode.Mode] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DCore.QBackendNode.Mode: ...
@@ -253,7 +254,7 @@ class Qt3DCore(shiboken2.Object):
             TrackAllValues: typing.ClassVar[Qt3DCore.QNode.PropertyTrackingMode] = ...
             TrackFinalValues: typing.ClassVar[Qt3DCore.QNode.PropertyTrackingMode] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DCore.QNode.PropertyTrackingMode: ...
@@ -344,8 +345,8 @@ class Qt3DCore(shiboken2.Object):
         def __ne__(self, other: object) -> bool: ...
 
     class QNodeIdTypePair(shiboken2.Object):
-        id: None
-        type: None
+        id: _typeshed.Incomplete
+        type: _typeshed.Incomplete
         @typing.overload
         def __init__(self, _id: Qt3DCore.QNodeId, _type: PySide2.QtCore.QMetaObject) -> None: ...
         @typing.overload
@@ -392,7 +393,7 @@ class Qt3DCore(shiboken2.Object):
             DeliverToAll: typing.ClassVar[Qt3DCore.QSceneChange.DeliveryFlag] = ...
             Nodes: typing.ClassVar[Qt3DCore.QSceneChange.DeliveryFlag] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __and__(self, other: typing.SupportsInt) -> Qt3DCore.QSceneChange.DeliveryFlags: ...
@@ -454,7 +455,7 @@ class Qt3DCore(shiboken2.Object):
             NotReady: typing.ClassVar[Qt3DCore.QSkeletonLoader.Status] = ...
             Ready: typing.ClassVar[Qt3DCore.QSkeletonLoader.Status] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DCore.QSkeletonLoader.Status: ...

diff --git a/pyside/stubs/PySide2/Qt3DExtras.pyi b/pyside/stubs/PySide2/Qt3DExtras.pyi
@@ -7,20 +7,21 @@ import collections.abc
 import shiboken2
 import typing
 T = typing.TypeVar('T')
+import typing_extensions
 
 class Qt3DExtras(shiboken2.Object):
     class QAbstractCameraController(PySide2.Qt3DCore.Qt3DCore.QEntity):
         class InputState(shiboken2.Object):
-            altKeyActive: None
-            leftMouseButtonActive: None
-            middleMouseButtonActive: None
-            rightMouseButtonActive: None
-            rxAxisValue: None
-            ryAxisValue: None
-            shiftKeyActive: None
-            txAxisValue: None
-            tyAxisValue: None
-            tzAxisValue: None
+            altKeyActive: _typeshed.Incomplete
+            leftMouseButtonActive: _typeshed.Incomplete
+            middleMouseButtonActive: _typeshed.Incomplete
+            rightMouseButtonActive: _typeshed.Incomplete
+            rxAxisValue: _typeshed.Incomplete
+            ryAxisValue: _typeshed.Incomplete
+            shiftKeyActive: _typeshed.Incomplete
+            txAxisValue: _typeshed.Incomplete
+            tyAxisValue: _typeshed.Incomplete
+            tzAxisValue: _typeshed.Incomplete
             @typing.overload
             def __init__(self, InputState: Qt3DExtras.QAbstractCameraController.InputState) -> None: ...
             @typing.overload

diff --git a/pyside/stubs/PySide2/Qt3DInput.pyi b/pyside/stubs/PySide2/Qt3DInput.pyi
@@ -6,6 +6,7 @@ import collections.abc
 import shiboken2
 import typing
 T = typing.TypeVar('T')
+import typing_extensions
 
 class Qt3DInput(shiboken2.Object):
     class QAbstractActionInput(PySide2.Qt3DCore.Qt3DCore.QNode):
@@ -74,7 +75,7 @@ class Qt3DInput(shiboken2.Object):
             Acceleration: typing.ClassVar[Qt3DInput.QAxisAccumulator.SourceAxisType] = ...
             Velocity: typing.ClassVar[Qt3DInput.QAxisAccumulator.SourceAxisType] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DInput.QAxisAccumulator.SourceAxisType: ...
@@ -276,7 +277,7 @@ class Qt3DInput(shiboken2.Object):
             X: typing.ClassVar[Qt3DInput.QMouseDevice.Axis] = ...
             Y: typing.ClassVar[Qt3DInput.QMouseDevice.Axis] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DInput.QMouseDevice.Axis: ...
@@ -329,7 +330,7 @@ class Qt3DInput(shiboken2.Object):
             NoButton: typing.ClassVar[Qt3DInput.QMouseEvent.Buttons] = ...
             RightButton: typing.ClassVar[Qt3DInput.QMouseEvent.Buttons] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DInput.QMouseEvent.Buttons: ...
@@ -364,7 +365,7 @@ class Qt3DInput(shiboken2.Object):
             NoModifier: typing.ClassVar[Qt3DInput.QMouseEvent.Modifiers] = ...
             ShiftModifier: typing.ClassVar[Qt3DInput.QMouseEvent.Modifiers] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DInput.QMouseEvent.Modifiers: ...
@@ -441,7 +442,7 @@ class Qt3DInput(shiboken2.Object):
             NoButton: typing.ClassVar[Qt3DInput.QWheelEvent.Buttons] = ...
             RightButton: typing.ClassVar[Qt3DInput.QWheelEvent.Buttons] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DInput.QWheelEvent.Buttons: ...
@@ -476,7 +477,7 @@ class Qt3DInput(shiboken2.Object):
             NoModifier: typing.ClassVar[Qt3DInput.QWheelEvent.Modifiers] = ...
             ShiftModifier: typing.ClassVar[Qt3DInput.QWheelEvent.Modifiers] = ...
             values: typing.ClassVar[dict] = ...
-            name: None
+            name: _typeshed.Incomplete
             @classmethod
             def __init__(cls, *args, **kwargs) -> None: ...
             def __add__(self, other: typing.SupportsInt) -> Qt3DInput.QWheelEvent.Modifiers: ...

diff --git a/pyside/stubs/PySide2/Qt3DLogic.pyi b/pyside/stubs/PySide2/Qt3DLogic.pyi
@@ -1,9 +1,11 @@
 import PySide2.Qt3DCore
 import PySide2.QtCore
+import _typeshed
 import collections.abc
 import shiboken2
 import typing
 T = typing.TypeVar('T')
+import typing_extensions
 
 class Qt3DLogic(shiboken2.Object):
     class QFrameAction(PySide2.Qt3DCore.Qt3DCore.QComponent):