Require python 3.6 and CI maintenance - #3160

Merged
jonmmease merged 37 commits into
masterfrom
python3
Apr 22, 2021
Merged

Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom
python3

Conversation

@jonmmease

@jonmmeasejonmmease commented Apr 21, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.

Still to do in follow-on PR(s)

  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements

Addresses parts of #3159 and closes#3158

@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten mentioned this pull request Apr 21, 2021
Merged
8 tasks
@nicolaskruchten

nicolaskruchten commented Apr 21, 2021

Copy link
Copy Markdown
Contributor

This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911

@jonmmease

jonmmease commented Apr 22, 2021

Copy link
Copy Markdown
ContributorAuthor

Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.

@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease changed the title WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease

jonmmease commented Apr 22, 2021

Copy link
Copy Markdown
ContributorAuthor

ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.

@nicolaskruchten

nicolaskruchten commented Apr 22, 2021

Copy link
Copy Markdown
Contributor

💃

@jonmmease
jonmmease merged commit 70877b4 into masterApr 22, 2021
@jonmmease
jonmmease deleted the python3 branch April 22, 2021 13:42
@jonmmeasejonmmease mentioned this pull request Apr 22, 2021
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support

2 participants

@jonmmease@nicolaskruchten
, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten

, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten

, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten

, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten

, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten

, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten

, '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
Require python 3.6 and CI maintenance - #3160
Merged
jonmmease merged 37 commits into
masterfrom 
python3
Apr 22, 2021
Merged
Require python 3.6 and CI maintenance#3160
jonmmease merged 37 commits into
masterfrom 
python3
Conversation
@jonmmease
@jonmmeasejonmmease
commented
Apr 21, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
This PR removes support for Python versions prior to 3.6 and does some clean up of the CI test suite. In particular, it removes the use of tox and instead relies on a separate requirements.txt file for each Python version. This makes it possible to test different versions of dependencies.
Still to do in follow-on PR(s)
  • Remove use of six for Python 2/3 compatibility
  • Unify optional requirements and doc requirements
  • Unify dependencies for conda+orca test job with optional requirements
Addresses parts of #3159 and closes#3158
@jonmmease
Update setup.py to require Python>=3.6
699a925
@jonmmease
Add an f-string (compatible with python>=3.6) for good measure
5fae5e0
@jonmmease
remove pre 3.6 tests from tox and circleci
841da65
@jonmmease
First cut at abandoning tox
4608f1e
@jonmmease
Rename plot_ly in chart_studio in ci tests
3af133a
@jonmmease
Remove tox.ini files
028b960
@jonmmease
Move tests with pandas/numpy dependencies to test_optional, remove th…
b17d6ac
…ese from core requirements
@jonmmease
Move more px tests to optional
8d83a81
@jonmmease
increase optional timeout
9a5c76f
@jonmmease
Move another test with px to optional
1014fda
@jonmmease
blacken
3becff8
@jonmmease
Fix relative import
4effc46
@jonmmease
Move dependency check tests to optional
87d5d05
@jonmmease
more logging in optional test suite
ca57ddb
@jonmmease
Don't open browser window in matplotlylib test
0b92a0e
@jonmmease
Add Python 3.8 and 3.9 tests
b759248
The requirements.txt for these versions uses up-to-date dependency versions
@jonmmease
pull dependencies for conda test case from same option requirements.t…
8d013d1
…xt as the other tests
@jonmmease
fix indentation
7bdfcb0
@jonmmease
Activate conda environment before pip install
8d2ac6e
@jonmmease
Fix 3.8/3.9 ci images
0c85dc5
@jonmmease
Try again with pip install in conda environment
bf1d1d8
@jonmmease
Set pandas plotting backend explicitly
6c10e9b
@jonmmease
Fix working directory on pip install
7820bbc
@jonmmease
Don't fail on old versions of pandas
821231c
@jonmmease
path fix
331118e
@jonmmease
Don't fail on any exception when setting pandas backend
8623079
@jonmmease
blacken
cb0ff7c
@jonmmease
Another try
e0b6ce5
@jonmmease
Another try
94cdd99
@jonmmease
pip install into the right conda environment.
b072478
@nicolaskruchtennicolaskruchten
mentioned this pull request
Apr 21, 2021
 Merged

8 tasks
@nicolaskruchten
nicolaskruchten
commented
Apr 21, 2021

Copy link


Copy Markdown

Contributor
This PR looks fine to me, but I wonder if we shouldn't merge #2911 first and then bubble the retrying->tenacity changes through this PR prior to merge, to avoid making it harder to merge #2911
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
Yeah, that makes sense. I'll go ahead and merge #2911 and update this PR.
@jonmmease
Merge remote-tracking branch 'origin/master' into python3
d5d9ee6
# Conflicts:
#	.circleci/config.yml
#	packages/python/plotly/tox.ini
@jonmmeasejonmmease
changed the title
WIP to require python 3.6Require python 3.6 and CI maintenanceApr 22, 2021
@jonmmease
jonmmease
commented
Apr 22, 2021

Copy link


Copy Markdown

ContributorAuthor
ping @nicolaskruchten, I think this is ready to go now. I added a few notes above for some follow ups that we can do next.
@nicolaskruchten
nicolaskruchten
commented
Apr 22, 2021

Copy link


Copy Markdown

Contributor
💃
@jonmmease
jonmmease
merged commit 70877b4
into
masterApr 22, 2021
@jonmmease
jonmmease
deleted the

python3

branch
April 22, 2021 13:42
@jonmmeasejonmmease
mentioned this pull request
Apr 22, 2021
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Drop Python 2.7 and 3.5 support


2 participants

@jonmmease@nicolaskruchten