Merge pull request #93 from plotly/circle-update

Circle update

Author: theengineear

circle.yml

@@ -9,16 +9,18 @@ checkout:
 ## Customize dependencies
 dependencies:
   post:
-    - pip install matplotlib
     - pip install -I .
     - cd ~ && python -c "import plotly"
+    - pip install matplotlib
 
 ## Customize database setup (pass)
 
 ## Customize test commands
 test:
   post:
-    - nosetests -w plotly/tests
+    - nosetests -w plotly/tests/test_optional
+    - pip uninstall -y matplotlib
+    - nosetests -w plotly/tests/test_core
     - chmod 000 ~/.plotly && python -c "import plotly"
 
 ## Customize deployment commands (pass)

plotly/tests/test_core/test_graph_objs/test_strip_style.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from plotly.graph_objs import *
-from . import nose_tools
+from plotly.tests.utils import compare_dict
 
 
 def test_strip_style():
@@ -145,6 +145,6 @@ def test_strip_style():
             margin=Margin()
         )
     )
-    equivalent, msg = nose_tools.compare_dict(fig, comp_fig)
+    equivalent, msg = compare_dict(fig, comp_fig)
     print(msg)
     assert equivalent

plotly/tests/test_optional/optional_utils.py

@@ -0,0 +1,14 @@
+from __future__ import absolute_import
+
+import matplotlib
+# Force matplotlib to not use any Xwindows backend.
+matplotlib.use('Agg')
+from plotly.matplotlylib import Exporter, PlotlyRenderer
+from plotly.tests.utils import *
+
+
+def run_fig(fig):
+    renderer = PlotlyRenderer()
+    exporter = Exporter(renderer)
+    exporter.run(fig)
+    return renderer

plotly/tests/test_optional/test_matplotlylib/test_annotations.py

@@ -5,7 +5,7 @@
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-from .nose_tools import compare_dict, run_fig
+from plotly.tests.test_optional.optional_utils import compare_dict, run_fig
 from .data.annotations import *
 
 

plotly/tests/test_optional/test_matplotlylib/test_axis_scales.py

@@ -3,7 +3,7 @@
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-from .nose_tools import compare_dict, run_fig
+from plotly.tests.test_optional.optional_utils import compare_dict, run_fig
 from .data.axis_scales import *
 
 

plotly/tests/test_optional/test_matplotlylib/test_bars.py

@@ -3,7 +3,7 @@
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-from .nose_tools import compare_dict, run_fig
+from plotly.tests.test_optional.optional_utils import compare_dict, run_fig
 from .data.bars import *
 
 

plotly/tests/test_optional/test_matplotlylib/test_data.py

@@ -3,7 +3,7 @@
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-from .nose_tools import run_fig
+from plotly.tests.test_optional.optional_utils import run_fig
 from .data.data import *
 
 

plotly/tests/test_optional/test_matplotlylib/test_lines.py

@@ -3,7 +3,7 @@
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-from .nose_tools import compare_dict, run_fig
+from plotly.tests.test_optional.optional_utils import compare_dict, run_fig
 from .data.lines import *
 
 

plotly/tests/test_optional/test_matplotlylib/test_scatter.py

@@ -3,7 +3,7 @@
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 
-from .nose_tools import compare_dict, run_fig
+from plotly.tests.test_optional.optional_utils import compare_dict, run_fig
 from .data.scatter import *
 
 

plotly/tests/test_optional/test_matplotlylib/test_subplots.py

@@ -4,7 +4,7 @@
 import matplotlib.pyplot as plt
 from matplotlib.gridspec import GridSpec
 
-from .nose_tools import compare_dict, run_fig
+from plotly.tests.test_optional.optional_utils import compare_dict, run_fig
 from .data.subplots import *