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.ewmh: init at 0.1.6 #38532

Merged
merged 2 commits into from Apr 7, 2018
Merged

pythonPackages.ewmh: init at 0.1.6 #38532

merged 2 commits into from Apr 7, 2018

Conversation

bennyandresen
Copy link
Contributor

Motivation for this change

Include pyewmh library.

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.

FRidh
FRidh requested changes Apr 7, 2018
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

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

Thanks. Some small changes are needed.

pkgs/development/python-modules/ewmh/default.nix Outdated
buildPythonPackage rec {
pname = "ewmh";
version = "0.1.6";
name = "${pname}-${version}";
Copy link
Member

Choose a reason for hiding this comment

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

The name attribute is added by buildPython* and should therefore be removed.

pkgs/development/python-modules/ewmh/default.nix Outdated
@@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchPypi, python-xlib }:
Copy link
Member

Choose a reason for hiding this comment

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

xlib

pkgs/top-level/python-packages.nix Outdated
@@ -233,6 +233,10 @@ in {

email_validator = callPackage ../development/python-modules/email-validator { };

ewmh = callPackage ../development/python-modules/ewmh {
python-xlib = self.xlib;
Copy link
Member

Choose a reason for hiding this comment

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

drop this

@FRidh
Copy link
Member

FRidh commented Apr 7, 2018

@GrahamcOfBorg build python3.pkgs.ewmh

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: python3.pkgs.ewmh

Partial log (click to expand)

reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'doc/_build'
writing manifest file 'ewmh.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
/nix/store/ff11nm4gjczffmbrq2shrk19hvm27q7d-python3.6-ewmh-0.1.6

@FRidh
Copy link
Member

FRidh commented Apr 7, 2018

This is an application and should therefore be called directly from all-packages.nix, and not via python-packages.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python3.pkgs.ewmh

Partial log (click to expand)

reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'doc/_build'
writing manifest file 'ewmh.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
/nix/store/p258pdmxdqmi935djyn0kv84v633n0gp-python3.6-ewmh-0.1.6

@FRidh
Copy link
Member

FRidh commented Apr 7, 2018 

Ran 0 tests in 0.000s

No tests are found. Either the test runner cannot find tests and needs to be patched, or there simply are no tests in which case the tests need to be disabled. Do include a comment explaining why the tests are disabled.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python3.pkgs.ewmh

Partial log (click to expand)

reading manifest template 'MANIFEST.in'
no previously-included directories found matching 'doc/_build'
writing manifest file 'ewmh.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
/nix/store/vlwqvb73dy8yjhlfvr9ayqjdrc56dzp6-python3.6-ewmh-0.1.6

@bennyandresen
Copy link
Contributor Author

Thanks for the review. I've updated it with the necessary steps except for this:

This is an application and should therefore be called directly from all-packages.nix, and not via python-packages.nix.

It's a library:

/nix/store/5w6by7hwyyck70bcn2qnwrwp9qgpjpfd-python2.7-ewmh-0.1.6
├── lib
│  └── python2.7
│     └── site-packages
│        ├── ewmh
│        │  ├── __init__.py
│        │  ├── __init__.pyc
│        │  ├── ewmh.py
│        │  └── ewmh.pyc
│        └── ewmh-0.1.6.dist-info
│           ├── DESCRIPTION.rst
│           ├── INSTALLER
│           ├── METADATA
│           ├── metadata.json
│           ├── RECORD
│           ├── top_level.txt
│           └── WHEEL
└── nix-support
   └── propagated-build-inputs

Could you review it again? @FRidh

@dotlambda
Copy link
Member

@GrahamcOfBorg build python2.pkgs.ewmh python3.pkgs.ewmh

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.ewmh, python3.pkgs.ewmh

Partial log (click to expand)

Successfully installed ewmh-0.1.6
/tmp/nix-build-python2.7-ewmh-0.1.6.drv-0/ewmh-0.1.6
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/5w6by7hwyyck70bcn2qnwrwp9qgpjpfd-python2.7-ewmh-0.1.6
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/5w6by7hwyyck70bcn2qnwrwp9qgpjpfd-python2.7-ewmh-0.1.6/lib
patching script interpreter paths in /nix/store/5w6by7hwyyck70bcn2qnwrwp9qgpjpfd-python2.7-ewmh-0.1.6
checking for references to /tmp/nix-build-python2.7-ewmh-0.1.6.drv-0 in /nix/store/5w6by7hwyyck70bcn2qnwrwp9qgpjpfd-python2.7-ewmh-0.1.6...
/nix/store/5w6by7hwyyck70bcn2qnwrwp9qgpjpfd-python2.7-ewmh-0.1.6
/nix/store/cnjnmvmqag1p26knw8m4svcm1slq8qx9-python3.6-ewmh-0.1.6

dotlambda
dotlambda approved these changes Apr 7, 2018
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

It is indeed a library: http://ewmh.readthedocs.io/en/latest/ewmh.html

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.ewmh, python3.pkgs.ewmh

Partial log (click to expand)

Successfully installed ewmh-0.1.6
/build/ewmh-0.1.6
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/459rhvda7gxnq9j5997imndld7qw0ac1-python2.7-ewmh-0.1.6
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/459rhvda7gxnq9j5997imndld7qw0ac1-python2.7-ewmh-0.1.6/lib
patching script interpreter paths in /nix/store/459rhvda7gxnq9j5997imndld7qw0ac1-python2.7-ewmh-0.1.6
checking for references to /build in /nix/store/459rhvda7gxnq9j5997imndld7qw0ac1-python2.7-ewmh-0.1.6...
/nix/store/459rhvda7gxnq9j5997imndld7qw0ac1-python2.7-ewmh-0.1.6
/nix/store/0abdmkapnbcq3zjz3qnal13bariar8v1-python3.6-ewmh-0.1.6

@dotlambda dotlambda merged commit a05f246 into NixOS:master Apr 7, 2018
@bennyandresen bennyandresen deleted the pyewmh branch April 7, 2018 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh requested changes

@dotlambda dotlambda dotlambda approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@bennyandresen @FRidh @GrahamcOfBorg @dotlambda @Janik-Haag