Skip to content

Commit fede9ef

Browse files
committed
reverted to using retrying in chart-studio due to test failures
1 parent 8cdc3b4 commit fede9ef

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

Diff for: .circleci/create_conda_optional_env.sh

+1-1
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 tenacity psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets statsmodels
19+
requests nbformat six retrying tenacity 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

Diff for: packages/python/chart-studio/chart_studio/api/v2/utils.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import requests
44
import json as _json
55
from requests.exceptions import RequestException
6-
import tenacity
6+
from retrying import retry
77

88
import _plotly_utils.exceptions
99
from chart_studio import config, exceptions
@@ -129,10 +129,11 @@ def should_retry(exception):
129129
return False
130130

131131

132-
@tenacity.retry(
133-
wait=tenacity.wait_exponential(multiplier=1000, max=16000),
134-
stop=tenacity.stop_after_delay(180000),
135-
retry=tenacity.retry_if_exception(should_retry),
132+
@retry(
133+
wait_exponential_multiplier=1000,
134+
wait_exponential_max=16000,
135+
stop_max_delay=180000,
136+
retry_on_exception=should_retry,
136137
)
137138
def request(method, url, **kwargs):
138139
"""

Diff for: packages/python/chart-studio/tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ deps=
5656
requests==2.12.4
5757
six==1.10.0
5858
pytz==2016.10
59-
tenacity==6.2.0
59+
retrying==1.3.3
6060
pytest==3.5.1
6161
backports.tempfile==1.0
6262
pandas==0.23.2
63-
numpy==1.14.3
63+
; numpy==1.14.3
6464
ipywidgets==7.2.0
6565
matplotlib==2.2.3
6666
--editable=file:///{toxinidir}/../plotly

0 commit comments

Comments
 (0)