Replaced retrying depedency in chart-studio with tenacity. Updated create_conda_optional_env.sh to reflect change in dependencies. Reformated _orca.py with black.

Author: jmsmdy

Diff for: .circleci/config.yml

@@ -327,7 +327,7 @@ jobs:
       - checkout
       - run:
           name: Install tox
-          command: "sudo pip install retrying tox black inflect"
+          command: "sudo pip install tenacity tox black inflect"
       - run:
           name: Update jupyterlab-plotly version
           command: "cd packages/python/plotly; python setup.py updateplotlywidgetversion"

Diff for: .circleci/create_conda_optional_env.sh

@@ -16,7 +16,7 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
     # Create environment
     # PYTHON_VERSION=2.7 or 3.5
     $HOME/miniconda/bin/conda create -n circle_optional --yes python=$PYTHON_VERSION \
-requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets statsmodels
+requests nbformat six tenacity psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets statsmodels
 
     # Install orca into environment
     $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

@@ -3,7 +3,7 @@
 import requests
 import json as _json
 from requests.exceptions import RequestException
-from retrying import retry
+import tenacity
 
 import _plotly_utils.exceptions
 from chart_studio import config, exceptions
@@ -129,11 +129,10 @@ def should_retry(exception):
     return False
 
 
-@retry(
-    wait_exponential_multiplier=1000,
-    wait_exponential_max=16000,
-    stop_max_delay=180000,
-    retry_on_exception=should_retry,
+@tenacity.retry(
+    wait=tenacity.wait.wait_exponential(multiplier=1000, max=16000),
+    stop=tenacity.stop.stop_after_delay(180000),
+    retry=tenacity.retry.retry_if_exception(should_retry),
 )
 def request(method, url, **kwargs):
     """

Diff for: packages/python/chart-studio/setup.py

@@ -41,6 +41,6 @@ def readme():
         "chart_studio.plotly.chunked_requests",
         "chart_studio.presentation_objs",
     ],
-    install_requires=["plotly", "requests", "retrying>=1.3.3", "six"],
+    install_requires=["plotly", "requests", "tenacity>=6.2.0", "six"],
     zip_safe=False,
 )

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

@@ -56,7 +56,7 @@ deps=
     requests==2.12.4
     six==1.10.0
     pytz==2016.10
-    retrying==1.3.3
+    tenacity==6.2.0
     pytest==3.5.1
     backports.tempfile==1.0
     pandas==0.23.2

Diff for: packages/python/plotly/plotly/io/_orca.py

@@ -1451,7 +1451,10 @@ def ensure_server():
                 orca_state["shutdown_timer"] = t
 
 
-@tenacity.retry(wait=tenacity.wait.wait_random(min=5, max=10), stop=tenacity.stop.stop_after_delay(60000))
+@tenacity.retry(
+    wait=tenacity.wait.wait_random(min=5, max=10),
+    stop=tenacity.stop.stop_after_delay(60000),
+)
 def request_image_with_retrying(**kwargs):
     """
     Helper method to perform an image request to a running orca server process

Diff for: packages/python/plotly/tox.ini

@@ -55,7 +55,7 @@ deps=
     requests==2.12.4
     six==1.10.0
     pytz==2016.10
-    retrying==1.3.3
+    tenacity==6.2.0
     pytest==3.5.1
     pandas==0.24.2
     xarray==0.10.9