Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0d49812

Browse filesBrowse files
theengineeartheengineear
committed
Merge pull request plotly#333 from plotly/update-circle
Don’t hard-code repo name in circle-stuff.
2 parents a4a62e3 + 332f496 commit 0d49812
Copy full SHA for 0d49812

File tree

18 files changed

+168
-134
lines changed
Filter options

18 files changed

+168
-134
lines changed

‎circle.yml

Copy file name to clipboardExpand all lines: circle.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ machine:
22

33
environment:
44

5-
PLOTLY_PACKAGE_ROOT: /home/ubuntu/python-api
5+
PLOTLY_PACKAGE_ROOT: /home/ubuntu/${CIRCLE_PROJECT_REPONAME}
66
PLOTLY_CONFIG_DIR: ${HOME}/.plotly
77
PLOTLY_PYTHON_VERSIONS: 2.7.8 3.3.3 3.4.1
88
PLOTLY_CORE_REQUIREMENTS_FILE: ${PLOTLY_PACKAGE_ROOT}/requirements.txt

‎circle/test.sh

Copy file name to clipboardExpand all lines: circle/test.sh
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
4141
error_exit "${SIG} ${LINENO}: can't import plotly package"
4242

4343
echo "${SIG} Running tests for Python ${version} as user '$(whoami)'."
44-
nosetests -x plotly/tests ||
44+
nosetests -x -a '!matplotlib' plotly/tests ||
4545
error_exit "${SIG} ${LINENO}: test suite failed for Python ${version}"
4646

4747
done

‎optional-requirements.txt

Copy file name to clipboardExpand all lines: optional-requirements.txt
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
numpy
1010

1111
## matplotlylib dependencies ##
12-
matplotlib==1.3.1
12+
# matplotlib==1.3.1
1313

1414
## testing dependencies ##
1515
nose==1.3.3
1616

1717
## ipython dependencies ##
18-
ipython[all]
18+
ipython[all]==3.0.0
1919

2020
## pandas deps for some matplotlib functionality ##
2121
pandas

‎plotly/graph_reference/default-schema.json

Copy file name to clipboardExpand all lines: plotly/graph_reference/default-schema.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4737,7 +4737,7 @@
47374737
"valType": "color"
47384738
},
47394739
"outliercolor": {
4740-
"description": "Sets the border line color of the outlier sample points.",
4740+
"description": "Sets the border line color of the outlier sample points. Defaults to marker.color",
47414741
"role": "style",
47424742
"valType": "color"
47434743
},
@@ -4769,7 +4769,7 @@
47694769
},
47704770
"outliercolor": {
47714771
"description": "Sets the color of the outlier sample points.",
4772-
"dflt": "rgba(0,0,0,0)",
4772+
"dflt": "rgba(0, 0, 0, 0)",
47734773
"role": "style",
47744774
"valType": "color"
47754775
},

‎plotly/matplotlylib/mplexporter/tests/test_basic.py

Copy file name to clipboardExpand all lines: plotly/matplotlylib/mplexporter/tests/test_basic.py
+26-8Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
1-
from ..exporter import Exporter
2-
from ..renderers import FakeRenderer, FullFakeRenderer
1+
# TODO: matplotlib-build-wip
2+
from nose.plugins.attrib import attr
3+
from plotly.tools import _matplotlylib_imported
34

4-
import matplotlib
5-
matplotlib.use('Agg')
6-
import matplotlib.pyplot as plt
5+
if _matplotlylib_imported:
6+
from ..exporter import Exporter
7+
from ..renderers import FakeRenderer, FullFakeRenderer
78

8-
import numpy as np
9-
from numpy.testing import assert_warns
9+
import matplotlib
10+
matplotlib.use('Agg')
11+
import matplotlib.pyplot as plt
1012

13+
import numpy as np
14+
from numpy.testing import assert_warns
1115

16+
17+
@attr('matplotlib')
1218
def fake_renderer_output(fig, Renderer):
1319
renderer = Renderer()
1420
exporter = Exporter(renderer)
1521
exporter.run(fig)
1622
return renderer.output
1723

1824

25+
@attr('matplotlib')
1926
def _assert_output_equal(text1, text2):
2027
for line1, line2 in zip(text1.strip().split(), text2.strip().split()):
2128
assert line1 == line2
2229

2330

