Release proposal: v5.0.4 #1893

rvagg · 2019-09-26T03:45:46Z

This is the same as the #1892 but without the lone apparent semver-major: #1818. See thread in #1791 (comment) for more discussion on this approach.

Will take advice on what else this needs, I don't have any strong opinions other than "let's get this stuff out".

[f753c167c5] - gyp: decode stdout on Python 3 (cclauss) #1890
[60a4083523] - doc: update xcode install instructions to match Node's BUILDING (Nhan Khong) #1884
[19dbc9ac32] - deps: update tar to 4.4.12 (Matheus Marchini) #1889
[5f3ed92181] - bin: fix the usage instructions (Halit Ogunc) #1888
[aab118edf1] - lib: adding keep-alive header to download requests (Milad Farazmand) #1863
[1186e89326] - lib: ignore non-critical os.userInfo() failures (Rod Vagg) #1835
[785e527c3d] - doc: fix missing argument for setting python path (lagorsse) #1802
[a97615196c] - gyp: rm semicolons (Python != JavaScript) (MattIPv4) #1858
[06019bac24] - gyp: assorted typo fixes (XhmikosR) #1853
[3f4972c1ca] - gyp: use "is" when comparing to None (Vladyslav Burzakovskyy) #1860
[1cb4708073] - src,win: improve unmanaged handling (Peter Sabath) #1852
[5553cd910e] - gyp: improve Windows+Cygwin compatibility (Jose Quijada) #1817
[8bcb1fbb43] - gyp: Python 3 Windows fixes (João Reis) #1843
[2e24d0a326] - test: accept Python 3 in test-find-python.js (João Reis) #1843
[1267b4dc1c] - build: add test run Python 3.7 on macOS (Christian Clauss) #1843
[da1b031aa3] - build: import StringIO on Python 2 and Python 3 (Christian Clauss) #1836
[fa0ed4aa42] - build: more Python 3 compat, replace compile with ast (cclauss) #1820
[18d5c7c9d0] - win,src: update win_delay_load_hook.cc to work with /clr (Ivan Petrovic) #1819

Added "#pragma unmanaged" in win_delay_load_hook.cc to support clr PR-URL: #1819 Reviewed-By: João Reis <reis@janeasystems.com>

Make Python 3 compatiblity changes so the code works in both Python 2 and Python 3. Especially, make changes required because the compiler module was removed in Python 3 in favor of the ast module that exists in both Python 2 and Python 3. PR-URL: #1820 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

This change supports access to StringIO on both Python 2 and Python 3 PR-URL: #1836 Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: João Reis <reis@janeasystems.com>

Refs: #1846 PR-URL: #1843 Reviewed-By: João Reis <reis@janeasystems.com>

Fixes: #1826 PR-URL: #1843 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Matt Cowley <me@mattcowley.co.uk> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

PR-URL: #1843 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Matt Cowley <me@mattcowley.co.uk> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

Fixes: #1782 PR-URL: #1817 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>

Used scoped disabling of managed code handling to ensure no other files get affected. PR-URL: #1852 Reviewed-By: João Reis <reis@janeasystems.com>

PR-URL: #1860 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>

PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>

PR-URL: #1858 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>

(accepted with minor modifications by rvagg) PR-URL: #1802 Reviewed-By: Rod Vagg <rod@vagg.org>

Fixes: #1834 PR-URL: #1835

PR-URL: #1863 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

PR-URL: #1888 Reviewed-By: Rod Vagg <rod@vagg.org>

Fixes: #1887 PR-URL: #1889 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

PR-URL: #1884 Reviewed-By: Rod Vagg <rod@vagg.org>

PR-URL: #1890 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

rvagg · 2019-09-26T03:47:11Z

This PR isn't meant to be merged into master, it will establish a v5.x branch that we'll maintain like we do in nodejs/node for as long as we need a v5.x release line to live (as yet undetermined).

cclauss

A few suggestions... Implemented on #1894

cclauss · 2019-09-26T05:50:39Z

.travis.yml

@@ -44,6 +45,12 @@ matrix:
      python: 3.7
      env: NODE_GYP_FORCE_PYTHON=python3 EXPERIMENTAL_NODE_GYP_PYTHON3=1
      before_install: nvm install 12
+    - name: "Python 3.7 on macOS"
+      os: osx
+      #osx_image: xcode11


This # should be removed so that we use Py37 instead of Py36.

cclauss · 2019-09-26T05:57:06Z

gyp/gyp_main.py

+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT)
+    stdout,stderr = out.communicate()
+    return "CYGWIN" in str(stdout)


Insert the if PY3: stdout = stdout.decode("utf-8") code from #1890.

cclauss · 2019-09-26T05:57:53Z

gyp/gyp_main.py

+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT)
+    stdout,stderr = out.communicate()
+    return str(stdout)


Insert the if PY3: stdout = stdout.decode("utf-8") code from #1890.

cclauss · 2019-09-26T05:58:43Z

gyp/pylib/gyp/common.py

+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT)
+    stdout,stderr = out.communicate()
+    return "CYGWIN" in str(stdout)


Insert the if PY3: stdout = stdout.decode("utf-8") code from #1890.

rvagg · 2019-09-26T06:07:35Z

hm, I'm not sure why this isn't showing properly, I've only removed that one commit which makes this the only meaningful diff when doing a git diff v5.x master locally:

diff --git a/lib/find-python.js b/lib/find-python.js
index 30bb25f..1a4390d 100644
--- a/lib/find-python.js
+++ b/lib/find-python.js
@@ -19,7 +19,7 @@ PythonFinder.prototype = {
   argsExecutable: [ '-c', 'import sys; print(sys.executable);' ],
   argsVersion: [ '-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);' ],
   semverRange: process.env.EXPERIMENTAL_NODE_GYP_PYTHON3 ? '2.7.x || >=3.5.0'
-    : '>=2.7.0 <3.0.0',
+    : '>=2.6.0 <3.0.0',

   // These can be overridden for testing:
   execFile: cp.execFile,

The "files changed" isn't correct, at least according to my diff. I suppose it's because this PR is adding one HEAD commit (changelog and version bump) but removing a commit way back in history, and for some reason it's getting confused?

@cclauss the changes you're commenting on are on master so maybe they need a PR to address them?

sam-github · 2019-09-26T23:02:40Z

@rvagg This LGTM. @cclauss's comments are addressed in #1894 -- could you land that, and then cherry-pick it into 5.x? That will fix the known py3 issues (and as for unknown issues, we don't know :-).

PR-URL: #1894 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>

rvagg · 2019-09-27T02:13:25Z

done, I suppose I'll push this out then!

…1000" Ref: nodejs/node-addon-api#445 (comment) PR-URL: #1895 Reviewed-By: Rod Vagg <rod@vagg.org>

PR-URL: #1893

rvagg · 2019-09-27T02:27:23Z

Included #1895 too and published as v5.0.4. Closing this PR but this branch, v5.x, will live on as our branch to maintain the v5.x series while we also move on to 6.0.0.

PR-URL: #1893

ipetrovic11 and others added 18 commits September 26, 2019 13:39

win,src: update win_delay_load_hook.cc to work with /clr

18d5c7c

Added "#pragma unmanaged" in win_delay_load_hook.cc to support clr PR-URL: #1819 Reviewed-By: João Reis <reis@janeasystems.com>

build: import StringIO on Python 2 and Python 3

da1b031

This change supports access to StringIO on both Python 2 and Python 3 PR-URL: #1836 Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: João Reis <reis@janeasystems.com>

build: add test run Python 3.7 on macOS

1267b4d

Refs: #1846 PR-URL: #1843 Reviewed-By: João Reis <reis@janeasystems.com>

test: accept Python 3 in test-find-python.js

2e24d0a

Fixes: #1826 PR-URL: #1843 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Matt Cowley <me@mattcowley.co.uk> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

gyp: Python 3 Windows fixes

8bcb1fb

PR-URL: #1843 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Matt Cowley <me@mattcowley.co.uk> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

gyp: improve Windows+Cygwin compatibility

5553cd9

Fixes: #1782 PR-URL: #1817 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>

src,win: improve unmanaged handling

1cb4708

Used scoped disabling of managed code handling to ensure no other files get affected. PR-URL: #1852 Reviewed-By: João Reis <reis@janeasystems.com>

