[email protected] Release Proposal

.github/workflows/Python_tests.yml

@@ -0,0 +1,40 @@
+# TODO: Line 15, enable python-version: 3.5
+# TODO: Line 36, enable pytest --doctest-modules
+
+name: Python_tests
+on: [push, pull_request]
+jobs:
+ Python_tests:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ max-parallel: 15
+ matrix:
+ os: [macos-latest, ubuntu-latest, windows-latest]
+ python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
+ steps:
+ - uses: actions/checkout@v1
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v1
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ pip install flake8 pytest # -r requirements.txt
+ - name: Lint with flake8
+ if: matrix.os == 'ubuntu-latest'
+ run: |
+ # stop the build if there are Python syntax errors or undefined names
+ flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+ # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+ flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+ - name: Test with pytest (Linux and macOS)
+ if: matrix.os != 'windows-latest'
+ run: pytest
+ - name: Test with pytest (Windows)
+ if: matrix.os == 'windows-latest'
+ shell: bash
+ run: GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" pytest
+ # - name: Run doctests with pytest
+ # run: pytest --doctest-modules

.travis.yml

@@ -1,33 +1,17 @@
 dist: xenial
 language: python
 cache: pip
-matrix:
+addons:
+ homebrew:
+ update: true
+ packages:
+ - npm
+ - pyenv
+jobs:
  include:
  - name: "Python 2.7 on Linux"
  env: NODE_GYP_FORCE_PYTHON=python2
  python: 2.7
- - name: "Python 2.7 on macOS"
- os: osx
- osx_image: xcode11.2
- language: shell # 'language: python' is not yet supported on macOS
- env: NODE_GYP_FORCE_PYTHON=python2
- before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew install npm
- - name: "Node.js 6 & Python 2.7 on Windows"
- os: windows
- language: node_js
- node_js: 6 # node
- env: >-
- PATH=/c/Python27:/c/Python27/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe
- before_install: choco install python2
- - name: "Node.js 12 & Python 2.7 on Windows"
- os: windows
- language: node_js
- node_js: 12 # node
- env: >-
- PATH=/c/Python27:/c/Python27/Scripts:$PATH
- NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe
- before_install: choco install python2
 
  - name: "Node.js 6 & Python 3.8 on Linux"
  python: 3.8
@@ -58,12 +42,36 @@ matrix:
  env: NODE_GYP_FORCE_PYTHON=python3
  before_install: nvm install 12
 
- - name: "Python 3.7 on macOS"
+ - name: "Python 2.7 on macOS"
  os: osx
  osx_image: xcode11.2
  language: shell # 'language: python' is not yet supported on macOS
- env: NODE_GYP_FORCE_PYTHON=python3
- before_install: HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade npm || true
+ env: NODE_GYP_FORCE_PYTHON=python2 PATH=$HOME/.pyenv/shims:$PATH PYENV_VERSION=2.7.17
+ before_install: pyenv install $PYENV_VERSION
+ - name: "Python 3.8 on macOS"
+ os: osx
+ osx_image: xcode11.2
+ language: shell # 'language: python' is not yet supported on macOS
+ env: NODE_GYP_FORCE_PYTHON=python3 PATH=$HOME/.pyenv/shims:$PATH PYENV_VERSION=3.8.0
+ before_install: pyenv install $PYENV_VERSION
+
+ - name: "Node.js 6 & Python 2.7 on Windows"
+ os: windows
+ language: node_js
+ node_js: 6 # node
+ env: >-
+ PATH=/c/Python27:/c/Python27/Scripts:$PATH
+ NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe
+ before_install: choco install python2
+ - name: "Node.js 12 & Python 2.7 on Windows"
+ os: windows
+ language: node_js
+ node_js: 12 # node
+ env: >-
+ PATH=/c/Python27:/c/Python27/Scripts:$PATH
+ NODE_GYP_FORCE_PYTHON=/c/Python27/python.exe
+ before_install: choco install python2
+
  - name: "Node.js 12 & Python 3.7 on Windows"
  os: windows
  language: node_js
@@ -82,20 +90,19 @@ matrix:
  before_install: choco install python
 
 install:
