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

pythonPackages.notebook: cleanup #37615

Merged
merged 1 commit into from Mar 22, 2018
Merged

pythonPackages.notebook: cleanup #37615

merged 1 commit into from Mar 22, 2018

Conversation

vaibhavsagar
Copy link
Member

@vaibhavsagar vaibhavsagar commented Mar 22, 2018 •
edited

As discussed in #37607 (comment).

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.notebook python3.pkgs.notebook

dotlambda
dotlambda reviewed Mar 22, 2018
View reviewed changes
pkgs/development/python-modules/notebook/default.nix Outdated
@@ -44,8 +44,8 @@ buildPythonPackage rec {
# disable warning_filters
preCheck = lib.optionalString (!isPy3k) ''
echo "" > setup.cfg
Copy link
Member

Choose a reason for hiding this comment

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

This could be replaced by touch

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point, updated.

Copy link
Member Author

Choose a reason for hiding this comment

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

It just occurred to me that this was probably intentional to truncate the file. Should we reinstate it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, it seems to fail when building with Python 2. I've opened #37620.

@vaibhavsagar vaibhavsagar force-pushed the cleanup-pythonPackages-notebook branch from 69d6f76 to 01f29bb Compare March 22, 2018 09:45
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.notebook, python3.pkgs.notebook

Partial log (click to expand)

notebook.tests.test_utils.test_url_unescape ... ok
notebook.tests.test_utils.test_is_hidden ... ok
notebook.tests.test_utils.test_is_hidden_win32 ... SKIP: Skipping test: test_is_hidden_win32. This test only runs under Windows

----------------------------------------------------------------------
Ran 253 tests in 43.991s

OK (SKIP=7)
/nix/store/s6asrspp3x0qgcqhq96fdbbdh0qk2395-python2.7-notebook-5.4.1
/nix/store/mk8z292fn7lg2lq7vqzzwfq1rvhiqi7w-python3.6-notebook-5.4.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.notebook, python3.pkgs.notebook

Partial log (click to expand)

notebook.tests.test_utils.test_url_unescape ... ok
notebook.tests.test_utils.test_is_hidden ... ok
notebook.tests.test_utils.test_is_hidden_win32 ... SKIP: Skipping test: test_is_hidden_win32. This test only runs under Windows

----------------------------------------------------------------------
Ran 253 tests in 225.730s

OK (SKIP=7)
/nix/store/9mknsvj39gr49cbpzqd9m7q1x6fvpi8z-python2.7-notebook-5.4.1
/nix/store/x4nb1b60v81hqpg3377x49nz2kwasbjs-python3.6-notebook-5.4.1

@dotlambda dotlambda merged commit c8f201d into NixOS:master Mar 22, 2018
@vaibhavsagar
Copy link
Member Author

Thanks!

@vaibhavsagar vaibhavsagar deleted the cleanup-pythonPackages-notebook branch March 22, 2018 09:57
@vaibhavsagar vaibhavsagar mentioned this pull request Mar 22, 2018
Merged
8 tasks
florianjacob pushed a commit to florianjacob/nixpkgs that referenced this pull request Mar 22, 2018
@vaibhavsagar
python2Packages.notebook: fix tests
cafd433 
These were accidentally broken by NixOS#37615.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda left review comments

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vaibhavsagar @dotlambda @GrahamcOfBorg