Merge remote-tracking branch 'origin/master' into python3

# Conflicts: # .circleci/config.yml # packages/python/plotly/tox.ini
plotly · jonmmease · Apr 22, 2021 · Apr 21, 2021 · Apr 21, 2021 · Apr 21, 2021
commit d5d9ee6c6f91910a8728ef52f2ed145a1f5fbe3e
diff --git a/.circleci/create_conda_optional_env.sh b/.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 retrying 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 --git a/doc/python/dot-plots.md b/doc/python/dot-plots.md
@@ -50,8 +50,8 @@ schools = ["Brown", "NYU", "Notre Dame", "Cornell", "Tufts", "Yale",
            "Princeton", "U.Penn", "Stanford", "MIT", "Harvard"]
 n_schools = len(schools)
 
-men_salary = [72, 67, 73, 80, 76, 79, 84, 78, 86, 93, 94, 90, 92, 96, 94, 112]
-women_salary = [92, 94, 100, 107, 112, 114, 114, 118, 119, 124, 131, 137, 141, 151, 152, 165]
+women_salary = [72, 67, 73, 80, 76, 79, 84, 78, 86, 93, 94, 90, 92, 96, 94, 112]
+men_salary = [92, 94, 100, 107, 112, 114, 114, 118, 119, 124, 131, 137, 141, 151, 152, 165]
 
 df = pd.DataFrame(dict(school=schools*2, salary=men_salary + women_salary,
                        gender=["Men"]*n_schools + ["Women"]*n_schools))
@@ -158,4 +158,4 @@ fig.show()
 
 ### Reference
 
-See https://plotly.com/python/reference/scatter/ for more information and chart attribute options!
+See https://plotly.com/python/reference/scatter/ for more information and chart attribute options!
diff --git a/packages/javascript/plotlywidget/package-lock.json b/packages/javascript/plotlywidget/package-lock.json
diff --git a/packages/python/plotly/plotly/io/_orca.py b/packages/python/plotly/plotly/io/_orca.py
@@ -11,7 +11,7 @@
 from copy import copy
 from contextlib import contextmanager
 
-import retrying
+import tenacity
 from six import string_types
 
 import _plotly_utils.utils
@@ -1173,11 +1173,11 @@ def validate_executable():
 
     >>> import plotly.io as pio
     >>> pio.orca.config.use_xvfb = True
-    
+
 You can save this configuration for use in future sessions as follows:
 
-    >>> pio.orca.config.save() 
-    
+    >>> pio.orca.config.save()
+
 See https://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml
 for more info on Xvfb
 """
@@ -1451,7 +1451,9 @@ def ensure_server():
                 orca_state["shutdown_timer"] = t
 
 
-@retrying.retry(wait_random_min=5, wait_random_max=10, stop_max_delay=60000)
+@tenacity.retry(
+    wait=tenacity.wait_random(min=5, max=10), stop=tenacity.stop_after_delay(60000),
+)
 def request_image_with_retrying(**kwargs):
     """
     Helper method to perform an image request to a running orca server process

diff --git a/packages/python/plotly/recipe/meta.yaml b/packages/python/plotly/recipe/meta.yaml
@@ -24,7 +24,7 @@ requirements:
     - setuptools
   run:
     - python
-    - retrying >=1.3.3
+    - tenacity >=6.2.0
     - six
 
 test:

diff --git a/packages/python/plotly/requirements.txt b/packages/python/plotly/requirements.txt
@@ -6,7 +6,7 @@
 ###################################################
 
 ## python 2 to 3 compatibility ##
-six==1.8.0
+six==1.15.0
 
 ## retrying requests ##
-retrying==1.3.3
+tenacity>=6.2.0
diff --git a/packages/python/plotly/setup.py b/packages/python/plotly/setup.py
@@ -502,7 +502,7 @@ def run(self):
         ),
         ("etc/jupyter/nbconfig/notebook.d", ["plotlywidget.json"]),
     ],
-    install_requires=["retrying>=1.3.3", "six"],
+    install_requires=["tenacity>=6.2.0", "six"],
     zip_safe=False,
     cmdclass=dict(
         build_py=js_prerelease(versioneer_cmds["build_py"]),

diff --git a/packages/python/plotly/test_requirements/requirements_36_core.txt b/packages/python/plotly/test_requirements/requirements_36_core.txt
@@ -1,4 +1,4 @@
 requests==2.12.4
 six==1.10.0
-retrying==1.3.3
+tenacity==6.2.0
 pytest==3.5.1
diff --git a/packages/python/plotly/test_requirements/requirements_36_optional.txt b/packages/python/plotly/test_requirements/requirements_36_optional.txt
@@ -1,6 +1,6 @@
 requests==2.12.4
 six==1.10.0
-retrying==1.3.3
+tenacity==6.2.0
 pandas==0.24.2
 numpy==1.19.5
 xarray==0.10.9

diff --git a/packages/python/plotly/test_requirements/requirements_37_core.txt b/packages/python/plotly/test_requirements/requirements_37_core.txt
@@ -1,4 +1,4 @@
 requests==2.12.4
 six==1.10.0
-retrying==1.3.3
+tenacity==6.2.0
 pytest==3.5.1
diff --git a/packages/python/plotly/test_requirements/requirements_37_optional.txt b/packages/python/plotly/test_requirements/requirements_37_optional.txt
@@ -1,6 +1,6 @@
 requests==2.12.4
 six==1.10.0
-retrying==1.3.3
+tenacity==6.2.0
 pandas==0.24.2
 numpy==1.19.5
 xarray==0.10.9

diff --git a/packages/python/plotly/test_requirements/requirements_38_core.txt b/packages/python/plotly/test_requirements/requirements_38_core.txt
@@ -1,4 +1,4 @@
 requests==2.25.1
 six==1.15.0
-retrying==1.3.3
+tenacity==6.2.0
 pytest==6.2.3
diff --git a/packages/python/plotly/test_requirements/requirements_38_optional.txt b/packages/python/plotly/test_requirements/requirements_38_optional.txt
@@ -1,6 +1,6 @@
 requests==2.25.1
 six==1.15.0
-retrying==1.3.3
+tenacity==6.2.0
 pandas==1.2.4
 numpy==1.20.2
 xarray==0.17.0

diff --git a/packages/python/plotly/test_requirements/requirements_39_core.txt b/packages/python/plotly/test_requirements/requirements_39_core.txt
@@ -1,4 +1,4 @@
 requests==2.25.1
 six==1.15.0
-retrying==1.3.3
+tenacity==6.2.0
 pytest==6.2.3
diff --git a/packages/python/plotly/test_requirements/requirements_39_optional.txt b/packages/python/plotly/test_requirements/requirements_39_optional.txt
@@ -1,6 +1,6 @@
 requests==2.25.1
 six==1.15.0
-retrying==1.3.3
+tenacity==6.2.0
 pandas==1.2.4
 numpy==1.20.2
 xarray==0.17.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ requirements: @@
         - setuptools
       run:
         - python
-        - retrying >=1.3.3
+        - tenacity >=6.2.0
         - six
     test:
@@ Expand Down @@