Merge pull request #311 from vidartf/nbminor

vidartf · web-flow · commit c2263d1bb65c · 2020-01-17T17:23:55.000Z
fix docs ci
diff --git a/.travis.yml b/.travis.yml
@@ -18,11 +18,10 @@ matrix:
           packages:
             - pandoc
       script:
+        - python -m pytest_check_links
         - cd docs
         - make html
         - make linkcheck
-        - cd ..
-        - python -m pytest_check_links
 cache:
   pip: true
   directories:
diff --git a/docs/source/introduction.rst b/docs/source/introduction.rst
@@ -75,4 +75,4 @@ Other notable deviations from the threejs API are listed below:
 
 .. _`threejs animation`: https://threejs.org/docs/#manual/introduction/Animation-system
 
-.. _`numpy arrays`: https://www.numpy.org/
+.. _`numpy arrays`: https://numpy.org/
diff --git a/examples/BufferAttributes and BufferGeometry.ipynb b/examples/BufferAttributes and BufferGeometry.ipynb
@@ -320,5 +320,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/Examples.ipynb b/examples/Examples.ipynb
@@ -471,5 +471,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/Geometries.ipynb b/examples/Geometries.ipynb
@@ -1777,5 +1777,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/GeometryVertices.ipynb b/examples/GeometryVertices.ipynb
@@ -120,5 +120,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/Textures.ipynb b/examples/Textures.ipynb
@@ -356,5 +356,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/conftest.py b/examples/conftest.py
@@ -1,4 +1,4 @@
 
 def pytest_collectstart(collector):
-    if collector.fspath and collector.fspath.ext == '.ipynb':
+    if collector.fspath and collector.fspath.ext == '.ipynb' and hasattr(collector, 'skip_compare'):
         collector.skip_compare += ('application/vnd.jupyter.widget-view+json', 'text/html')
diff --git a/examples/renderer_limit.ipynb b/examples/renderer_limit.ipynb
@@ -165,5 +165,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/superellipsoid.ipynb b/examples/superellipsoid.ipynb
@@ -242,5 +242,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/test.ipynb b/examples/test.ipynb
@@ -207,5 +207,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }
diff --git a/examples/threejs/voxel_painter.ipynb b/examples/threejs/voxel_painter.ipynb
@@ -564,5 +564,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 2
 }

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,4 @@ Other notable deviations from the threejs API are listed below:`
`75`	`75`
`76`	`76`	.. _`threejs animation`: https://threejs.org/docs/#manual/introduction/Animation-system
`77`	`77`
`78`		-.. _`numpy arrays`: https://www.numpy.org/
	`78`	+.. _`numpy arrays`: https://numpy.org/
Original file line number	Diff line number	Diff line change
`@@ -320,5 +320,5 @@`
`320`	`320`	`}`
`321`	`321`	`},`
`322`	`322`	`"nbformat": 4,`
`323`		`- "nbformat_minor": 1`
	`323`	`+ "nbformat_minor": 2`
`324`	`324`	`}`
Original file line number	Diff line number	Diff line change
`@@ -471,5 +471,5 @@`
`471`	`471`	`}`
`472`	`472`	`},`
`473`	`473`	`"nbformat": 4,`
`474`		`- "nbformat_minor": 1`
	`474`	`+ "nbformat_minor": 2`
`475`	`475`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1777,5 +1777,5 @@`
`1777`	`1777`	`}`
`1778`	`1778`	`},`
`1779`	`1779`	`"nbformat": 4,`
`1780`		`- "nbformat_minor": 1`
	`1780`	`+ "nbformat_minor": 2`
`1781`	`1781`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,5 +120,5 @@`
`120`	`120`	`}`
`121`	`121`	`},`
`122`	`122`	`"nbformat": 4,`
`123`		`- "nbformat_minor": 1`
	`123`	`+ "nbformat_minor": 2`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -356,5 +356,5 @@`
`356`	`356`	`}`
`357`	`357`	`},`
`358`	`358`	`"nbformat": 4,`
`359`		`- "nbformat_minor": 1`
	`359`	`+ "nbformat_minor": 2`
`360`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,5 +165,5 @@`
`165`	`165`	`}`
`166`	`166`	`},`
`167`	`167`	`"nbformat": 4,`
`168`		`- "nbformat_minor": 1`
	`168`	`+ "nbformat_minor": 2`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,5 +242,5 @@`
`242`	`242`	`}`
`243`	`243`	`},`
`244`	`244`	`"nbformat": 4,`
`245`		`- "nbformat_minor": 1`
	`245`	`+ "nbformat_minor": 2`
`246`	`246`	`}`