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

vncdo: 0.11.2 -> 0.12.0 #106380

Merged
merged 1 commit into from Dec 10, 2020
Merged

vncdo: 0.11.2 -> 0.12.0 #106380

merged 1 commit into from Dec 10, 2020

Conversation

evanjs
Copy link
Member

@evanjs evanjs commented Dec 8, 2020

Motivation for this change

Needed this in a project that uses vncdotool but it seems we've only supported the Python 2 variant since f8df74b

Not sure if there are any functional differences or how well it works now, but the project I needed this for did stop complaining about missing imports for vncdotool and both Python 2 and Python 3 variants did build successfully.

Tests seemed to work fine with Python 3, but I wasn't able to get them working with Python 2, though I figure that's not too important now that Python 2 is EOL, etc.

nixpkgs-review seems to be happy?

nixpkgs review rev HEAD 
vncdo/python2-and-3-support [$] ❯ nixpkgs-review rev HEAD
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 69, done.
remote: Counting objects: 100% (54/54), done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 30 (delta 22), reused 18 (delta 14), pack-reused 0
Unpacking objects: 100% (30/30), 3.39 KiB | 267.00 KiB/s, done.
From https://github.com/NixOS/nixpkgs
   3c535791c86..4a7bcab1d0a  master     -> refs/nixpkgs-review/0
$ git worktree add /home/evanjs/.cache/nixpkgs-review/rev-02860258e93460653967450b38fc6750f85b6ae1/nixpkgs 4a7bcab1d0a61d69688156376d5cdb38d81edff2
Preparing worktree (detached HEAD 4a7bcab1d0a)
Updating files: 100% (23482/23482), done.
HEAD is now at 4a7bcab1d0a flask-appbuilder: fix flask-babel dep
$ nix-env -f /home/evanjs/.cache/nixpkgs-review/rev-02860258e93460653967450b38fc6750f85b6ae1/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 02860258e93460653967450b38fc6750f85b6ae1
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/evanjs/.cache/nixpkgs-review/rev-02860258e93460653967450b38fc6750f85b6ae1/nixpkgs -qaP --xml --out-path --show-trace --meta
3 packages added:
python37Packages.vncdo (init at 0.12.0) python38Packages.vncdo (init at 0.12.0) python39Packages.vncdo (init at 0.12.0)

1 package updated:
vncdo (0.11.2 → 0.12.0)

$ nix --experimental-features nix-command build --no-link --keep-going --option build-use-sandbox relaxed -f /home/evanjs/.cache/nixpkgs-review/rev-02860258e93460653967450b38fc6750f85b6ae1/build.nix
3 packages built:
python37Packages.vncdo vncdo python39Packages.vncdo

$ nix-shell /home/evanjs/.cache/nixpkgs-review/rev-02860258e93460653967450b38fc6750f85b6ae1/shell.nix
these 4 paths will be fetched (0.51 MiB download, 2.47 MiB unpacked):
  /nix/store/63fv8bz35y6nkyif07mym7646n6qk4ns-bash-interactive-4.4-p23-dev
  /nix/store/82lxhlys1kvkvk9xlf8qd3ri6lwa43d3-bash-interactive-4.4-p23-info
  /nix/store/ab516d4hzp1z7nq8wqq3igzgagmnrc8j-bash-interactive-4.4-p23-doc
  /nix/store/l5pjvli9ln63yvnib9cmwvnq53sg5rby-bash-interactive-4.4-p23-man
copying path '/nix/store/ab516d4hzp1z7nq8wqq3igzgagmnrc8j-bash-interactive-4.4-p23-doc' from 'https://cache.nixos.org'...
copying path '/nix/store/82lxhlys1kvkvk9xlf8qd3ri6lwa43d3-bash-interactive-4.4-p23-info' from 'https://cache.nixos.org'...
copying path '/nix/store/l5pjvli9ln63yvnib9cmwvnq53sg5rby-bash-interactive-4.4-p23-man' from 'https://cache.nixos.org'...
copying path '/nix/store/63fv8bz35y6nkyif07mym7646n6qk4ns-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...
Things done

  • Use pythonPackages instead of python2Packages

  • Add vncdo to top-level/python-packages so the library can be used by
    other Python programs

  • Use toPythonApplication for vnc in top-level/all-packages

  • run tests if using Python 3+

@evanjs evanjs requested a review from zimbatm December 8, 2020 20:30
@ofborg ofborg bot requested a review from elitak December 8, 2020 20:40
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 106380 run on x86_64-darwin 1

3 packages built:
  • python37Packages.vncdo
  • vncdo (python38Packages.vncdo)
  • python39Packages.vncdo

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 106380 run on x86_64-linux 1

3 packages built:
  • python37Packages.vncdo
  • vncdo (python38Packages.vncdo)
  • python39Packages.vncdo

@evanjs evanjs force-pushed the vncdo/python2-and-3-support branch from 0286025 to 4498ca5 Compare December 9, 2020 14:35
@FRidh
Copy link
Member

FRidh commented Dec 9, 2020

Please see "15.19.2.2.3. toPythonApplication function" in the Nixpkgs manual. I got confused with the diffs and see you've done this now, so ignore my other comment, my apologies!

What's left is to move the expression under pkgs/development/python-modules.nix.

@evanjs
Copy link
Member Author

evanjs commented Dec 9, 2020

Please see "15.19.2.2.3. toPythonApplication function" in the Nixpkgs manual. I got confused with the diffs and see you've done this now, so ignore my other comment, my apologies!

What's left is to move the expression under pkgs/development/python-modules.nix.

Good call, I should do that now that it's a library!

@evanjs
vncdo: 0.11.2 -> 0.12.0
2d086a1 
* Use pythonPackages instead of python2Packages

* Add vncdo to top-level/python-packages so the library can be used by
other Python programs
* Use toPythonApplication for vnc in top-level/all-packages
* run tests if using Python 3+
* move expression to development/python-modules
@evanjs evanjs force-pushed the vncdo/python2-and-3-support branch from 4498ca5 to 2d086a1 Compare December 9, 2020 14:54
@zimbatm zimbatm merged commit 095ecf7 into NixOS:master Dec 10, 2020
@evanjs evanjs deleted the vncdo/python2-and-3-support branch December 10, 2020 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@FRidh FRidh FRidh approved these changes

@jonringer jonringer Awaiting requested review from jonringer

@zimbatm zimbatm Awaiting requested review from zimbatm

@elitak elitak Awaiting requested review from elitak

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 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
@evanjs @SuperSandro2000 @FRidh @zimbatm