node-gyp - npm Package Compare versions

Comparing version 5.0.5 to 6.0.0

CHANGELOG.md

@@ -0,1 +1,10 @@
+v6.0.0 2019-10-04
+=================
+
+* [[`dd0e97ef0b`](https://github.com/nodejs/node-gyp/commit/dd0e97ef0b)] - **(SEMVER-MAJOR)** **lib**: try to find `python` after `python3` (Sam Roberts) [#1907](https://github.com/nodejs/node-gyp/pull/1907)
+* [[`f60ed47d14`](https://github.com/nodejs/node-gyp/commit/f60ed47d14)] - **travis**: add Python 3.5 and 3.6 tests on Linux (Christian Clauss) [#1903](https://github.com/nodejs/node-gyp/pull/1903)
+* [[`c763ca1838`](https://github.com/nodejs/node-gyp/commit/c763ca1838)] - **(SEMVER-MAJOR)** **doc**: Declare that node-gyp is Python 3 compatible (cclauss) [#1811](https://github.com/nodejs/node-gyp/pull/1811)
+* [[`3d1c60ab81`](https://github.com/nodejs/node-gyp/commit/3d1c60ab81)] - **(SEMVER-MAJOR)** **lib**: accept Python 3 by default (João Reis) [#1844](https://github.com/nodejs/node-gyp/pull/1844)
+* [[`c6e3b65a23`](https://github.com/nodejs/node-gyp/commit/c6e3b65a23)] - **(SEMVER-MAJOR)** **lib**: raise the minimum Python version from 2.6 to 2.7 (cclauss) [#1818](https://github.com/nodejs/node-gyp/pull/1818)
+
 v5.0.5 2019-10-04
@@ -2,0 +11,0 @@ =================

lib/find-python.js

@@ -21,3 +21,3 @@ 'use strict'
   argsVersion: ['-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);'],
-  semverRange: '^2.6.0 || >=3.5.0',
+  semverRange: '2.7.x || >=3.5.0',
 
@@ -30,4 +30,4 @@ // These can be overridden for testing:
   winDefaultLocations: [
-    path.join(process.env.SystemDrive || 'C:', 'Python27', 'python.exe'),
-    path.join(process.env.SystemDrive || 'C:', 'Python37', 'python.exe')
+    path.join(process.env.SystemDrive || 'C:', 'Python37', 'python.exe'),
+    path.join(process.env.SystemDrive || 'C:', 'Python27', 'python.exe')
   ],
@@ -93,2 +93,7 @@
         {
+          before: () => { this.addLog('checking if "python3" can be used') },
+          check: this.checkCommand,
+          arg: 'python3'
+        },
+        {
           before: () => { this.addLog('checking if "python" can be used') },
@@ -102,7 +107,2 @@ check: this.checkCommand,
           arg: 'python2'
-        },
-        {
-          before: () => { this.addLog('checking if "python3" can be used') },
-          check: this.checkCommand,
-          arg: 'python3'
         }
@@ -112,9 +112,2 @@ ]
       if (this.win) {
-        checks.push({
-          before: () => {
-            this.addLog(
-              'checking if the py launcher can be used to find Python 2')
-          },
-          check: this.checkPyLauncher
-        })
         for (var i = 0; i < this.winDefaultLocations.length; ++i) {
@@ -131,2 +124,9 @@ const location = this.winDefaultLocations[i]
         }
+        checks.push({
+          before: () => {
+            this.addLog(
+              'checking if the py launcher can be used to find Python 2')
+          },
+          check: this.checkPyLauncher
+        })
       }
@@ -133,0 +133,0 @@

package.json

@@ -14,3 +14,3 @@ {
   ],
-  "version": "5.0.5",
+  "version": "6.0.0",
   "installVersion": 9,
@@ -17,0 +17,0 @@ "author": "Nathan Rajlich <[e-mail]> (http://tootallnate.net)",

README.md

@@ -37,3 +37,3 @@ # `node-gyp` - Node.js native addon build tool
 
-   * Python v2.7, v3.5, v3.6, or v3.7
+   * `Python v2.7, v3.5, v3.6, or v3.7`
    * `make`
@@ -44,3 +44,3 @@ * A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
 
-   * Python v2.7, v3.5, v3.6, or v3.7
+   * `Python v2.7, v3.5, v3.6, or v3.7`
    * [Xcode](https://developer.apple.com/xcode/download/)
@@ -47,0 +47,0 @@ * You also need to install the `XCode Command Line Tools` by running `xcode-select --install`. Alternatively, if you already have the full Xcode installed, you can find them under the menu `Xcode -> Open Developer Tool -> More Developer Tools...`. This step will install `clang`, `clang++`, and `make`.

test/test-find-python.js

@@ -162,2 +162,4 @@ 'use strict'
       cb(new Error('not found'))
+    } else if (f.winDefaultLocations.includes(program)) {
+      cb(new Error('not found'))
     } else if (/sys\.version_info/.test(args[args.length - 1])) {
@@ -182,5 +184,5 @@ if (program === 'Z:\\snake.exe') {
 test('find python - no python, no python launcher, good guess', function (t) {
-  t.plan(4)
+  t.plan(2)
 
-  var re = /C:[\\/]Python27[\\/]python[.]exe/
+  var re = /C:[\\/]Python37[\\/]python[.]exe/
   var f = new TestPythonFinder(null, done)
@@ -191,8 +193,2 @@ f.win = true
     if (program === 'py.exe') {
-      f.execFile = function (program, args, opts, cb) {
-        poison(f, 'execFile')
-        t.ok(re.test(program))
-        t.ok(/sys\.version_info/.test(args[args.length - 1]))
-        cb(null, '2.7.14')
-      }
       return cb(new Error('not found'))
@@ -202,2 +198,5 @@ }
       cb(new Error('not found'))
+    } else if (re.test(program) &&
+               /sys\.version_info/.test(args[args.length - 1])) {
+      cb(null, '3.7.3')
     } else {
@@ -204,0 +203,0 @@ t.fail()

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1756795

increased by0.06%

Worsened metrics

Lines of code

3991

decreased by-0.03%

No dependency changes