Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: upgrade to npm 2.14.12 #4110

Closed
wants to merge 2 commits into from
Closed

Conversation

zkat
Copy link
Contributor

@zkat zkat commented Dec 1, 2015

Hiii!

This PR includes two releases:

The main thing to note is a hopefully welcome update to our licensing to clarify scope of both the open source side and the registry TOS. There's a further clarification coming later this week, so we're not done with that bit yet -- so keep an eye out for v2.14.13.

This PR supersedes #4003, but have a look-see over there for some discussion. That PR should be closeable, though. #4033 was closed because I made it against the wrong branch. Sorry about that. :)

r: @jasnell
r: @Fishrock123
r: @chrisdickinson
r: @thealphanerd

@MylesBorins
Copy link
Contributor

I was unable to apply the patch with git am but it cleanly cherry-picked onto v4.x-staging

@Fishrock123 Fishrock123 added the npm Issues and PRs related to the npm client dependency or the npm registry. label Dec 1, 2015
@Fishrock123
Copy link
Contributor

make test-npm gives two errors.

1st as expected:

test/tap/prune.js ................................... 16/17
  npm install
  not ok Should not get data on stderr: WARN engine [email protected]: wanted: {"node":"*"} (current: {"node":"4.2.3-pre","npm":"2.14.12"})
    at:
      file: test/tap/prune.js
      line: 57
      column: 7
    stack: |
      test/tap/prune.js:57:7
      f (node_modules/once/once.js:17:25)
      ChildProcess.<anonymous> (test/common-tap.js:56:5)
      maybeClose (internal/child_process.js:818:16)
      Socket.<anonymous> (internal/child_process.js:319:11)
      Pipe._onclose (net.js:469:12)

2nd also happens with v3.5.0 (I think?), not sure what's up here:

test/tap/circular-dep.js .............................. 8/9
  installing a package that depends on the current package
  not ok no error output
    at:
      file: test/tap/circular-dep.js
      line: 48
      column: 9
    stack: |
      test/tap/circular-dep.js:48:9
      f (node_modules/once/once.js:17:25)
      ChildProcess.<anonymous> (test/common-tap.js:56:5)
      maybeClose (internal/child_process.js:818:16)
      Socket.<anonymous> (internal/child_process.js:319:11)
      Pipe._onclose (net.js:469:12)

@MylesBorins
Copy link
Contributor

I was seeing both of those myself fwiw

@zkat
Copy link
Contributor Author

zkat commented Dec 2, 2015

@thealphanerd @Fishrock123 This is the thing where you have to set node to be a release, not a prerelease. See #4003 (comment)

@Fishrock123
Copy link
Contributor

@zkat ah ok I didn't realize both were from that. :)

LGTM

@thealphanerd Would you prefer to land it?

@zkat
Copy link
Contributor Author

zkat commented Dec 2, 2015

@Fishrock123 sec. After #3959 (comment), I have updated the LICENSE file for node accordingly, so please re-review.

@jasnell See new commit! Is this alright now?

@jasnell
Copy link
Member

jasnell commented Dec 2, 2015

@zkat ... I haven't had a chance to review the entire PR so I can't give an LGTM but the new commit is exactly what I needed! Thanks!

@MylesBorins
Copy link
Contributor

I have confirmed using diff that the resulting LICENSE is identical to that found on https://github.com/npm/npm/blob/master/LICENSE

LGTM

@jasnell
Copy link
Member

jasnell commented Dec 3, 2015

LGTM. This shouldn't land until the corresponding PR for master also lands tho.

@jasnell
Copy link
Member

jasnell commented Dec 3, 2015

derp.. nevermind.. sigh. I keep forgetting that master and v5.x are on npm3. sigh.

@Fishrock123
Copy link
Contributor

Tests passed, for the record. cc @jasnell

Edit: with node_version.h modified to look like a release

@jasnell
Copy link
Member

jasnell commented Dec 3, 2015

@zkat, this PR is not landing cleanly on v4.x-staging for me for some reason. Can you take a moment to do a quick rebase and update then I'll get it landed.

@Fishrock123
Copy link
Contributor