- #- pip install -r requirements.txt
- - pip install --upgrade flake8 pytest==4.6.6 # pytest 5 no longer supports legacy Python
+ - python -m pip install --upgrade flake8 pytest==4.6.6 # pytest 5 no longer supports legacy Python
 before_script:
- - flake8 --version
+ - python -m flake8 --version
  # stop the build if there are Python syntax errors or undefined names
- - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+ - python -m flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
  # exit-zero treats all errors as warnings. Two space indentation is OK. The GitHub editor is 127 chars wide
- - flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
+ - python -m flake8 . --count --exit-zero --ignore=E111,E114,W503 --max-complexity=10 --max-line-length=127 --statistics
  - npm install
  - npm list
 script:
  - node -e 'require("npmlog").level="verbose"; require("./lib/find-python")(null,()=>{})'
  - npm test
- - GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" pytest
+ - GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" python -m pytest
 notifications:
  on_success: change
  on_failure: change # `always` will be the setting once code changes slow down

CHANGELOG.md

@@ -1,3 +1,26 @@
+v5.1.0 2020-02-03
+=================
+
+* [[`f37a8b40d0`](https://github.com/nodejs/node-gyp/commit/f37a8b40d0)] - **doc**: add GitHub Actions badge (#1994) (Rod Vagg) [#1994](https://github.com/nodejs/node-gyp/pull/1994)
+* [[`cb3f6aae5e`](https://github.com/nodejs/node-gyp/commit/cb3f6aae5e)] - **doc**: update macOS\_Catalina.md (#1992) (James Home) [#1992](https://github.com/nodejs/node-gyp/pull/1992)
+* [[`0607596a4c`](https://github.com/nodejs/node-gyp/commit/0607596a4c)] - **doc**: fix typo in README.md (#1985) (Suraneti Rodsuwan) [#1985](https://github.com/nodejs/node-gyp/pull/1985)
+* [[`0d5a415a14`](https://github.com/nodejs/node-gyp/commit/0d5a415a14)] - **doc**: add travis badge (Rod Vagg) [#1971](https://github.com/nodejs/node-gyp/pull/1971)
+* [[`103740cd95`](https://github.com/nodejs/node-gyp/commit/103740cd95)] - **gyp**: list(dict) so we can del dict(key) while iterating (Christian Clauss) [#2009](https://github.com/nodejs/node-gyp/pull/2009)
+* [[`278dcddbdd`](https://github.com/nodejs/node-gyp/commit/278dcddbdd)] - **lib**: ignore VS instances that cause COMExceptions (Andrew Casey) [#2018](https://github.com/nodejs/node-gyp/pull/2018)
+* [[`1694907bbf`](https://github.com/nodejs/node-gyp/commit/1694907bbf)] - **lib**: compatibility with semver ≥ 7 (`new` for semver.Range) (Xavier Guimard) [#2006](https://github.com/nodejs/node-gyp/pull/2006)
+* [[`a3f1143514`](https://github.com/nodejs/node-gyp/commit/a3f1143514)] - **(SEMVER-MINOR)** **lib**: noproxy support, match proxy detection to `request` (Matias Lopez) [#1978](https://github.com/nodejs/node-gyp/pull/1978)
+* [[`52365819c7`](https://github.com/nodejs/node-gyp/commit/52365819c7)] - **test**: remove old docker test harness (#1993) (Rod Vagg) [#1993](https://github.com/nodejs/node-gyp/pull/1993)
+* [[`bc509c511d`](https://github.com/nodejs/node-gyp/commit/bc509c511d)] - **test**: add Windows to GitHub Actions testing (#1996) (Christian Clauss) [#1996](https://github.com/nodejs/node-gyp/pull/1996)
+* [[`91ee26dd48`](https://github.com/nodejs/node-gyp/commit/91ee26dd48)] - **test**: fix typo in header download test (#2001) (Richard Lau) [#2001](https://github.com/nodejs/node-gyp/pull/2001)
+* [[`0923f344c9`](https://github.com/nodejs/node-gyp/commit/0923f344c9)] - **test**: direct python invocation & simpler pyenv (Matias Lopez) [#1979](https://github.com/nodejs/node-gyp/pull/1979)
+* [[`32c8744b34`](https://github.com/nodejs/node-gyp/commit/32c8744b34)] - **test**: fix macOS Travis on Python 2.7 & 3.7 (Christian Clauss) [#1979](https://github.com/nodejs/node-gyp/pull/1979)
+* [[`fd4b1351e4`](https://github.com/nodejs/node-gyp/commit/fd4b1351e4)] - **test**: initial Github Actions with Ubuntu & macOS (Christian Clauss) [#1985](https://github.com/nodejs/node-gyp/pull/1985)
+
+v5.0.7 2019-12-16
+=================
+
+Republish of v5.0.6 with unnecessary tarball removed from pack file.
+
 v5.0.6 2019-12-16
 =================
 

README.md

@@ -1,5 +1,8 @@
 # `node-gyp` - Node.js native addon build tool
 
+[![Travis CI](https://travis-ci.com/nodejs/node-gyp.svg?branch=master)](https://travis-ci.com/nodejs/node-gyp)
+[![Build Status](https://github.com/nodejs/node-gyp/workflows/Python_tests/badge.svg)](https://github.com/nodejs/node-gyp/actions?workflow=Python_tests)
+
 `node-gyp` is a cross-platform command-line tool written in Node.js for
 compiling native addon modules for Node.js. It contains a fork of the
 [gyp](https://gyp.gsrc.io) project that was previously used by the Chromium
@@ -14,7 +17,7 @@ etc.), regardless of what version of Node.js is actually installed on your syste
 ## Features
 
  * The same build commands work on any of the supported platforms
- * Supports the targetting of different versions of Node.js
+ * Supports the targeting of different versions of Node.js
 
 ## Installation
 
@@ -191,7 +194,8 @@ Some additional resources for Node.js native addons and writing `gyp` configurat
 | `--devdir=$path` | SDK download directory (default is OS cache directory)
 | `--ensure` | Don't reinstall headers if already present
 | `--dist-url=$url` | Download header tarball from custom URL
-| `--proxy=$url` | Set HTTP proxy for downloading header tarball
+| `--proxy=$url` | Set HTTP(S) proxy for downloading header tarball
+| `--noproxy=$urls` | Set urls to ignore proxies when downloading header tarball
 | `--cafile=$cafile` | Override default CA chain (to download tarball)
 | `--nodedir=$path` | Set the path to the node source code
 | `--python=$path` | Set path to the Python binary

gyp/pylib/gyp/input.py

@@ -2286,7 +2286,7 @@ def SetUpConfigurations(target, target_dict):
  merged_configurations[configuration])
 
  # Now drop all the abstract ones.
- for configuration in target_dict['configurations'].keys():
+ for configuration in list(target_dict['configurations']):
  old_configuration_dict = target_dict['configurations'][configuration]
  if old_configuration_dict.get('abstract'):
  del target_dict['configurations'][configuration]

lib/Find-VisualStudio.cs

@@ -205,7 +205,14 @@ public static void PrintJson()
  return;
  }
 
- instances.Add(InstanceJson(rgelt[0]));
+ try
+ {
+ instances.Add(InstanceJson(rgelt[0]));
+ }
+ catch (COMException)
+ {
+ // Ignore instances that can't be queried.
+ }
  }
  }
 

lib/find-python.js

@@ -226,7 +226,7 @@ PythonFinder.prototype = {
  }
  this.addLog(`- version is "${version}"`)
 
- const range = semver.Range(this.semverRange)
+ const range = new semver.Range(this.semverRange)
  var valid = false
  try {
  valid = range.test(version)

lib/install.js

@@ -11,6 +11,7 @@ const request = require('request')
 const mkdir = require('mkdirp')
 const processRelease = require('./process-release')
 const win = process.platform === 'win32'
+const getProxyFromURI = require('./proxy')
 
 function install (fs, gyp, argv, callback) {
  var release = processRelease(argv, gyp, process.version, process.release)
@@ -410,10 +411,7 @@ function download (gyp, env, url) {
  }
 
  // basic support for a proxy server
- var proxyUrl = gyp.opts.proxy ||
- env.http_proxy ||
- env.HTTP_PROXY ||
- env.npm_config_proxy
+ var proxyUrl = getProxyFromURI(gyp, env, url)
  if (proxyUrl) {
  if (/^https?:\/\//i.test(proxyUrl)) {
  log.verbose('download', 'using proxy url: "%s"', proxyUrl)

lib/node-gyp.js

@@ -67,6 +67,7 @@ proto.configDefs = {
  ensure: Boolean, // 'install'
  solution: String, // 'build' (windows only)
  proxy: String, // 'install'
+ noproxy: String, // 'install'
  devdir: String, // everywhere
  nodedir: String, // 'configure'
  loglevel: String, // everywhere

lib/proxy.js

@@ -0,0 +1,92 @@
+'use strict'
+// Taken from https://github.com/request/request/blob/212570b/lib/getProxyFromURI.js
+
+const url = require('url')
+
+function formatHostname (hostname) {
+ // canonicalize the hostname, so that 'oogle.com' won't match 'google.com'
+ return hostname.replace(/^\.*/, '.').toLowerCase()
+}
+
+function parseNoProxyZone (zone) {
+ zone = zone.trim().toLowerCase()
+
+ var zoneParts = zone.split(':', 2)
+ var zoneHost = formatHostname(zoneParts[0])
+ var zonePort = zoneParts[1]
+ var hasPort = zone.indexOf(':') > -1
+
+ return { hostname: zoneHost, port: zonePort, hasPort: hasPort }
+}
+
+function uriInNoProxy (uri, noProxy) {
+ var port = uri.port || (uri.protocol === 'https:' ? '443' : '80')
+ var hostname = formatHostname(uri.hostname)
+ var noProxyList = noProxy.split(',')
+
+ // iterate through the noProxyList until it finds a match.
+ return noProxyList.map(parseNoProxyZone).some(function (noProxyZone) {
+ var isMatchedAt = hostname.indexOf(noProxyZone.hostname)
+ var hostnameMatched = (
+ isMatchedAt > -1 &&
+ (isMatchedAt === hostname.length - noProxyZone.hostname.length)
+ )
+
+ if (noProxyZone.hasPort) {
+ return (port === noProxyZone.port) && hostnameMatched
+ }
+
+ return hostnameMatched
+ })
+}
+
+function getProxyFromURI (gyp, env, uri) {
+ // If a string URI/URL was given, parse it into a URL object
+ if (typeof uri === 'string') {
+ // eslint-disable-next-line
+ uri = url.parse(uri)
+ }
+
+ // Decide the proper request proxy to use based on the request URI object and the
+ // environmental variables (NO_PROXY, HTTP_PROXY, etc.)
+ // respect NO_PROXY environment variables (see: https://lynx.invisible-island.net/lynx2.8.7/breakout/lynx_help/keystrokes/environments.html)
+
+ var noProxy = gyp.opts.noproxy || env.NO_PROXY || env.no_proxy || env.npm_config_noproxy || ''
+
+ // if the noProxy is a wildcard then return null
+
+ if (noProxy === '*') {
+ return null
+ }
+
+ // if the noProxy is not empty and the uri is found return null
+
+ if (noProxy !== '' && uriInNoProxy(uri, noProxy)) {
+ return null
+ }
+
+ // Check for HTTP or HTTPS Proxy in environment Else default to null
+
+ if (uri.protocol === 'http:') {
+ return gyp.opts.proxy ||
+ env.HTTP_PROXY ||
+ env.http_proxy ||
+ env.npm_config_proxy || null
+ }
+
+ if (uri.protocol === 'https:') {
+ return gyp.opts.proxy ||
+ env.HTTPS_PROXY ||
+ env.https_proxy ||
+ env.HTTP_PROXY ||
+ env.http_proxy ||
+ env.npm_config_proxy || null
+ }
+
+ // if none of that works, return null
+ // (What uri protocol are you using then?)
+
+ return null
+}
+
+module.exports = getProxyFromURI