Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonmmease merged 10 commits into from
Apr 22, 2021
Merged

Replaced 'retrying' dependency with 'tenacity' in plotly package #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc2f230
replaced retrying dependency with tenacity in plotly package
jmsmdy Nov 17, 2020
dc0412c
Replaced retrying depedency in chart-studio with tenacity. Updated cr…
jmsmdy Dec 7, 2020
a47e932
Simplified tenacity code and fixed mistake with tenacity retry_if_exc…
jmsmdy Dec 7, 2020
6258434
added jinja templates to fix nbconvert incompatibility in CircleCI
jmsmdy Dec 7, 2020
8cdc3b4
changed requirements.txt to include six=1.15.0
jmsmdy Dec 8, 2020
fede9ef
reverted to using retrying in chart-studio due to test failures
jmsmdy Dec 8, 2020
224d0d2
removed jinja templates in doc
jmsmdy Dec 11, 2020
597aa98
removed previously added jinja templated missed by previous commit
jmsmdy Dec 11, 2020
58c3a22
reverted unneeded change to chart-studio tox.ini
jmsmdy Dec 16, 2020
01e2afe
reverted unneeded change to chart-studio setup.py
jmsmdy Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .circleci/create_conda_optional_env.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
12 changes: 7 additions & 5 deletions packages/python/plotly/plotly/io/_orca.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/python/plotly/recipe/meta.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
- setuptools
run:
- python
- retrying >=1.3.3
- tenacity >=6.2.0
- six

test:
Expand Down
4 changes: 2 additions & 2 deletions packages/python/plotly/requirements.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
2 changes: 1 addition & 1 deletion packages/python/plotly/setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down
2 changes: 1 addition & 1 deletion packages/python/plotly/tox.ini
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Replaced 'retrying' dependency with 'tenacity' in plotly package#2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jonmmease
merged 10 commits into

from

Apr 22, 2021
 Merged


Replaced 'retrying' dependency with 'tenacity' in plotly package
#2911
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
cc2f230

replaced retrying dependency with tenacity in plotly package


jmsmdy Nov 17, 2020
dc0412c

Replaced retrying depedency in chart-studio with tenacity. Updated cr…


jmsmdy Dec 7, 2020
a47e932

Simplified tenacity code and fixed mistake with tenacity retry_if_exc…


jmsmdy Dec 7, 2020
6258434

added jinja templates to fix nbconvert incompatibility in CircleCI


jmsmdy Dec 7, 2020
8cdc3b4

changed requirements.txt to include six=1.15.0


jmsmdy Dec 8, 2020
fede9ef

reverted to using retrying in chart-studio due to test failures


jmsmdy Dec 8, 2020
224d0d2

removed jinja templates in doc


jmsmdy Dec 11, 2020
597aa98

removed previously added jinja templated missed by previous commit


jmsmdy Dec 11, 2020
58c3a22

reverted unneeded change to chart-studio tox.ini


jmsmdy Dec 16, 2020
01e2afe

reverted unneeded change to chart-studio setup.py


jmsmdy Dec 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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"
Expand Down

2 changes: 1 addition & 1 deletion
.circleci/create_conda_optional_env.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

12 changes: 7 additions & 5 deletions
packages/python/plotly/plotly/io/_orca.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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
"""
Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/recipe/meta.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ requirements:
 - setuptools
 run:
 - python
 - retrying >=1.3.3
 - tenacity >=6.2.0
 - six

test:
Expand Down

4 changes: 2 additions & 2 deletions
packages/python/plotly/requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

2 changes: 1 addition & 1 deletion
packages/python/plotly/setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -505,7 +505,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"]),
Expand Down

2 changes: 1 addition & 1 deletion
packages/python/plotly/tox.ini

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down