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

[DSM 5] Update OctoPrint to 1.3.2 #2676

Closed
wants to merge 1 commit into from

Conversation

markbastiaans
Copy link
Contributor

@markbastiaans markbastiaans commented Feb 21, 2017

Motivation: OctoPrint is in need of a new version. I'll update this PR as I make progress.
Linked issues: I aim to make the package DSM6 compatible (#2661) and solve #2386 and #2599.

Checklist

  • Update SPK to 1.3.2
  • Fix netifaces issue for some archs
  • Cleanup
  • Squash commits
  • Build rule arch-evansport completed successfully
  • Build rule all-supported completed successfully
  • Package upgrade completed successfully
  • New installation of package completed successfully

@markbastiaans markbastiaans changed the title Octoprint Octoprint 1.3.1 Feb 21, 2017
@markbastiaans markbastiaans changed the title Octoprint 1.3.1 Update OctoPrint 1.3.1 Feb 21, 2017
@markbastiaans markbastiaans changed the title Update OctoPrint 1.3.1 Update OctoPrint to 1.3.1 Feb 21, 2017
@markbastiaans
Copy link
Contributor Author

markbastiaans commented Feb 22, 2017

So far so good on evansport and DSM5.2. As-is, this PR should make things work on DSM5.2 again for most recent architectures. I have some problems building netifaces for older PPC architectures (e.g. qoric) though.

@Dr-Bean great work on the new wheel approach! It really makes maintaining Python packages a lot easier to do.

Some questions before I continue:

  • Regarding the clean-up, do you have a preference for a separate cross package for OctoPrint, or should it be merged with the SPK? Patching is not required anymore.
  • Regarding DSM6, any pointers / similar packages I can take a look at to make things work? I'll have to do it flying blind for the moment since my own NAS is still on 5.2.
  • Also, do you prefer DSM6 compatibility in a separate PR?

@Dr-Bean
Copy link
Contributor

Dr-Bean commented Feb 23, 2017

If Octoprint can be built directly as a wheel (looks like it: no patches, no build-time dependencies), then the cross package should be removed. You can add the download site directly to the requirements file if I'm not mistaken.

DSM6 compatibility for Octoprint was added into the dsm6 branch, see this commit: be04bd9. The changes for DSM6 for Octoprint are probably complete, but if you find out anything missing, open a PR against the dsm6 branch.

The current version of netifaces is somewhat buggy for the Synology toolchains. As far as I can tell, you'll want to pin it to 0.10.4: 0.10.5 builds a wheel, it also installs, but it doesn't actually work for mutiple arches.

@tareko
Copy link

tareko commented Feb 26, 2017

I was looking at the be04bd9 commit. Before I go and try to compile this myself, am I understanding correctly that there is now an octoprint version that works on dsm6? If so, how could I access it?

Thank you,

tarek : )

@markbastiaans
Copy link
Contributor Author

@tareko the DSM6 branch doesn't have my changes yet. I'll open up a separate PR for DSM6 once I finish up and get this one merged.

@markbastiaans
Copy link
Contributor Author

markbastiaans commented Feb 27, 2017

I can confirm that fixing netifaces works for nearly all supported architectures on DSM5.2. Unfortunately I can't get monaco and armada38x to build on my build environment. It would be great if someone could check those.

@Dr-Bean I applied your advice and the cross package is now gone. Let me know if you find anything else I should change before the merge.

@markbastiaans markbastiaans force-pushed the octoprint branch 5 times, most recently from 27ccfbd to f5bd7a9 Compare March 2, 2017 08:49
@markbastiaans markbastiaans changed the title Update OctoPrint to 1.3.1 [DSM 5] Update OctoPrint to 1.3.2 Mar 18, 2017
@KaraokeStu KaraokeStu force-pushed the master branch 2 times, most recently from 6b6cde6 to b0652b2 Compare March 23, 2017 15:11
@markbastiaans
Copy link
Contributor Author

So I've looked at the DSM6 version for Octoprint and merging this change should be as easy as some selective cherry-picking. I'll get on it once I'll have some spare time and my dev machine at hand.

@Careless
Copy link

@markbastiaans any progress or time to take a look at this at all, lately?

@Careless
Copy link

@markbastiaans

any progress?

how do I get Octoprint 1.3.4 to run on DSM6.0?

anyone?

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.

5 participants