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.

Sign up for GitHub

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

Jump to bottom

Add the missing pyjson5 module #72974

Merged
merged 3 commits into from Nov 11, 2019
Merged

Add the missing pyjson5 module #72974

merged 3 commits into from Nov 11, 2019

Conversation

tgys
Copy link
Contributor

@tgys tgys commented Nov 7, 2019 •
edited

Motivation for this change

pyjson5 is needed by jupyterlab_server #72965

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @FRidh @jonringer

@FRidh
Copy link
Member

FRidh commented Nov 7, 2019

Please check the contributing guidelines for how to name commits. Merges should be avoided so please rebase instead.

veprbl
veprbl reviewed Nov 7, 2019
View reviewed changes
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyjson5/default.nix Outdated Show resolved Hide resolved
veprbl
veprbl reviewed Nov 7, 2019
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit name should read "pythonPackages.pyjson5: init at 0.8.5"

jonringer
jonringer reviewed Nov 7, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the commit history should look like:

maintainers: add isgy
python3Packages.pyjson5: init at 0.8.5

@alexvorobiev
Copy link
Contributor

alexvorobiev commented Nov 7, 2019 •
edited

Thanks for the fix! Should the derivation for jupyterlab_server be updated as well to add the dependency on pyjson5?

@jonringer
Copy link
Contributor

that is what the PR states :)
Personally, i would do that here, but if the PR wants to be broken into 2, then thats also okay

@tgys
Copy link
Contributor Author

tgys commented Nov 7, 2019 •
edited

@jonringer @veprbl I'm not sure why the tests are failing (since I haven't touched any of the files in that list)

@jonringer
Copy link
Contributor

@GrahamcOfBorg eval

@jonringer
Copy link
Contributor

The error wasn't even from your package, that was weird

@ofborg ofborg bot requested a review from costrouc November 10, 2019 09:32
@FRidh
Copy link
Member

FRidh commented Nov 10, 2019

Always rebase, do not merge master.

@tgys
Copy link
Contributor Author

tgys commented Nov 10, 2019

sorry, I know.. fixing

@tgys
Copy link
Contributor Author

tgys commented Nov 10, 2019

@jonringer @FRidh

@cdepillabout cdepillabout removed their request for review November 10, 2019 23:11
@jonringer
Copy link
Contributor

please merge the two maintainer commits..

git rebase -i HEAD~4
# move the bottom (maintainer) line to below the first maintainer entry
# change pick to squash
# save
git push <fork> <branch> --force

@tgys
maintainers: add isgy
72e9d05 
maintainers: fixed typo
@tgys
Copy link
Contributor Author

tgys commented Nov 11, 2019

@jonringer @FRidh sorry.. good idea :)

jonringer
jonringer approved these changes Nov 11, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nix-review passes on NixOS
diff LGTM
commits LGTM

failures are broken on master

[6 built (2 failed), 3 copied (9.5 MiB), 9.2 MiB DL]
error: build of '/nix/store/5981hvalbm7s5kgz1sm4wwcd6c5k7pan-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/72974
2 package failed to build:
python37Packages.jupyterlab python38Packages.jupyterlab

5 package were build:
python27Packages.pyjson5 python37Packages.jupyterlab_server python37Packages.pyjson5 python38Packages.jupyterlab_server python38Packages.pyjson5

@jonringer jonringer merged commit da006ed into NixOS:master Nov 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl left review comments

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@basvandijk basvandijk Awaiting requested review from basvandijk

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92

@ttuegel ttuegel Awaiting requested review from ttuegel

@costrouc costrouc Awaiting requested review from costrouc

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tgys @FRidh @alexvorobiev @jonringer @veprbl @Janik-Haag