Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis
, '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

Fixed handling of missing python on Windows. - #1325

Closed
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master
Closed

Fixed handling of missing python on Windows. #1325
mvidmar wants to merge 11 commits into
nodejs:masterfrom
mvidmar:master

Conversation

@mvidmar

@mvidmarmvidmar commented Nov 4, 2017

Copy link
Copy Markdown
Checklist
  • npm install && npm test passes
  • tests are included
  • documentation is changed or added
  • commit message follows commit guidelines
Description of change

configure: fixing to better handle python badVersion on windows platform

  • invalid error message when python is found but is invalid version
    error returned: file not found but with valid file path which is
    confusing. error expected: invalid python version.
  • in case of invalid version on guessed path (python27) it goes into
    an endless loop (unlikely but an ugly error)

refs #1269

isaacsand others added 11 commits June 6, 2017 06:56
Tar version 3 performs better and is more well tested than its
predecessor. npm will be using this in the near future, so there is no
benefit in shipping a node-gyp that uses the slower and less reliable
fstream-based tar.
This drops support for node 0.x, and thus should be considered a
breaking semver-major change.
PR-URL: #1212
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
* dropping support for node < 4
* signal the CI not to test node < 4
If you're providing a path to a header tarball to install, you probably
want it to always be re-installed.
PR-URL: #1220Fixes: #1216
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
* test: build simple addon in path with non-ascii characters
* test: add test-charmap.py
PR-URL: #1203
Reviewed-By: Refael Ackermann <refack@gmail.com>
Enable linking to the platform specific installation instructions
PR-URL: #1225
Reviewed-By: Refael Ackermann <refack@gmail.com>
Lifted verbatim from
https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
then `s/Node.js/node-gyp/`.
PR-URL: #1229
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Give users reporting bugs a clearer idea of the info that will be
helpful when reporting issues.
PR-URL: #1228
Refs: https://github.com/nodejs/node/tree/master/.github
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
PR-URL: #1292
Refs: #1195 (comment)
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Initial work to add z/OS support to node-gyp.
PR-URL: #1276
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
GYP automatically turns variables ending in _dir, _file or _path into
absolute paths but didn't check for empty strings.
It interacted badly with variables inherited through the environment
from npm, the `scripts-prepend-node-path=false` setting in particular
because it is turned into `npm_config_script_prepend_node_path=`.
Fixes: #1217
PR-URL: #1267
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
… error message when python is found but invalid version (error returned: file not found with valid file path, expected: invalid python version). 2. in case of invalid version on guessed path (python27) it goes into an endless loop (unlikely but an ugly error)
@mvidmarmvidmar mentioned this pull request Nov 5, 2017
3 tasks
@refackrefack self-assigned this Nov 5, 2017
@refack

Copy link
Copy Markdown
Contributor

@refack

Copy link
Copy Markdown
Contributor

Hello @mvidmar and welcome! Thank you for the fix 🥇

Could you describe the situation that causes the endless recursion (I want to try to design a test around that)?

Also If you could adjust the commit message to our style guide (which is roughly based on node-core's)

@mvidmar

mvidmar commented Nov 5, 2017

Copy link
Copy Markdown
Author

Tried to fix the commit message according to the style guide, let me know if I missed something.

The loop happens on Windows when c:\Python27\python.exe is not a valid version (like I mentioned - unlikely but possible. Happened to me during trying to get an understanding of this code). The loop happens from checkPythonVersion, call to checkPythonLauncher, then guessPython, which finds the executable and then reruns checkPythonVersion. That's why I added an increase of checkPythonLauncherDepth within guessPython so it skips the fallback to checkPythonLauncher. If you remove that line and put an invalid version in c:\Python27\python.exe it loops.

I also merged our fixes in case you want to pull that instead of this fix. Since I noticed you modified some other stuff as well. Here is the merged fix with PR 1269 https://github.com/mvidmar/node-gyp/commit/9c7ad90d5caeb809580ec1620ef3853a677cb503

@rvagg

Copy link
Copy Markdown
Member

hi @mvidmar do you still want to pursue this? if so, rebase against master and let's sort out a few style nits and get some windows people involved again

@joaocgreis

Copy link
Copy Markdown
Member

The current code to find Python already includes both these features, I think this can be closed. If I missed something, please rebase on current master. Thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

17 participants

@mvidmar@refack@rvagg@joaocgreis@benjamn@jhenkens@JCMais@SimenB@limonte@cclauss@isaacs@gibfahn@lc-soft@nschonni@mikeal@jBarz@bnoordhuis