Don’t hard-code repo name in circle-stuff.

circle.yml

@@ -2,7 +2,7 @@ machine:
 
   environment:
 
-    PLOTLY_PACKAGE_ROOT: /home/ubuntu/python-api
+    PLOTLY_PACKAGE_ROOT: /home/ubuntu/${CIRCLE_PROJECT_REPONAME}
     PLOTLY_CONFIG_DIR: ${HOME}/.plotly
     PLOTLY_PYTHON_VERSIONS: 2.7.8 3.3.3 3.4.1
     PLOTLY_CORE_REQUIREMENTS_FILE: ${PLOTLY_PACKAGE_ROOT}/requirements.txt

circle/test.sh

@@ -41,7 +41,7 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
         error_exit "${SIG} ${LINENO}: can't import plotly package"
 
     echo "${SIG} Running tests for Python ${version} as user '$(whoami)'."
-    nosetests -x plotly/tests ||
+    nosetests -x -a '!matplotlib' plotly/tests ||
         error_exit "${SIG} ${LINENO}: test suite failed for Python ${version}"
 
 done

optional-requirements.txt

@@ -9,13 +9,13 @@
 numpy
 
 ## matplotlylib dependencies ##
-matplotlib==1.3.1
+# matplotlib==1.3.1
 
 ## testing dependencies ##
 nose==1.3.3
 
 ## ipython dependencies ##
-ipython[all]
+ipython[all]==3.0.0
 
 ## pandas deps for some matplotlib functionality ##
 pandas

plotly/graph_reference/default-schema.json

@@ -4737,7 +4737,7 @@
                             "valType": "color"
                         },
                         "outliercolor": {
-                            "description": "Sets the border line color of the outlier sample points.",
+                            "description": "Sets the border line color of the outlier sample points. Defaults to marker.color",
                             "role": "style",
                             "valType": "color"
                         },
@@ -4769,7 +4769,7 @@
                     },
                     "outliercolor": {
                         "description": "Sets the color of the outlier sample points.",
-                        "dflt": "rgba(0,0,0,0)",
+                        "dflt": "rgba(0, 0, 0, 0)",
                         "role": "style",
                         "valType": "color"
                     },

plotly/matplotlylib/mplexporter/tests/test_basic.py

@@ -1,26 +1,34 @@
-from ..exporter import Exporter
-from ..renderers import FakeRenderer, FullFakeRenderer
+# TODO: matplotlib-build-wip
+from nose.plugins.attrib import attr
+from plotly.tools import _matplotlylib_imported
 
-import matplotlib
-matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+if _matplotlylib_imported:
+    from ..exporter import Exporter
+    from ..renderers import FakeRenderer, FullFakeRenderer
 
-import numpy as np
-from numpy.testing import assert_warns
+    import matplotlib
+    matplotlib.use('Agg')
+    import matplotlib.pyplot as plt
 
+    import numpy as np
+    from numpy.testing import assert_warns
 
+
+@attr('matplotlib')
 def fake_renderer_output(fig, Renderer):
     renderer = Renderer()
     exporter = Exporter(renderer)
     exporter.run(fig)
     return renderer.output
 
 
+@attr('matplotlib')
 def _assert_output_equal(text1, text2):
     for line1, line2 in zip(text1.strip().split(), text2.strip().split()):
         assert line1 == line2
 
 
+@attr('matplotlib')
 def test_lines():
     fig, ax = plt.subplots()
     ax.plot(range(20), '-k')
@@ -44,6 +52,7 @@ def test_lines():
                          """)
 
 
+@attr('matplotlib')
 def test_markers():
     fig, ax = plt.subplots()
     ax.plot(range(2), 'ok')
@@ -68,6 +77,7 @@ def test_markers():
                          """)
 
 
+@attr('matplotlib')
 def test_path_collection():
     fig, ax = plt.subplots()
     ax.scatter(range(3), range(3))
@@ -93,6 +103,7 @@ def test_path_collection():
                          """)
 
 
+@attr('matplotlib')
 def test_text():
     fig, ax = plt.subplots()
     ax.set_xlabel("my x label")
@@ -113,6 +124,7 @@ def test_text():
                          """)
 
 
+@attr('matplotlib')
 def test_path():
     fig, ax = plt.subplots()
     ax.add_patch(plt.Circle((0, 0), 1))
@@ -129,6 +141,7 @@ def test_path():
                          """)
 
 
+@attr('matplotlib')
 def test_multiaxes():
     fig, ax = plt.subplots(2)
     ax[0].plot(range(4))
@@ -147,6 +160,7 @@ def test_multiaxes():
                          """)
 
 
+@attr('matplotlib')
 def test_image():
     np.random.seed(0)  # image size depends on the seed
     fig, ax = plt.subplots()
@@ -163,6 +177,7 @@ def test_image():
                          """)
 
 
+@attr('matplotlib')
 def test_legend():
     fig, ax = plt.subplots()
     ax.plot([1,2,3], label='label')
@@ -178,6 +193,8 @@ def test_legend():
                          closing figure
                          """)
 
+
+@attr('matplotlib')
 def test_legend_dots():
     fig, ax = plt.subplots()
     ax.plot([1,2,3], label='label')
