pythonPackages.xlib: 0.17 -> 0.25, enable tests #57621
Merged
+16
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dotlambda
requested changes
Mar 14, 2019
| }; | ||
|
|
||
| # Tests require `pyutil' so disable them to avoid circular references. | ||
| doCheck = false; | ||
| doCheck = true; |
There was a problem hiding this comment.
That's set automatically.
Suggested change
| doCheck = true; |
|
|
||
| propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ]; | ||
| checkPhase = '' | ||
| python runtests.py |
There was a problem hiding this comment.
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 ]; |
There was a problem hiding this comment.
I guess that should be nativeBuildInputs.
|
|
||
| checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; | ||
| buildInputs = [ setuptools_scm ]; | ||
| propagatedBuildInputs = [ six xorg.libX11 ]; |
There was a problem hiding this comment.
libX11 probably belongs in buildInputs
|
Thanks for feedback and explanation! Updated accordingly! :)
…On Thu, 14 Mar 2019 03:18:37 -0700, Robert Schütz ***@***.***> wrote:
dotlambda requested changes on this pull request.
> };
- # Tests require `pyutil' so disable them to avoid circular references.
- doCheck = false;
+ doCheck = true;
That's set automatically.
```suggestion
```
>
- propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ];
+ checkPhase = ''
+ python runtests.py
```suggestion
${python.interpreter} runtests.py
```
That's needed because e.g. PyPy has a different executable name.
>
- propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ];
+ checkPhase = ''
+ python runtests.py
+ '';
+
+ checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
+ buildInputs = [ setuptools_scm ];
I guess that should be `nativeBuildInputs`.
>
- propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ];
+ checkPhase = ''
+ python runtests.py
+ '';
+
+ checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
+ buildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ six xorg.libX11 ];
`libX11` probably belongs in `buildInputs`
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#57621 (review) part: text/html
|
dotlambda
force-pushed
the
update/pyxlib-0.25
branch
from
846fdbd to
ec95b91
Compare
|
Nix-review revealed a build failure of plover, caused by removing setuptools_scm from propagatedBuildInputs. That's fixed now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/python-xlib/python-xlib/releases/tag/0.25
(and the releases along the way)
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)