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

diceware: 0.9.3 -> 0.9.4 #36114

Merged
merged 1 commit into from Feb 28, 2018
Merged

diceware: 0.9.3 -> 0.9.4 #36114

merged 1 commit into from Feb 28, 2018

Conversation

asymmetric
Copy link
Contributor

Motivation for this change

Update to latest release.

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.

@Mic92
Copy link
Member

Mic92 commented Feb 28, 2018

@GrahamcOfBorg build diceware

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

tests/conftest.py .                                                      [  0%]
tests/test_config.py ....................                                [ 15%]
tests/test_diceware.py ....................................              [ 42%]
tests/test_logger.py .....                                               [ 45%]
tests/test_random_sources.py ...................................         [ 71%]
tests/test_wordlist.py ......................................            [100%]

============================== 2 tests deselected ==============================
=================== 135 passed, 2 deselected in 1.31 seconds ===================
/nix/store/xha8rkngkwnlwi8y891xw3z07vzrgysf-diceware-0.9.4

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

tests/conftest.py .                                                      [  0%]
tests/test_config.py ....................                                [ 15%]
tests/test_diceware.py ....................................              [ 42%]
tests/test_logger.py .....                                               [ 45%]
tests/test_random_sources.py ...................................         [ 71%]
tests/test_wordlist.py ......................................            [100%]

============================== 2 tests deselected ==============================
=================== 135 passed, 2 deselected in 1.29 seconds ===================
/nix/store/5sd58p139a95d0mm6laqlfywxl7g7r83-diceware-0.9.4

Mic92
Mic92 reviewed Feb 28, 2018
View reviewed changes
pkgs/tools/security/diceware/default.nix Outdated
sha256 = "0ab4fc2pbl2hcxqw5rr6awbhlnmdna6igqjijywwr1byzb7ga4iq";
})
];
nativeBuildInputs = [ coverage pytest pytestrunner ];
Copy link
Member

Choose a reason for hiding this comment

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

Those should be checkInputs instead.

Copy link
Member

Choose a reason for hiding this comment

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

I don't we think we could use these dependencies for cross compiling.

Copy link
Member

@dotlambda dotlambda Feb 28, 2018 •
edited

Choose a reason for hiding this comment

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

However, pytestrunner needs to be in nativeBuildInputs or buildInputs since it is needed at build time, not at check time.
@Mic92 Which one would be correct?

Copy link
Member

Choose a reason for hiding this comment

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

Since pytestrunner would execute code of the target platform, buildInputs seems more appropriate. But I think nobody has yet looked into cross-compiling python packages.
I assume that for this package, pytestrunner is just wrongly put into setup_requires: https://github.com/ulif/diceware/blob/master/setup.py#L10

Copy link
Member

Choose a reason for hiding this comment

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

That seems to be the standard way: https://github.com/pytest-dev/pytest-runner#example

Copy link
Member

Choose a reason for hiding this comment

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

Ah, maybe the module is loaded in setup.py to provide a test subcommand or something.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, it provides setup.py pytest.
@asymmetric I'd say just put pytestrunner it in nativeBuildInputs as it is done that way for other packages as well. We can change it later for all packages using pytestrunner at once.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

And move the rest to checkInputs?

Copy link
Member

Choose a reason for hiding this comment

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

Yes

@dotlambda
Copy link
Member

@GrahamcOfBorg build diceware

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

tests/conftest.py .                                                      [  0%]
tests/test_config.py ....................                                [ 15%]
tests/test_diceware.py ....................................              [ 42%]
tests/test_logger.py .....                                               [ 45%]
tests/test_random_sources.py ...................................         [ 71%]
tests/test_wordlist.py ......................................            [100%]

============================== 2 tests deselected ==============================
=================== 135 passed, 2 deselected in 1.31 seconds ===================
/nix/store/h0vfpmwzlqjx2vj2q2j9niflb2qzvkx2-diceware-0.9.4

@Mic92 Mic92 merged commit 9ac402a into NixOS:master Feb 28, 2018
@asymmetric asymmetric deleted the asymmetric/diceware branch February 28, 2018 14:31
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

tests/conftest.py .                                                      [  0%]
tests/test_config.py ....................                                [ 15%]
tests/test_diceware.py ....................................              [ 42%]
tests/test_logger.py .....                                               [ 45%]
tests/test_random_sources.py ...................................         [ 71%]
tests/test_wordlist.py ......................................            [100%]

============================== 2 tests deselected ==============================
================== 135 passed, 2 deselected in 19.90 seconds ===================
/nix/store/cj35c5sfwdvaj8zpvij3y534ckn9s1ag-diceware-0.9.4

@Mic92 Mic92 mentioned this pull request Feb 28, 2018
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@dotlambda dotlambda dotlambda left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@asymmetric @Mic92 @GrahamcOfBorg @dotlambda