fix(exc): use exception for matplotlib import error

hahnec · Sep 6, 2020 · ac8f9cf · ac8f9cf
1 parent 9e1b900
commit ac8f9cf
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 19 deletions.
diff --git a/depthy/__init__.py b/depthy/__init__.py
@@ -20,7 +20,7 @@
 
 from depthy import lightfield, misc
 
-__version__ = '0.2.5'
+__version__ = '0.2.6'
 
 METHODS = ['epi']
 FILE_EXTS = ('png')
diff --git a/depthy/misc/primal_dual.py b/depthy/misc/primal_dual.py
@@ -21,8 +21,13 @@
 # inspired by version authored by Louise Naud
 
 import numpy as np
-import matplotlib.pyplot as plt
 from scipy.misc import face
+import warnings
+
+try:
+    import matplotlib.pyplot as plt
+except ImportError:
+    warnings.warn('matplotlib import failed')
 
 norm1 = lambda x: np.abs(x).sum(-1)
 

diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 7c3e3b3ffc267ef9892f83b347b7fe8d
+config: d8fd5d030d6e7514d65ca05a8d0f9447
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/_static/documentation_options.js b/docs/build/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.2.5',
+    VERSION: '0.2.6',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/docs/build/html/apidoc.html b/docs/build/html/apidoc.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>2. API documentation &#8212; depthy 0.2.5 documentation</title>
+    <title>2. API documentation &#8212; depthy 0.2.6 documentation</title>
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -27,7 +27,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="readme.html" title="1. depthy"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href=""><span class="section-number">2. </span>API documentation</a></li> 
       </ul>
     </div>  
@@ -306,7 +306,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="readme.html" title="1. depthy"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href=""><span class="section-number">2. </span>API documentation</a></li> 
       </ul>
     </div>

diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Index &#8212; depthy 0.2.5 documentation</title>
+    <title>Index &#8212; depthy 0.2.6 documentation</title>
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -23,7 +23,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Index</a></li> 
       </ul>
     </div>  
@@ -137,7 +137,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="#" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Index</a></li> 
       </ul>
     </div>

diff --git a/docs/build/html/index.html b/docs/build/html/index.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>depthy’s Reference Document &#8212; depthy 0.2.5 documentation</title>
+    <title>depthy’s Reference Document &#8212; depthy 0.2.6 documentation</title>
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -27,7 +27,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="readme.html" title="1. depthy"
              accesskey="N">next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="#">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">depthy’s Reference Document</a></li> 
       </ul>
     </div>  
@@ -100,7 +100,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="readme.html" title="1. depthy"
              >next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="#">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">depthy’s Reference Document</a></li> 
       </ul>
     </div>

diff --git a/docs/build/html/readme.html b/docs/build/html/readme.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>1. depthy &#8212; depthy 0.2.5 documentation</title>
+    <title>1. depthy &#8212; depthy 0.2.6 documentation</title>
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
     <script id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@@ -31,7 +31,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="depthy’s Reference Document"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href=""><span class="section-number">1. </span>depthy</a></li> 
       </ul>
     </div>  
@@ -177,7 +177,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="depthy’s Reference Document"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href=""><span class="section-number">1. </span>depthy</a></li> 
       </ul>
     </div>

diff --git a/docs/build/html/search.html b/docs/build/html/search.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Search &#8212; depthy 0.2.5 documentation</title>
+    <title>Search &#8212; depthy 0.2.6 documentation</title>
     <link rel="stylesheet" href="_static/sphinxdoc.css" type="text/css" />
     <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
 
@@ -28,7 +28,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              accesskey="I">index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Search</a></li> 
       </ul>
     </div>  
@@ -76,7 +76,7 @@ <h3>Navigation</h3>
         <li class="right" style="margin-right: 10px">
           <a href="genindex.html" title="General Index"
              >index</a></li>
-        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.5 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">depthy 0.2.6 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Search</a></li> 
       </ul>
     </div>