Merge pull request #162 from vidartf/test-examples-output

Ensure examples pass non-lax nbval test

Author: vidartf

examples/Animation.ipynb

@@ -31,7 +31,11 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "nbval-ignore-output"
+    ]
+   },
    "outputs": [
     {
      "data": {
@@ -70,7 +74,11 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "nbval-ignore-output"
+    ]
+   },
    "outputs": [
     {
      "data": {
@@ -150,7 +158,11 @@
   {
    "cell_type": "code",
    "execution_count": 6,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "nbval-ignore-output"
+    ]
+   },
    "outputs": [
     {
      "data": {

examples/Geometries.ipynb

@@ -0,0 +1,4 @@
+
+def pytest_collectstart(collector):
+    if collector.fspath and collector.fspath.ext == '.ipynb':
+        collector.skip_compare += ('application/vnd.jupyter.widget-view+json', 'text/html')

examples/Textures.ipynb

@@ -157,6 +157,15 @@ function getClassConfig(className) {
         classConfigs._defaults
     );
 
+    if ('type' in result.allProperties && result.allProperties.type instanceof Types.String) {
+        if ('type' in result.properties) {
+            result.properties.type.defaultValue = className;
+        } else {
+            result.properties.type = new Types.String(className);
+            result.allProperties.type = result.properties.type;
+        }
+    }
+
     return result;
 }
 

examples/conftest.py

@@ -102,7 +102,6 @@ module.exports = {
         relativePath: './cameras/CubeCamera',
         superClass: 'Object3D',
         properties: {
-            type: new Types.String('CubeCamera'),
         }
     },
     OrthographicCamera: {
@@ -116,7 +115,6 @@ module.exports = {
             bottom: new Types.Float(),
             near:   new Types.Float(0.1),
             far:    new Types.Float(2000),
-            type:   new Types.String('OrthographicCamera'),
         },
         constructorArgs: [ 'left', 'right', 'top', 'bottom', 'near', 'far' ],
     },
@@ -133,15 +131,13 @@ module.exports = {
             // view:       new Types.Dict(),
             // filmGauge:  new Types.Float(35.0),
             // filmOffset: new Types.Float(0.0),
-            type:   new Types.String('PerspectiveCamera'),
         },
         constructorArgs: [ 'fov', 'aspect', 'near', 'far' ],
     },
     ArrayCamera: {
         relativePath: './cameras/ArrayCamera',
         superClass: 'PerspectiveCamera',
         properties: {
-            type:   new Types.String('ArrayCamera'),
         },
         constructorArgs: [ 'fov', 'aspect', 'near', 'far' ],
     },
@@ -347,7 +343,6 @@ module.exports = {
             attributes:         new Types.ThreeTypeDict(['BufferAttribute', 'InterleavedBufferAttribute']),
             morphAttributes:    new Types.BufferMorphAttributes(),
             MaxIndex:           new Types.Int(65535),
-            type:               new Types.String('BufferGeometry'),
             // TODO: These likely require special types:
             //groups:             new Types.GeometryGroup(),
             //drawRange:          new Types.DrawRange(),
@@ -675,7 +670,6 @@ module.exports = {
             refractionRatio:    new Types.Float(0.98),
             skinning:           new Types.Bool(false),
             specularMap:        new Types.ThreeType('Texture'),
-            type:               new Types.String('MeshBasicMaterial'),
             wireframe:          new Types.Bool(false),
             wireframeLinewidth: new Types.Float(1),
             wireframeLinecap:   new Types.String('round'), // TODO: enum?
@@ -1044,7 +1038,6 @@ module.exports = {
             geometry: new Types.ThreeType(['BaseGeometry', 'BaseBufferGeometry'], {nullable: false}),
             drawMode: new Types.Enum('DrawModes', 'TrianglesDrawMode'),
             morphTargetInfluences: new Types.Array(),
-            type: new Types.String('Mesh'),
         },
         propsDefinedByThree: ['morphTargetInfluences'],
     },
@@ -1682,7 +1675,6 @@ module.exports = {
             hex: new Types.Int(0),
             headLength: new Types.Float(null, {nullable: true}),
             headWidth: new Types.Float(null, {nullable: true}),
-            type: new Types.String('ArrowHelper'),
         },
     },
     AxesHelper: {

js/scripts/generate-wrappers.js

@@ -1,7 +1,7 @@
 
 from ipywidgets import register, widget_serialization
-from traitlets import validate, TraitError
-from ipydatawidgets import NDArrayWidget
+from traitlets import validate, TraitError, Undefined
+from ipydatawidgets import NDArrayWidget, get_union_array
 
 from .BufferGeometry_autogen import BufferGeometry as BufferGeometryBase
 
@@ -30,3 +30,43 @@ def validate(self, proposal):
                 raise TraitError('Index attribute must be a flat array. Consider using array.ravel().')
 
         return value
+
+
+    def _gen_repr_from_keys(self, keys):
+        # Hide data in repr to avoid overly large datasets
+        # Replace with uuids of buffer attributes
+        class_name = self.__class__.__name__
+        signature_parts = [
+            '%s=%r' % (key, getattr(self, key))
+            for key in keys if key not in ('attributes', 'morphAttributes')
+        ]
+        for name in ('attributes', 'morphAttributes'):
+            if not _dict_is_default(self, name):
+                signature_parts.append('%s=%s' % (name, _attr_dict_repr(getattr(self, name))))
+        return '%s(%s)' % (class_name, ', '.join(signature_parts))
+
+
+def _dict_is_default(ht, name):
+    value = getattr(ht, name)
+    return (
+        getattr(ht.__class__, name).default_value == Undefined and
+        (value is None or len(value) == 0)
+    )
+
+def _attr_value_repr(v):
+    array = get_union_array(v.array)
+    # Return full repr if array size is small:
+    if array.size < 50:
+        return repr(v)
+    # Otherwise, return a summary:
+    return '<%s shape=%r, dtype=%s>' % (v.__class__.__name__, array.shape, array.dtype)
+
+def _attr_dict_repr(d):
+    parts = []
+    for key, value in d.items():
+        if isinstance(value, tuple):
+            value_parts = [_attr_value_repr(v) for v in value]
+        else:
+            value_parts = [_attr_value_repr(value)]
+        parts.append('%r: %s' % (key, ', '.join(value_parts)))
+    return '{%s}' % (', '.join(parts),)

js/scripts/three-class-config.js

@@ -77,6 +77,7 @@
         'test': [
             'nbval',
             'pytest-check-links',
+            'numpy>=1.14',
         ],
         'examples': [
             'scipy',