Merge branch 'main' into enable-workflow-dispatch-for-core-tests

Author: mdickinson

traits/stubs_tests/examples/Any.py

@@ -8,7 +8,7 @@
 #
 # Thanks for using Enthought open source!
 
-from traits.api import HasTraits, Any, Instance, Int
+from traits.api import HasTraits, Any
 
 
 class Test(HasTraits):
@@ -46,14 +46,18 @@ class Test3(HasTraits):
     i = Any(default_value=234)
 
 
-class Foo:
-    pass
+# The test below is commented out because different versions of mypy have
+# different opinions on whether it's okay to override `x = Any()` with `x =
+# Instance(Foo)` or not.
 
-
-class Superclass(HasTraits):
-    x = Any()
-
-
-class Subclass(Superclass):
-    x = Instance(Foo)  # E: assignment
-    y = Int()
+# class Foo:
+#     pass
+#
+#
+# class Superclass(HasTraits):
+#     x = Any()
+#
+#
+# class Subclass(Superclass):
+#     x = Instance(Foo)
+#     y = Int()