31+
@attr('matplotlib')
2432
def test_lines():
2533
fig, ax = plt.subplots()
2634
ax.plot(range(20), '-k')
@@ -44,6 +52,7 @@ def test_lines():
4452
""")
4553

4654

55+
@attr('matplotlib')
4756
def test_markers():
4857
fig, ax = plt.subplots()
4958
ax.plot(range(2), 'ok')
@@ -68,6 +77,7 @@ def test_markers():
6877
""")
6978

7079

80+
@attr('matplotlib')
7181
def test_path_collection():
7282
fig, ax = plt.subplots()
7383
ax.scatter(range(3), range(3))
@@ -93,6 +103,7 @@ def test_path_collection():
93103
""")
94104

95105

106+
@attr('matplotlib')
96107
def test_text():
97108
fig, ax = plt.subplots()
98109
ax.set_xlabel("my x label")
@@ -113,6 +124,7 @@ def test_text():
113124
""")
114125

115126

127+
@attr('matplotlib')
116128
def test_path():
117129
fig, ax = plt.subplots()
118130
ax.add_patch(plt.Circle((0, 0), 1))
@@ -129,6 +141,7 @@ def test_path():
129141
""")
130142

131143

144+
@attr('matplotlib')
132145
def test_multiaxes():
133146
fig, ax = plt.subplots(2)
134147
ax[0].plot(range(4))
@@ -147,6 +160,7 @@ def test_multiaxes():
147160
""")
148161

149162

163+
@attr('matplotlib')
150164
def test_image():
151165
np.random.seed(0) # image size depends on the seed
152166
fig, ax = plt.subplots()
@@ -163,6 +177,7 @@ def test_image():
163177
""")
164178

165179

180+
@attr('matplotlib')
166181
def test_legend():
167182
fig, ax = plt.subplots()
168183
ax.plot([1,2,3], label='label')
@@ -178,6 +193,8 @@ def test_legend():
178193
closing figure
179194
""")
180195

