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

kicad: python2 -> python3 #72813

Closed
wants to merge 4 commits into from
Closed

kicad: python2 -> python3 #72813

wants to merge 4 commits into from
+29 −28

Conversation

matthuszagh
Copy link
Contributor

@matthuszagh matthuszagh commented Nov 5, 2019 •
edited
Loading

Motivation for this change

Python2 is EOL and KiCad supports Python 3.

Things done

Bump python version to 3, wx_python to Phoenix and gtk2 to gtk3.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 @

Sorry, something went wrong.

@matthuszagh matthuszagh mentioned this pull request Nov 5, 2019
Closed
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 5, 2019
@evils
Copy link
Member

evils commented Nov 5, 2019

Built it via nix-review, kicad crashes on "open project" with

(kicad:13351): GLib-GIO-ERROR **: 05:06:23.908: No GSettings schemas are installed on the system
Trace/breakpoint trap (core dumped)

Also, you're aware pkgs/top-level/all-packages.nix calls kicad with wxGTK = wxGTK30;?

@matthuszagh
Copy link
Contributor Author

@evils-devils are you referring to the (wxGTK.override { withGtk2 = false; }) part? I am aware of the wxGTK = wxGTK30; call, but if you look in its build expression it uses gtk2 unless you set that to false. And if I remember correctly the build fails otherwise.

I'm not familiar with nix-review, I'll look into it. However, this builds fine for me (i.e. nix-build -A kicad). Not sure why we would get different results.

@evils
Copy link
Member

evils commented Nov 5, 2019

FYI, checked out your branch, ran nix-shell -I nixpkgs=. --pure -p kicad same issue
are you saying you cannot reproduce the crash on "create new project" (or "open existing project")?

Additionally, it seems to build and fail identically with wxGTK31

@matthuszagh
Copy link
Contributor Author

Ah ok yes I am seeing that issue. Only see it when I add --pure. Thanks for bringing this to my attention. I'll look into it.

@evils
Copy link
Member

evils commented Nov 9, 2019

FWIW, i've had a go at fixing this here.

@matthuszagh
Copy link
Contributor Author

I'll take a look more closely when I have time tomorrow. However, does this work without the -DKICAD_SCRIPTING_WXPYTHON=ON flag? I believe that's required for Phoenix support.

@matthuszagh
Copy link
Contributor Author

matthuszagh commented Nov 9, 2019 •
edited
Loading

@evils-devils those changes look good to me. My comment above on the kicad scripting flag isn't an issue since cmake sets this automatically if phoenix and scripting are set. I've also added a dependency on the six python package which is needed in order to get python scripting to work. The new commit reflects all changes.

@ofborg ofborg bot removed the 6.topic: python label Nov 9, 2019
@evils
Copy link
Member

evils commented Nov 10, 2019

i'm not sure it's a great idea for you to commit my changes as your own...

@matthuszagh
Copy link
Contributor Author

@evils-devils, sorry about that, I haven't encountered this situation before so I'm not familiar with the normal process. What do you think is the best way to handle it? From the few previous PRs I've done here it seems like this would normally be 1 commit. I guess given our combined contributions to this package we could make it 3? My original change, your change and then my addition of the six python package. Let me know your thoughts.

@evils
Copy link
Member

evils commented Nov 10, 2019

that sounds fine to me

@matthuszagh
kicad: add python six package as dep
981564d 
This is needed for python scripting support.
evils
evils reviewed Nov 10, 2019
View reviewed changes
pkgs/applications/science/electronics/kicad/default.nix Outdated
@@ -103,11 +94,17 @@ in stdenv.mkDerivation rec {
done
'';

# GSETTINGS_SCHEMAS_PATH includes gtk twice, so wrapProgram with ${wxGTK.gtk} is used instead of wrapGApp
# since wrapGApp needs most of these set explicitly anyway (with dontWrapGApps = true;), lets not depend on it
preFixup = ''
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
Copy link
Member

@evils evils Nov 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

doh, this line (101) isn't used anymore, the --set should either be added to wrapProgram
or it's not needed, you found scripting to work?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I haven't given it thorough testing, but yes it appears to work.

Copy link
Member

Choose a reason for hiding this comment

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

i can't launch the python shell from pcbnew, got something working, just cleaning up the commit

Copy link
Member

Choose a reason for hiding this comment

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

ok, fixed here
also had to wrap pcbnew, otherwise python doesn't work if you run it directly

Copy link
Contributor Author

Choose a reason for hiding this comment

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

looks good to me. i've included it in the pr

evils
evils reviewed Nov 11, 2019
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -23817,8 +23817,10 @@ in
fped = callPackage ../applications/science/electronics/fped { };

kicad = callPackage ../applications/science/electronics/kicad {
wxGTK = wxGTK30;
boost = boost160;
wxGTK = wxGTK30.override { withGtk2 = false; };
Copy link
Member

Choose a reason for hiding this comment

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

If #73145 gets merged before this, the override part of this can be removed.

@evils evils mentioned this pull request Nov 26, 2019
Merged
26 tasks
@gebner gebner closed this in #74259 Jan 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evils evils

@doronbehar doronbehar

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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
@matthuszagh @evils @doronbehar @FRidh