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

Update and add some Octoprint plugins #80057

Merged
merged 4 commits into from Feb 14, 2020
Merged

Conversation

WhittlesJr
Copy link
Contributor

@WhittlesJr WhittlesJr commented Feb 13, 2020

Motivation for this change

I wanted these packages

Things done

Added ABL_Expert, GcodeEditor, and SimpleEmergencyStop.
Updated PrintTImeGenius to latest version.

  • 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.

@gebner
@abbradar
@peterhoeg

@@ -168,13 +168,13 @@ let

printtimegenius = buildPlugin rec {
pname = "PrintTimeGenius";
version = "2.0.2";
version = "2.2.1";
Copy link
Member

Choose a reason for hiding this comment

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

In case you didn't notice: typically you also need to update the marlin-calc package to the version listed here: https://github.com/eyal0/OctoPrint-PrintTimeGenius/tree/master/octoprint_PrintTimeGenius/analyzers

This time there have been no changes to marlin-calc (except for adding a windows cross build target, which doesn't concern us at all), so you're fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh ok, thanks for the heads up.

plugin_requires = ["OctoPrint>=1.3.9rc1", "psutil", "sarge"]
-from sys import version_info
-if version_info[0] < 3:
- plugin_requires.append("logging")
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need to disable the logging package?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They added these lines because of this issue:
eyal0/OctoPrint-PrintTimeGenius#176

However, in our environment, "logging" isn't a package and thus can't be found, so it breaks the build. (It's in the Python standard library.) I don't think that removing these lines actually disables logging, I think it just removes its requirement as a plugin.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, that makes sense.

@gebner gebner merged commit b39175b into NixOS:master Feb 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants