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

*diag: use python3 and toPythonApplication #44408

Merged
merged 5 commits into from
Aug 3, 2018
Merged

*diag: use python3 and toPythonApplication #44408

merged 5 commits into from
Aug 3, 2018
+13 −9

Conversation

dotlambda
Copy link
Member

@dotlambda dotlambda commented Aug 3, 2018 •
edited
Loading

Motivation for this change

Actdiag is only an application, not a Python module.
This makes the actdiag package use python3 instead of python2 (#18185).

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)
  • Fits CONTRIBUTING.md.

cc @bjornfor

Sorry, something went wrong.

@dotlambda dotlambda requested a review from FRidh as a code owner August 3, 2018 15:28
@FRidh
Copy link
Member

FRidh commented Aug 3, 2018

Note sphinx can use actdiag. I don't know exactly how it uses it though.

@dotlambda
Copy link
Member Author

Seems like it's listed in this package's install_requires: https://github.com/thewtex/sphinx-contrib/blob/master/actdiag/setup.py#L31
I'll use toPythonApplication then.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: actdiag

Partial log (click to expand)

test_setup_with_args (test_rst_directives.TestRstDirectives) ... ok
test_width_option (test_rst_directives.TestRstDirectives) ... /nix/store/w993i6pqb3ydp2jrb2nrzdxa7hihp8rl-python3.6-blockdiag-1.5.3/lib/python3.6/site-packages/blockdiag/imagedraw/svg.py:313: ResourceWarning: unclosed file <_io.BufferedWriter name='/build/tmp8s39i4ap/actdiag-14943e5aef73ba3fc3d4e3f1c0c54ba031773c03.svg'>
  open(self.filename, 'wb').write(image.encode('utf-8'))
ok

----------------------------------------------------------------------
Ran 46 tests in 4.458s

OK (skipped=3)
/nix/store/gg9hd4w5h908frjzvlvfcgnc2vkcpisw-actdiag-0.5.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: actdiag

Partial log (click to expand)

test_setup_with_args (test_rst_directives.TestRstDirectives) ... ok
test_width_option (test_rst_directives.TestRstDirectives) ... /nix/store/xyjfw6sjyrgb8d347f0vrdqgddp15vxd-python3.6-blockdiag-1.5.3/lib/python3.6/site-packages/blockdiag/imagedraw/svg.py:313: ResourceWarning: unclosed file <_io.BufferedWriter name='/build/tmphf0vm6kt/actdiag-9eb410289283c5a7ae84ccc2e826711aada62af3.svg'>
  open(self.filename, 'wb').write(image.encode('utf-8'))
ok

----------------------------------------------------------------------
Ran 46 tests in 4.365s

OK (skipped=3)
/nix/store/zmaf4jl94dfkrpy40ikald6r688irr09-actdiag-0.5.4

@dotlambda dotlambda force-pushed the actdiag-application branch from 09efcf3 to 54ae6ea Compare August 3, 2018 15:42
@dotlambda dotlambda changed the title actdiag: move out of pythonPackages actdiag: use python3 and toPythonApplication Aug 3, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: actdiag

Partial log (click to expand)

test_setup_with_args (test_rst_directives.TestRstDirectives) ... ok
test_width_option (test_rst_directives.TestRstDirectives) ... /nix/store/w993i6pqb3ydp2jrb2nrzdxa7hihp8rl-python3.6-blockdiag-1.5.3/lib/python3.6/site-packages/blockdiag/imagedraw/svg.py:313: ResourceWarning: unclosed file <_io.BufferedWriter name='/build/tmpyesm5b5f/actdiag-de16454128945bc141191863f350781abad4f3c0.svg'>
  open(self.filename, 'wb').write(image.encode('utf-8'))
ok

----------------------------------------------------------------------
Ran 46 tests in 0.818s

OK (skipped=3)
/nix/store/9afwxqphrnywvzchd6zab7m0gbwks6w0-python3.6-actdiag-0.5.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: actdiag

Partial log (click to expand)

test_setup_with_args (test_rst_directives.TestRstDirectives) ... ok
test_width_option (test_rst_directives.TestRstDirectives) ... /nix/store/xyjfw6sjyrgb8d347f0vrdqgddp15vxd-python3.6-blockdiag-1.5.3/lib/python3.6/site-packages/blockdiag/imagedraw/svg.py:313: ResourceWarning: unclosed file <_io.BufferedWriter name='/build/tmpz_c_2w3n/actdiag-e23aaa2801d3b85a46ac9ec35d87252db9e27570.svg'>
  open(self.filename, 'wb').write(image.encode('utf-8'))
ok

----------------------------------------------------------------------
Ran 46 tests in 4.315s

OK (skipped=3)
/nix/store/9kpb63gg79lg0shr2v8rsflf220bgkb3-python3.6-actdiag-0.5.4

@dotlambda
Copy link
Member Author

@GrahamcOfBorg build python2.pkgs.actdiag python3.pkgs.actdiag

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2.pkgs.actdiag, python3.pkgs.actdiag

Partial log (click to expand)