@@ -200,8 +217,9 @@ def test_legend_dots():
                          closing figure
                          """)
 
+
+@attr('matplotlib')
 def test_blended():
     fig, ax = plt.subplots()
     ax.axvline(0)
     assert_warns(UserWarning, fake_renderer_output, fig, FakeRenderer)
-

plotly/matplotlylib/mplexporter/tests/test_utils.py

@@ -1,8 +1,13 @@
-from numpy.testing import assert_allclose, assert_equal
-import matplotlib.pyplot as plt
-from .. import utils
+# TODO: matplotlib-build-wip
+from nose.plugins.attrib import attr
+from plotly.tools import _matplotlylib_imported
 
+if _matplotlylib_imported:
+    from numpy.testing import assert_allclose, assert_equal
+    import matplotlib.pyplot as plt
+    from .. import utils
 
+@attr('matplotlib')
 def test_path_data():
     circle = plt.Circle((0, 0), 1)
     vertices, codes = utils.SVG_path(circle.get_path())

plotly/tests/test_optional/optional_utils.py

@@ -1,15 +1,18 @@
 from __future__ import absolute_import
 
-import matplotlib
-# Force matplotlib to not use any Xwindows backend.
-matplotlib.use('Agg')
-
 import numpy as np
 
-from plotly.matplotlylib import Exporter, PlotlyRenderer
 from plotly.tests.utils import is_num_list
 from plotly.utils import get_by_path, node_generator
 
+# TODO: matplotlib-build-wip
+from plotly.tools import _matplotlylib_imported
+if _matplotlylib_imported:
+    import matplotlib
+    # Force matplotlib to not use any Xwindows backend.
+    matplotlib.use('Agg')
+    from plotly.matplotlylib import Exporter, PlotlyRenderer
+
 
 def run_fig(fig):
     renderer = PlotlyRenderer()

plotly/tests/test_optional/test_matplotlylib/test_annotations.py

@@ -1,15 +1,22 @@
 from __future__ import absolute_import
 
-import matplotlib
-# Force matplotlib to not use any Xwindows backend.
-matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from nose.plugins.attrib import attr
 
-from plotly.tests.utils import compare_dict
-from plotly.tests.test_optional.optional_utils import run_fig
-from plotly.tests.test_optional.test_matplotlylib.data.annotations import *
+# TODO: matplotlib-build-wip
+from plotly.tools import _matplotlylib_imported
 
+if _matplotlylib_imported:
+    import matplotlib
+    # Force matplotlib to not use any Xwindows backend.
+    matplotlib.use('Agg')
+    import matplotlib.pyplot as plt
 
+    from plotly.tests.utils import compare_dict
+    from plotly.tests.test_optional.optional_utils import run_fig
+    from plotly.tests.test_optional.test_matplotlylib.data.annotations import *
+
+
+@attr('matplotlib')
 def test_annotations():
     fig, ax = plt.subplots()
     ax.plot([1, 2, 3], 'b-')

plotly/tests/test_optional/test_matplotlylib/test_axis_scales.py

@@ -1,15 +1,22 @@
 from __future__ import absolute_import
 
-import matplotlib
-# Force matplotlib to not use any Xwindows backend.
-matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from nose.plugins.attrib import attr
 
 from plotly.tests.utils import compare_dict
 from plotly.tests.test_optional.optional_utils import run_fig
 from plotly.tests.test_optional.test_matplotlylib.data.axis_scales import *
 
+# TODO: matplotlib-build-wip
+from plotly.tools import _matplotlylib_imported
 
+if _matplotlylib_imported:
+    import matplotlib
+    # Force matplotlib to not use any Xwindows backend.
+    matplotlib.use('Agg')
+    import matplotlib.pyplot as plt
+
+
+@attr('matplotlib')
 def test_even_linear_scale():
     fig, ax = plt.subplots()
     x = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

plotly/tests/test_optional/test_matplotlylib/test_bars.py

@@ -1,15 +1,22 @@
 from __future__ import absolute_import
 
-import matplotlib
-# Force matplotlib to not use any Xwindows backend.
-matplotlib.use('Agg')
-import matplotlib.pyplot as plt
+from nose.plugins.attrib import attr
 
 from plotly.tests.utils import compare_dict
 from plotly.tests.test_optional.optional_utils import run_fig
 from plotly.tests.test_optional.test_matplotlylib.data.bars import *
 
+# TODO: matplotlib-build-wip
+from plotly.tools import _matplotlylib_imported
+if _matplotlylib_imported:
+    import matplotlib
 
+    # Force matplotlib to not use any Xwindows backend.
+    matplotlib.use('Agg')
+    import matplotlib.pyplot as plt
+
+
+@attr('matplotlib')
 def test_vertical_bar():
     fig, ax = plt.subplots()
     ax.bar(left=D['left'], height=D['height'])
@@ -23,6 +30,7 @@ def test_vertical_bar():
     assert equivalent, msg
 
 
+@attr('matplotlib')
 def test_horizontal_bar():
     fig, ax = plt.subplots()
     ax.barh(bottom=D['bottom'], width=D['width'])
@@ -36,6 +44,7 @@ def test_horizontal_bar():
     assert equivalent, msg
 
 
+@attr('matplotlib')
 def test_h_and_v_bars():
     fig, ax = plt.subplots()
     ax.bar(left=D['multi_left'], height=D['multi_height'],