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

Octoprint 1.4.0 with Python 3 (WIP; help needed) #82294

Closed
wants to merge 2 commits into from
Closed

Octoprint 1.4.0 with Python 3 (WIP; help needed) #82294

wants to merge 2 commits into from

Conversation

WhittlesJr
Copy link
Contributor

Motivation for this change

See #82292

This is a stab at updating to Octoprint 1.4.0 with Python 3. It's not currently working, because of a mysterious duplicated package that I can't seem to figure out. Jinja2 is not building because it sees a duplicated dependency (MarkupSafe).

Things done
  • 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 nixpkgs-review --run "nixpkgs-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.

@abbradar @gebner @peterhoeg

@ofborg ofborg bot requested review from gebner and abbradar March 11, 2020 00:22
@flokli flokli requested a review from mweinelt March 11, 2020 10:24
mweinelt
mweinelt reviewed Mar 11, 2020
View reviewed changes
pkgs/applications/misc/octoprint/default.nix
checkPhase = ''
HOME=$(mktemp -d) nosetests ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"}
HOME=$(mktemp -d) nosetests --exclude-test=util.test_pip.test_check_setup ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"}
Copy link
Member

@mweinelt mweinelt Mar 11, 2020 •
edited

Choose a reason for hiding this comment

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

--exclude-test does not exist.

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 believe it does: https://pypi.org/project/nose-exclude/

Copy link
Member

Choose a reason for hiding this comment

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

But if that's not part of your checkInputs, how is it pulled in?

Copy link
Member

Choose a reason for hiding this comment

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

Also --ignore-files=test_pip.py is probably required.

Copy link
Member

Choose a reason for hiding this comment

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

And the sentry-sdk tests fail for me, so i disabled them locally. This makes the package build.

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'm not sure, but IIRC the exclude flag was properly doing the job at one point while I was tinkering.

Do you mean you got Octoprint to build entirely?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I did.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just by adding doCheck = false; to sentry-sdk? Because that doesn't help for me:

Found duplicated packages in closure for dependency 'MarkupSafe':
  MarkupSafe 1.1.1 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  MarkupSafe 1.1.1 (/nix/store/ig1lgbvd518i5yci62mm8hxpsjm9hlvy-python3.7-MarkupSafe-1.1.1/lib/python3.7/site-packages)

And now this is happening too:

Found duplicated packages in closure for dependency 'urllib3':
  urllib3 1.25.8 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  urllib3 1.25.8 (/nix/store/ka86vbis93vyyj3rn494n5yc3ymk9x24-python3.7-urllib3-1.25.8/lib/python3.7/site-packages)
Found duplicated packages in closure for dependency 'six':
  six 1.14.0 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  six 1.14.0 (/nix/store/f2p4y8awg8px77wj2p8x5v8cv4sr7rgw-python3.7-six-1.14.0/lib/python3.7/site-packages)
Found duplicated packages in closure for dependency 'pyparsing':
  pyparsing 2.4.6 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  pyparsing 2.4.6 (/nix/store/kdbxn8yk7v8j36slygdhz59xy1j7s6ii-python3.7-pyparsing-2.4.6/lib/python3.7/site-packages)
Found duplicated packages in closure for dependency 'pyasn1':
  pyasn1 0.4.8 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  pyasn1 0.4.8 (/nix/store/d14dfx619lgcaqcxr16i54j43s259yan-python3.7-pyasn1-0.4.8/lib/python3.7/site-packages)
Found duplicated packages in closure for dependency 'packaging':
  packaging 20.3 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  packaging 20.1 (/nix/store/wrhaln323yi4i9d4s51ky92sj1r2cyky-python3.7-packaging-20.1/lib/python3.7/site-packages)
Found duplicated packages in closure for dependency 'idna':
  idna 2.9 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  idna 2.8 (/nix/store/g38lfy4g4k5g0aaipzrmql9nzrbl3cn7-python3.7-idna-2.8/lib/python3.7/site-packages)
Found duplicated packages in closure for dependency 'certifi':
  certifi 2019.11.28 (/nix/store/qvpsgs0sl3sh3knm5b1ya49x5zlf9v6j-python3-3.7.6/lib/python3.7/site-packages)
  certifi 2019.11.28 (/nix/store/gr6i7d5zbw6x62k7i0vzkfcdff3rqrbb-python3.7-certifi-2019.11.28/lib/python3.7/site-packages)

Copy link
Member

Choose a reason for hiding this comment

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

Diff and build.log https://gist.github.com/mweinelt/5b12577a07e952157000247c536f37eb

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm getting the same result as @mweinelt. @WhittlesJr Do you have sandboxing disabled by any chance?

@lopsided98
Copy link
Contributor

This is the commit I am currently testing: 3326c99398c0e27f4abcb9431773b8e6a48e6b68, and here is the diff between yours and mine: https://github.com/WhittlesJr/nixpkgs/compare/WhittlesJr:octoprint-overrides..lopsided98:octoprint-update

@FRidh
Copy link
Member

FRidh commented Mar 12, 2020

Version that builds #82392
Have not tested it because I do not use this program.

@FRidh FRidh closed this Mar 12, 2020
@FRidh FRidh added this to Done in Python 2 deprecation via automation Mar 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mweinelt mweinelt mweinelt left review comments

@lopsided98 lopsided98 lopsided98 left review comments

@gebner gebner Awaiting requested review from gebner

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
2.status: work-in-progress 6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
Python 2 deprecation
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@WhittlesJr @lopsided98 @FRidh @mweinelt