test_setup_noviewbox_is_true (test_rst_directives.TestRstDirectives) ... ok
test_setup_with_args (test_rst_directives.TestRstDirectives) ... ok
test_width_option (test_rst_directives.TestRstDirectives) ... ok

----------------------------------------------------------------------
Ran 46 tests in 3.724s

OK (skipped=3)
/nix/store/bsgz3w11frfgpkmmxsw0450cckigkpxm-python2.7-actdiag-0.5.4
/nix/store/9kpb63gg79lg0shr2v8rsflf220bgkb3-python3.6-actdiag-0.5.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2.pkgs.actdiag, python3.pkgs.actdiag

Partial log (click to expand)

test_width_option (test_rst_directives.TestRstDirectives) ... /nix/store/w993i6pqb3ydp2jrb2nrzdxa7hihp8rl-python3.6-blockdiag-1.5.3/lib/python3.6/site-packages/blockdiag/imagedraw/svg.py:313: ResourceWarning: unclosed file <_io.BufferedWriter name='/build/tmpxk5z3k8v/actdiag-a6cb0f22b16772ccfb1184bfbca7303f568813e2.svg'>
  open(self.filename, 'wb').write(image.encode('utf-8'))
ok

----------------------------------------------------------------------
Ran 46 tests in 1.415s

OK (skipped=3)
/nix/store/q6737ijy8q25dzzrr89mvwllg3p0mq7r-python2.7-actdiag-0.5.4
/nix/store/9afwxqphrnywvzchd6zab7m0gbwks6w0-python3.6-actdiag-0.5.4

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: actdiag, blockdiag, nwdiag, seqdiag

Partial log (click to expand)

these paths will be fetched (4.07 MiB download, 16.32 MiB unpacked):
  /nix/store/bqmvsj2dh9qq3cw7l1vi3f6dxmxcgdxd-python3.6-nwdiag-1.0.4
  /nix/store/fk9iijwrziw42n983d02wyhr6kzcd4qs-python3.6-seqdiag-0.9.6
copying path '/nix/store/bqmvsj2dh9qq3cw7l1vi3f6dxmxcgdxd-python3.6-nwdiag-1.0.4' from 'https://cache.nixos.org'...
copying path '/nix/store/fk9iijwrziw42n983d02wyhr6kzcd4qs-python3.6-seqdiag-0.9.6' from 'https://cache.nixos.org'...
/nix/store/9afwxqphrnywvzchd6zab7m0gbwks6w0-python3.6-actdiag-0.5.4
/nix/store/w993i6pqb3ydp2jrb2nrzdxa7hihp8rl-python3.6-blockdiag-1.5.3
/nix/store/bqmvsj2dh9qq3cw7l1vi3f6dxmxcgdxd-python3.6-nwdiag-1.0.4
/nix/store/fk9iijwrziw42n983d02wyhr6kzcd4qs-python3.6-seqdiag-0.9.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: actdiag, blockdiag, nwdiag, seqdiag

Partial log (click to expand)

these paths will be fetched (4.07 MiB download, 16.32 MiB unpacked):
  /nix/store/chgd7300az2l5n72bvk46qgckzkba3j1-python3.6-nwdiag-1.0.4
  /nix/store/rvcc1k6r5qbw8qfp3wyrg6rrsgd4psn1-python3.6-seqdiag-0.9.6
copying path '/nix/store/chgd7300az2l5n72bvk46qgckzkba3j1-python3.6-nwdiag-1.0.4' from 'https://cache.nixos.org'...
copying path '/nix/store/rvcc1k6r5qbw8qfp3wyrg6rrsgd4psn1-python3.6-seqdiag-0.9.6' from 'https://cache.nixos.org'...
/nix/store/9kpb63gg79lg0shr2v8rsflf220bgkb3-python3.6-actdiag-0.5.4
/nix/store/xyjfw6sjyrgb8d347f0vrdqgddp15vxd-python3.6-blockdiag-1.5.3
/nix/store/chgd7300az2l5n72bvk46qgckzkba3j1-python3.6-nwdiag-1.0.4
/nix/store/rvcc1k6r5qbw8qfp3wyrg6rrsgd4psn1-python3.6-seqdiag-0.9.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: actdiag, blockdiag

Partial log (click to expand)

/nix/store/9kpb63gg79lg0shr2v8rsflf220bgkb3-python3.6-actdiag-0.5.4
/nix/store/xyjfw6sjyrgb8d347f0vrdqgddp15vxd-python3.6-blockdiag-1.5.3

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: actdiag, blockdiag

Partial log (click to expand)

/nix/store/9afwxqphrnywvzchd6zab7m0gbwks6w0-python3.6-actdiag-0.5.4
/nix/store/w993i6pqb3ydp2jrb2nrzdxa7hihp8rl-python3.6-blockdiag-1.5.3

@dotlambda dotlambda changed the title actdiag: use python3 and toPythonApplication *diag: use python3 and toPythonApplication Aug 3, 2018
@dotlambda dotlambda merged commit c264943 into NixOS:master Aug 3, 2018
@dotlambda dotlambda deleted the actdiag-application branch March 21, 2019 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor

@FRidh FRidh

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 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
@dotlambda @FRidh @GrahamcOfBorg @bjornfor