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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: upgrade to npm 2.14.11 #4003

Closed
wants to merge 2 commits into from
Closed

deps: upgrade to npm 2.14.11 #4003

wants to merge 2 commits into from

Conversation

zkat
Copy link
Contributor

@zkat zkat commented Nov 24, 2015

Heya!

Here's a new LTS release. Check out the changelog: https://github.com/npm/npm/releases/tag/v2.14.11

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.

For some reason, I ran into the infamous Readme.md/README.md git-on-OSX issue again. I tried reproducing my previous steps and they didn't seem to work -- The extra commit you see is what I think the correct final fix for this. It seems that the Readme.md somehow still stuck around after we removed it from the npm repo proper. It should be completely gone now. 馃檹

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

@rvagg
Copy link
Member

rvagg commented Nov 24, 2015

Any suggestions on how we should approach v0.12 now that we have that wheel (apparently) greased for movement again and it's jumped to 2.14.9. This PR won't be easily cherry-picked to that branch will it?

@zkat
Copy link
Contributor Author

zkat commented Nov 24, 2015

I'd like to say it'll be easy enough to cherry-pick -- I'll give it a shot myself in the morning and see if there's any issues . I also seem to have run into some test failures, so we should hold off on this PR for now, anyway. With all the messing around I was doing, I forgot to run the test suite before submitting this PR -- argh! :/

@MylesBorins
Copy link
Member

git cherry-pick --strategy=recursive -X theirs 26963fe4d6bb26ca8735845792b9358f13c90676

seemed to work well enough to me (this is assuming we want to ignore all conflicts and just accept all npm changes in this commit

edit: this was against 0.12.8-rc fwiw

@zkat
Copy link
Contributor Author

zkat commented Nov 24, 2015

Thanks, Myles! ^_^

@mscdex mscdex added the npm Issues and PRs related to the npm client dependency or the npm registry. label Nov 24, 2015
@Fishrock123
Copy link
Member

Fwiw I'm getting these errors:

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)
test/tap/prune.js ................................... 16/17
  npm install
  not ok Should not get data on stderr: WARN engine underscore@1.3.1: wanted: {"node":"*"} (current: {"node":"4.2.3-pre","npm":"2.14.11"})
    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)
      Process.ChildProcess._handle.onexit (internal/child_process.js:211:5

@zkat
Copy link
Contributor Author

zkat commented Nov 24, 2015

Yep! That's why I was asking you about prereleases. You'll need to edit src/node_version.h and make it #define NODE_VERSION_IS_RELEASE 1. I just tested after doing this and everything passes now. :)

That's because semver considers prereleases to not exist in ranges, so all the engine checks, including *, will fail, since we're getting 4.2.3-pre.

@zkat
Copy link
Contributor Author

zkat commented Nov 30, 2015

See #4033 -- I think this PR is safe to close.

@jasnell jasnell closed this Dec 1, 2015
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.

None yet

6 participants