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

pythonPackages.xlib: 0.17 -> 0.25, enable tests #57621

Merged
merged 2 commits into from Mar 14, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 14, 2019

https://github.com/python-xlib/python-xlib/releases/tag/0.25

(and the releases along the way)

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

};

# Tests require `pyutil' so disable them to avoid circular references.
doCheck = false;
doCheck = true;
Copy link
Member

Choose a reason for hiding this comment

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

That's set automatically.

Suggested change
doCheck = true;


propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ];
checkPhase = ''
python runtests.py
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
python runtests.py
${python.interpreter} runtests.py

That's needed because e.g. PyPy has a different executable name.

'';

checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
buildInputs = [ setuptools_scm ];
Copy link
Member

Choose a reason for hiding this comment

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

I guess that should be nativeBuildInputs.


checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ six xorg.libX11 ];
Copy link
Member

Choose a reason for hiding this comment

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

libX11 probably belongs in buildInputs

@dtzWill
Copy link
Member Author

dtzWill commented Mar 14, 2019 via email

@dotlambda
Copy link
Member

Nix-review revealed a build failure of plover, caused by removing setuptools_scm from propagatedBuildInputs. That's fixed now.

@dotlambda dotlambda merged commit badca37 into NixOS:master Mar 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants