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

Jump to bottom

pythonPackages.cadquery: init at 2.0RC0 & cq-editor: init at 0.1RC1 #66254

Merged
merged 9 commits into from Nov 30, 2019
Merged

pythonPackages.cadquery: init at 2.0RC0 & cq-editor: init at 0.1RC1 #66254

merged 9 commits into from Nov 30, 2019

Conversation

marcus7070
Copy link
Member

@marcus7070 marcus7070 commented Aug 7, 2019 •
edited

edit: Got cq-editor working, updated pull request.

Motivation for this change

Init pythonPackages.cadquery and prepare dependencies for packaging cq-editor in the future (I've given up on getting cq-editor working for the moment, I'll get back to it sometime soon). Partial resolution of #65830.

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @costrouc

@marcus7070 marcus7070 requested a review from FRidh as a code owner August 7, 2019 07:34
@marcus7070 marcus7070 changed the title pythonPackages.cadquery: init at 2.0RC0 pythonPackages.cadquery: init at 2.0RC0 & cq-editor: init at 0.1RC1 Aug 8, 2019
@ofborg ofborg bot requested a review from costrouc October 11, 2019 04:15
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/81

This was referenced Nov 20, 2019
Closed
Closed
@PlumpMath
Copy link

I am going home after finishing my work at the company. I'll get home soon and try to install it. Thanks a lot. ,.

ghost
ghost approved these changes Nov 22, 2019
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

  • built cadquery on Ubuntu with sandboxing
  • built cadquery on NixOS wtih sandboxing

I have added a few style recommendations, but no deal-breakers. You will have to rebase to current master.
Hopfully someone with commit access can take a look at this soon, since you are waiting for such a long time already.

maintainers/maintainer-list.nix Show resolved Hide resolved
pkgs/applications/graphics/cq-editor/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/cadquery/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/cadquery/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyscreenshot/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pytest-repeat/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pytest-qt/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/cadquery/default.nix Outdated Show resolved Hide resolved
pkgs/applications/graphics/cq-editor/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyscreenshot/default.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

remember that small updates to a PR should be squashed into the commits which relate to the package, https://nixos.org/nixpkgs/manual/#submitting-changes-making-patches

specifically:

If you have commits pkg-name: oh, forgot to insert whitespace: squash commits in this case. Use git rebase -i.

@marcus7070
Copy link
Member Author

Squashed changes from code reviews into main commits. Retested, everything still builds.

@marcus7070
Copy link
Member Author

Disabled cadquery for python versions where it did not build.

@adisbladis adisbladis merged commit e8f2764 into NixOS:master Nov 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@adisbladis adisbladis adisbladis requested changes

@FRidh FRidh Awaiting requested review from FRidh

@costrouc costrouc Awaiting requested review from costrouc

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

Successfully merging this pull request may close these issues.

None yet
7 participants
@marcus7070 @nixos-discourse @PlumpMath @jonringer @adisbladis @Janik-Haag @costrouc