196+
197+
@attr('matplotlib')
181198
def test_legend_dots():
182199
fig, ax = plt.subplots()
183200
ax.plot([1,2,3], label='label')
@@ -200,8 +217,9 @@ def test_legend_dots():
200217
closing figure
201218
""")
202219

220+
221+
@attr('matplotlib')
203222
def test_blended():
204223
fig, ax = plt.subplots()
205224
ax.axvline(0)
206225
assert_warns(UserWarning, fake_renderer_output, fig, FakeRenderer)
207-

‎plotly/matplotlylib/mplexporter/tests/test_utils.py

Copy file name to clipboardExpand all lines: plotly/matplotlylib/mplexporter/tests/test_utils.py
+8-3Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
from numpy.testing import assert_allclose, assert_equal
2-
import matplotlib.pyplot as plt
3-
from .. import utils
1+
# TODO: matplotlib-build-wip
2+
from nose.plugins.attrib import attr
3+
from plotly.tools import _matplotlylib_imported
44

5+
if _matplotlylib_imported:
6+
from numpy.testing import assert_allclose, assert_equal
7+
import matplotlib.pyplot as plt
8+
from .. import utils
59

10+
@attr('matplotlib')
611
def test_path_data():
712
circle = plt.Circle((0, 0), 1)
813
vertices, codes = utils.SVG_path(circle.get_path())

‎plotly/tests/test_core/test_graph_objs/nose_tools.py

Copy file name to clipboardExpand all lines: plotly/tests/test_core/test_graph_objs/nose_tools.py
-67Lines changed: 0 additions & 67 deletions
This file was deleted.

‎plotly/tests/test_optional/optional_utils.py

Copy file name to clipboardExpand all lines: plotly/tests/test_optional/optional_utils.py
+8-5Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
from __future__ import absolute_import
22

3-
import matplotlib
4-
# Force matplotlib to not use any Xwindows backend.
5-
matplotlib.use('Agg')
6-
73
import numpy as np
84

9-
from plotly.matplotlylib import Exporter, PlotlyRenderer
105
from plotly.tests.utils import is_num_list
116
from plotly.utils import get_by_path, node_generator
127

8+
# TODO: matplotlib-build-wip
9+
from plotly.tools import _matplotlylib_imported
10+
if _matplotlylib_imported:
11+
import matplotlib
12+
# Force matplotlib to not use any Xwindows backend.
13+
matplotlib.use('Agg')
14+
from plotly.matplotlylib import Exporter, PlotlyRenderer
15+
1316

1417
def run_fig(fig):
1518
renderer = PlotlyRenderer()

‎plotly/tests/test_optional/test_matplotlylib/test_annotations.py

Copy file name to clipboardExpand all lines: plotly/tests/test_optional/test_matplotlylib/test_annotations.py
+14-7Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
from __future__ import absolute_import
22

3-
import matplotlib
4-
# Force matplotlib to not use any Xwindows backend.
5-
matplotlib.use('Agg')
6-
import matplotlib.pyplot as plt
3+
from nose.plugins.attrib import attr
74

8-
from plotly.tests.utils import compare_dict
9-
from plotly.tests.test_optional.optional_utils import run_fig
10-
from plotly.tests.test_optional.test_matplotlylib.data.annotations import *
5+
# TODO: matplotlib-build-wip
6+
from plotly.tools import _matplotlylib_imported
117

8+
if _matplotlylib_imported:
9+
import matplotlib
10+
# Force matplotlib to not use any Xwindows backend.
11+
matplotlib.use('Agg')
12+
import matplotlib.pyplot as plt
1213

14+
from plotly.tests.utils import compare_dict
15+
from plotly.tests.test_optional.optional_utils import run_fig
16+
from plotly.tests.test_optional.test_matplotlylib.data.annotations import *
17+
18+
19+
@attr('matplotlib')
1320
def test_annotations():
1421
fig, ax = plt.subplots()
1522
ax.plot([1, 2, 3], 'b-')

‎plotly/tests/test_optional/test_matplotlylib/test_axis_scales.py

Copy file name to clipboardExpand all lines: plotly/tests/test_optional/test_matplotlylib/test_axis_scales.py
+11-4Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
from __future__ import absolute_import
22

3-
import matplotlib
4-
# Force matplotlib to not use any Xwindows backend.
5-
matplotlib.use('Agg')
6-
import matplotlib.pyplot as plt
3+
from nose.plugins.attrib import attr
74

85
from plotly.tests.utils import compare_dict
96
from plotly.tests.test_optional.optional_utils import run_fig
107
from plotly.tests.test_optional.test_matplotlylib.data.axis_scales import *
118

9+
# TODO: matplotlib-build-wip
10+
from plotly.tools import _matplotlylib_imported
1211

12+
if _matplotlylib_imported:
13+
import matplotlib
14+
# Force matplotlib to not use any Xwindows backend.
15+
matplotlib.use('Agg')
16+
import matplotlib.pyplot as plt
17+
18+
19+
@attr('matplotlib')
1320
def test_even_linear_scale():
1421
fig, ax = plt.subplots()
1522
x = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

‎plotly/tests/test_optional/test_matplotlylib/test_bars.py

Copy file name to clipboardExpand all lines: plotly/tests/test_optional/test_matplotlylib/test_bars.py
+13-4Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
from __future__ import absolute_import
22

3-
import matplotlib
4-
# Force matplotlib to not use any Xwindows backend.
5-
matplotlib.use('Agg')
6-
import matplotlib.pyplot as plt
3+
from nose.plugins.attrib import attr
74

85
from plotly.tests.utils import compare_dict
96
from plotly.tests.test_optional.optional_utils import run_fig
107
from plotly.tests.test_optional.test_matplotlylib.data.bars import *
118

9+
# TODO: matplotlib-build-wip
10+
from plotly.tools import _matplotlylib_imported
11+
if _matplotlylib_imported:
12+
import matplotlib
1213

14+
# Force matplotlib to not use any Xwindows backend.
15+
matplotlib.use('Agg')
16+
import matplotlib.pyplot as plt
17+
18+
19+
@attr('matplotlib')
1320
def test_vertical_bar():
1421
fig, ax = plt.subplots()
1522
ax.bar(left=D['left'], height=D['height'])
@@ -23,6 +30,7 @@ def test_vertical_bar():
2330
assert equivalent, msg
2431

2532

33+
@attr('matplotlib')
2634
def test_horizontal_bar():
2735
fig, ax = plt.subplots()
2836
ax.barh(bottom=D['bottom'], width=D['width'])
@@ -36,6 +44,7 @@ def test_horizontal_bar():
3644
assert equivalent, msg
3745

3846

47+
@attr('matplotlib')
3948
def test_h_and_v_bars():
4049
fig, ax = plt.subplots()
4150
ax.bar(left=D['multi_left'], height=D['multi_height'],

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.