Skip to content

Commit eb3f8c5

Browse files
fixing CI
1 parent f36d5e0 commit eb3f8c5

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.circleci/create_conda_optional_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
1616
# Create environment
1717
# PYTHON_VERSION=2.7 or 3.5
1818
$HOME/miniconda/bin/conda create -n circle_optional --yes python=$PYTHON_VERSION \
19-
requests nbformat six retrying psutil pandas==1.0.3 decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets statsmodels
19+
requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets statsmodels
2020

2121
# Install orca into environment
2222
$HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca==1.3.1

packages/python/plotly/optional-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ colorcet
3636
ipython
3737

3838
## pandas deps for some matplotlib functionality ##
39-
pandas==1.0.3
39+
pandas
4040

4141
## scipy deps for some FigureFactory functions ##
4242
scipy

packages/python/plotly/plotly/tests/test_core/test_px/test_pandas_backend.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
(lambda df: df["A"].hist(), lambda df: px.histogram(df["A"])),
2525
],
2626
)
27+
@pytest.mark.skipif(
28+
not hasattr(pd.options.plotting, "backend"),
29+
reason="Currently installed pandas doesn't support plotting backends.",
30+
)
2731
def test_pandas_equiv(pandas_fn, px_fn):
2832
pd.options.plotting.backend = "plotly"
2933
df = pd.DataFrame(np.random.randn(100, 4), columns=list("ABCD")).cumsum()

packages/python/plotly/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ deps=
5757
pytz==2016.10
5858
retrying==1.3.3
5959
pytest==3.5.1
60-
pandas==1.0.3
60+
pandas==0.24.2
6161
xarray==0.10.9
6262
statsmodels==0.10.2
6363
backports.tempfile==1.0

0 commit comments

Comments
 (0)