gyp: use "is" when comparing to None

3f4972c

PR-URL: #1860 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>

gyp: assorted typo fixes

06019ba

PR-URL: #1853 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>

gyp: rm semicolons (Python != JavaScript)

a976151

PR-URL: #1858 Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Rod Vagg <r@va.gg>

doc: fix missing argument for setting python path

785e527

(accepted with minor modifications by rvagg) PR-URL: #1802 Reviewed-By: Rod Vagg <rod@vagg.org>

lib: ignore non-critical os.userInfo() failures

1186e89

Fixes: #1834 PR-URL: #1835

lib: adding keep-alive header to download requests

aab118e

PR-URL: #1863 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

bin: fix the usage instructions

5f3ed92

PR-URL: #1888 Reviewed-By: Rod Vagg <rod@vagg.org>

deps: update tar to 4.4.12

19dbc9a

Fixes: #1887 PR-URL: #1889 Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

doc: update xcode install instructions to match Node's BUILDING

60a4083

PR-URL: #1884 Reviewed-By: Rod Vagg <rod@vagg.org>

gyp: decode stdout on Python 3

f753c16

PR-URL: #1890 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Richard Lau <riclau@uk.ibm.com>

rvagg mentioned this pull request Sep 26, 2019

The GYP issue: where, how and who to maintain #1791

Closed

cclauss requested changes Sep 26, 2019

View reviewed changes

cclauss mentioned this pull request Sep 26, 2019

more decode stdout on Python 3 #1894

Closed

4 tasks

gyp: more decode stdout on Python 3

36638af

PR-URL: #1894 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>

rvagg force-pushed the v5.x branch from 3f9ac5f to c352076 Compare September 27, 2019 02:12

cclauss and others added 2 commits September 27, 2019 12:22

gyp: modify XcodeVersion() to convert "4.2" to "0420" and "10.0" to "…

1236869

…1000" Ref: nodejs/node-addon-api#445 (comment) PR-URL: #1895 Reviewed-By: Rod Vagg <rod@vagg.org>

v5.0.4: bump version and update changelog

b887c40

PR-URL: #1893

rvagg force-pushed the v5.x branch from c352076 to b887c40 Compare September 27, 2019 02:26

rvagg closed this Sep 27, 2019

This was referenced Sep 27, 2019

Why no support Python3 #1687

Closed

build: ongoing list of actions for Python 3 compatibility nodejs/node#25789

Closed

rvagg added a commit that referenced this pull request Oct 2, 2019

v5.0.4: bump version and update changelog

6f39fd4

PR-URL: #1893

MichaelLettrich mentioned this pull request Mar 30, 2020

Bump CMake to 3.17 alisw/alidist#2157

Merged

ext mentioned this pull request Jun 23, 2020

Python 3 support by bumping node-gyp to 6.1.0 sass/node-sass#2936

Closed

cclauss added the Node Sass --> Dart Sass https://github.com/sass/node-sass/issues/2952 label Aug 8, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release proposal: v5.0.4 #1893

Release proposal: v5.0.4 #1893

rvagg commented Sep 26, 2019

rvagg commented Sep 26, 2019

cclauss left a comment •

edited

Loading

cclauss Sep 26, 2019

cclauss Sep 26, 2019

cclauss Sep 26, 2019

cclauss Sep 26, 2019

rvagg commented Sep 26, 2019

sam-github commented Sep 26, 2019

rvagg commented Sep 27, 2019

rvagg commented Sep 27, 2019

Release proposal: v5.0.4 #1893

Release proposal: v5.0.4 #1893

Conversation

rvagg commented Sep 26, 2019

rvagg commented Sep 26, 2019

cclauss left a comment • edited Loading

Choose a reason for hiding this comment

cclauss Sep 26, 2019

Choose a reason for hiding this comment

cclauss Sep 26, 2019

Choose a reason for hiding this comment

cclauss Sep 26, 2019

Choose a reason for hiding this comment

cclauss Sep 26, 2019

Choose a reason for hiding this comment

rvagg commented Sep 26, 2019

sam-github commented Sep 26, 2019

rvagg commented Sep 27, 2019

rvagg commented Sep 27, 2019

cclauss left a comment •

edited

Loading