Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1546e0f

Browse files
theengineeartheengineear
committed
Merge branch 'master' into version-bump
2 parents 5ac264f + dcaa7aa commit 1546e0f

File tree

16 files changed

+134
-123
lines changed

16 files changed

+134
-123
lines changed

‎circle.yml

Lines 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

Lines 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

Lines 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

Lines 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/tests/test_core/test_graph_objs/nose_tools.py

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎plotly/tests/test_optional/optional_utils.py

Lines 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

Lines 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

Lines 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

Lines 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'],

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
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.test_optional.optional_utils import run_fig
96
from plotly.tests.test_optional.test_matplotlylib.data.data import *
107

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

13+
# Force matplotlib to not use any Xwindows backend.
14+
matplotlib.use('Agg')
15+
import matplotlib.pyplot as plt
16+
17+
18+
@attr('matplotlib')
1219
def test_line_data():
1320
fig, ax = plt.subplots()
1421
ax.plot(D['x1'], D['y1'])
@@ -21,6 +28,7 @@ def test_line_data():
2128
renderer.plotly_fig['data'][0]['y']) + ' is not ' + str(D['y1'])
2229

2330

31+
@attr('matplotlib')
2432
def test_lines_data():
2533
fig, ax = plt.subplots()
2634
ax.plot(D['x1'], D['y1'])
@@ -40,6 +48,7 @@ def test_lines_data():
4048
renderer.plotly_fig['data'][0]['y']) + ' is not ' + str(D['y2'])
4149

4250

51+
@attr('matplotlib')
4352
def test_bar_data():
4453
fig, ax = plt.subplots()
4554
ax.bar(D['x1'], D['y1'])
@@ -49,6 +58,7 @@ def test_bar_data():
4958
renderer.plotly_fig['data'][0]['y']) + ' is not ' + str(D['y1'])
5059

5160

61+
@attr('matplotlib')
5262
def test_bars_data():
5363
fig, ax = plt.subplots()
5464
ax.bar(D['x1'], D['y1'], color='r')

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@
44
import random
55
from unittest import TestCase
66

7-
import matplotlib
8-
# Force matplotlib to not use any Xwindows backend.
9-
matplotlib.use('Agg')
10-
from matplotlib.dates import date2num
11-
import matplotlib.pyplot as plt
127
import pandas as pd
8+
from nose.plugins.attrib import attr
139

1410
import plotly.tools as tls
1511

12+
# TODO: matplotlib-build-wip
13+
from plotly.tools import _matplotlylib_imported
14+
if _matplotlylib_imported:
15+
import matplotlib
1616

17+
# Force matplotlib to not use any Xwindows backend.
18+
matplotlib.use('Agg')
19+
from matplotlib.dates import date2num
20+
import matplotlib.pyplot as plt
21+
22+
23+
@attr('matplotlib')
1724
class TestDateTimes(TestCase):
25+
1826
def test_normal_mpl_dates(self):
1927
datetime_format = '%Y-%m-%d %H:%M:%S'
2028
y = [1, 2, 3, 4]

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

Lines changed: 12 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.lines 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_simple_line():
1421
fig, ax = plt.subplots()
1522
ax.plot(D['x1'], D['y1'], label='simple')
@@ -22,6 +29,7 @@ def test_simple_line():
2229
assert equivalent, msg
2330

2431

32+
@attr('matplotlib')
2533
def test_complicated_line():
2634
fig, ax = plt.subplots()
2735
ax.plot(D['x1'], D['y1'], 'ro', markersize=10, alpha=.5, label='one')

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

Lines changed: 12 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.scatter 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_simple_scatter():
1421
fig, ax = plt.subplots()
1522
ax.scatter(D['x1'], D['y1'])
@@ -23,6 +30,7 @@ def test_simple_scatter():
2330
assert equivalent, msg
2431

2532

33+
@attr('matplotlib')
2634
def test_double_scatter():
2735
fig, ax = plt.subplots()
2836
ax.scatter(D['x1'], D['y1'], color='red', s=121, marker='^', alpha=0.5)

0 commit comments

Comments
 (0)