@jasnell git am -3

jasnell pushed a commit that referenced this pull request Dec 3, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
jasnell pushed a commit that referenced this pull request Dec 3, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@jasnell
Copy link
Member

jasnell commented Dec 3, 2015

@zkat nevermind :-) @Fishrock123 .. thanks :-)

Landed in fff8132 and 4f8d557

@jasnell jasnell closed this Dec 3, 2015
zkat added a commit that referenced this pull request Dec 4, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@jasnell jasnell mentioned this pull request Dec 17, 2015
zkat added a commit that referenced this pull request Dec 17, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
zkat added a commit that referenced this pull request Dec 17, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
zkat added a commit that referenced this pull request Dec 17, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
jasnell added a commit that referenced this pull request Dec 17, 2015
Maintenance Update

Notable changes

* Roughly 78% of the commits are documentation and test
  improvements
* domains:
  - Fix handling of uncaught exceptions (Julien Gilli)
    [#3884](#3884)
* deps:
  - Upgrade to npm 2.14.12 (Kat Marchán)
    [#4110](#4110)
  - Backport 819b40a from V8 upstream (Michaël Zasso)
    [#3938](#3938)
  - Updated node LICENSE file with new npm license (Kat Marchán)
    [#4110](#4110)
@jasnell jasnell mentioned this pull request Dec 17, 2015
zkat added a commit that referenced this pull request Dec 21, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
jasnell added a commit that referenced this pull request Dec 21, 2015
Maintenance Update

Notable changes

* Roughly 78% of the commits are documentation and test
  improvements
* domains:
  - Fix handling of uncaught exceptions (Julien Gilli)
    [#3884](#3884)
* deps:
  - Upgrade to npm 2.14.12 (Kat Marchán)
    [#4110](#4110)
  - Backport 819b40a from V8 upstream (Michaël Zasso)
    [#3938](#3938)
  - Updated node LICENSE file with new npm license (Kat Marchán)
    [#4110](#4110)
zkat added a commit that referenced this pull request Dec 23, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
zkat added a commit that referenced this pull request Dec 23, 2015
PR-URL: #4110
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: James M Snell <[email protected]>
jasnell added a commit that referenced this pull request Dec 23, 2015
Maintenance Update

Notable changes

* Roughly 78% of the commits are documentation and test
  improvements
* domains:
  - Fix handling of uncaught exceptions (Julien Gilli)
    [#3884](#3884)
* deps:
  - Upgrade to npm 2.14.12 (Kat Marchán)
    [#4110](#4110)
  - Backport 819b40a from V8 upstream (Michaël Zasso)
    [#3938](#3938)
  - Updated node LICENSE file with new npm license (Kat Marchán)
    [#4110](#4110)
jasnell added a commit that referenced this pull request Dec 23, 2015
Maintenance Update

Notable changes

* Roughly 78% of the commits are documentation and test
  improvements
* domains:
  - Fix handling of uncaught exceptions (Julien Gilli)
    [#3884](#3884)
* deps:
  - Upgrade to npm 2.14.12 (Kat Marchán)
    [#4110](#4110)
  - Backport 819b40a from V8 upstream (Michaël Zasso)
    [#3938](#3938)
  - Updated node LICENSE file with new npm license (Kat Marchán)
    [#4110](#4110)
@zkat zkat mentioned this pull request Jan 29, 2016
scovetta pushed a commit to scovetta/node that referenced this pull request Apr 2, 2016
Maintenance Update

Notable changes

* Roughly 78% of the commits are documentation and test
  improvements
* domains:
  - Fix handling of uncaught exceptions (Julien Gilli)
    [nodejs#3884](nodejs#3884)
* deps:
  - Upgrade to npm 2.14.12 (Kat Marchán)
    [nodejs#4110](nodejs#4110)
  - Backport 819b40a from V8 upstream (Michaël Zasso)
    [nodejs#3938](nodejs#3938)
  - Updated node LICENSE file with new npm license (Kat Marchán)
    [nodejs#4110](nodejs#4110)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
npm Issues and PRs related to the npm client dependency or the npm registry.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants