Commit 07f81f1

Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after Python 2. rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in .travis.yml from a previous commit while landing. Backport-of: #1844 PR-URL: #1910 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎.travis.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
- name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
- name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
- name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
- name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
- name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
- name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
- name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
- name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
- flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
- npm install
81+
- npm list
8282
script:
8383
- node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
- npm test

‎lib/find-python.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
: '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,

0 commit comments

Comments
 (0)
, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)

, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)

, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)

, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)

, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)

, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)

, '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
Commit 07f81f1
Browse files
sam-githubrvagg
sam-github
authored and
rvagg
committed
lib: accept Python 3 after Python 2
Python 3 is allowed as a compatible Python, but its looked for after
Python 2.
rvagg: removed additional EXPERIMENTAL_NODE_GYP_PYTHON3 in
.travis.yml from a previous commit while landing.
Backport-of: #1844
PR-URL: #1910
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: João Reis <reis@janeasystems.com>
1 parent 04ce59f commit 07f81f1
2 files changed
Lines changed: 15 additions & 11 deletions
File tree
‎.travis.yml‎
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,33 @@ matrix:
3131

3232
 - name: "Node.js 6 & Python 3.7 on Linux"
3333
python: 3.7
34-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
34+
env: NODE_GYP_FORCE_PYTHON=python3
3535
before_install: nvm install 6
3636
 - name: "Node.js 8 & Python 3.7 on Linux"
3737
python: 3.7
38-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
38+
env: NODE_GYP_FORCE_PYTHON=python3
3939
before_install: nvm install 8
4040
 - name: "Node.js 10 & Python 3.7 on Linux"
4141
python: 3.7
42-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
42+
env: NODE_GYP_FORCE_PYTHON=python3
4343
before_install: nvm install 10
4444
 - name: "Node.js 12 & Python 3.5 on Linux"
4545
python: 3.5
46-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
46+
env: NODE_GYP_FORCE_PYTHON=python3
4747
before_install: nvm install 12
4848
 - name: "Node.js 12 & Python 3.6 on Linux"
4949
python: 3.6
50-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
50+
env: NODE_GYP_FORCE_PYTHON=python3
5151
before_install: nvm install 12
5252
 - name: "Node.js 12 & Python 3.7 on Linux"
5353
python: 3.7
54-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
54+
env: NODE_GYP_FORCE_PYTHON=python3
5555
before_install: nvm install 12
5656
 - name: "Python 3.7 on macOS"
5757
os: osx
5858
#osx_image: xcode11
5959
language: shell # 'language: python' is not yet supported on macOS
60-
env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
60+
env: NODE_GYP_FORCE_PYTHON=python3
6161
before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
6262
 - name: "Node.js 12 & Python 3.7 on Windows"
6363
os: windows
@@ -66,7 +66,6 @@ matrix:
6666
env: >-
6767
 PATH=/c/Python37:/c/Python37/Scripts:$PATH
6868
 NODE_GYP_FORCE_PYTHON=/c/Python37/python.exe
69-
 EXPERIMENTAL_NODE_GYP_PYTHON3=1
7069
before_install: choco install python
7170

7271
install:
@@ -79,6 +78,7 @@ before_script:
7978
# exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
8079
 - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
8180
 - npm install
81+
 - npm list
8282
script:
8383
 - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
8484
 - npm test
‎lib/find-python.js‎
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PythonFinder.prototype = {
1818
log: logWithPrefix(log,'find Python'),
1919
argsExecutable: ['-c','import sys; print(sys.executable);'],
2020
argsVersion: ['-c','import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
21-
semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
22-
 : '>=2.6.0 <3.0.0',
21+
semverRange: '^2.6.0 || >=3.5.0',
2322

2423
// These can be overridden for testing:
2524
execFile: cp.execFile,
@@ -97,6 +96,11 @@ PythonFinder.prototype = {
9796
before: ()=>{this.addLog('checking if "python2" can be used')},
9897
check: this.checkCommand,
9998
arg: 'python2'
99+
},
100+
{
101+
before: ()=>{this.addLog('checking if "python3" can be used')},
102+
check: this.checkCommand,
103+
arg: 'python3'
100104
}
101105
]
102106

@@ -286,7 +290,7 @@ PythonFinder.prototype = {
286290
// X
287291
constinfo=[
288292
'**********************************************************',
289-
'You need to install the latest version of Python 2.7.',
293+
'You need to install the latest version of Python.',
290294
'Node-gyp should be able to find and use Python. If not,',
291295
'you can try one of the following options:',
292296
`- Use the switch --python="${pathExample}"`,
0 commit comments
Comments
 (0)