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

Making maraschino independent from external libs #12

Merged
merged 0 commits into from
Dec 31, 2011

Conversation

Mar2zz
Copy link
Contributor

@Mar2zz Mar2zz commented Dec 24, 2011

This pull requests enables cherrypy/jsonrpclib local, so users won't have to easy_install them. Also see my posts at xbmc.org about the why:
http:https://forum.xbmc.org/showthread.php?p=967659&posted=1#post967659

Now I am going to try to get flask and flask-sqlalchemy to be local.

@Mar2zz
Copy link
Contributor Author

Mar2zz commented Dec 24, 2011

Installprocedure with this commit:

Much easier.

@Mar2zz
Copy link
Contributor Author

Mar2zz commented Dec 24, 2011

I used packages from my /usr/local/python2.7 system. Dunno if this is gonna five troubles on machines that have no python 2.7. But it works on a minimul ubuntu install with python 2.7.2, and slackware too is confirmed on xbmc.org.

I could change everything and use python-packages from 2.6 if it issues a lot on 2.6 installs.

@Mar2zz
Copy link
Contributor Author

Mar2zz commented Dec 24, 2011

lol, a lot of requests, looks like a mess, but it's on stage with your repo. You could try mine everything still works. I moved files around (removed cluttering in rootfolder).

@N3MIS15
Copy link
Collaborator

N3MIS15 commented Dec 25, 2011

i was unable to make a db file with the latest 'restructure' commit, but after i made it everything seems to work fine

@Mar2zz
Copy link
Contributor Author

Mar2zz commented Dec 25, 2011

fixed db creation by setup.py.

@Jeroenve
Copy link
Contributor

Running with python2.6 works on my Synology NAS

@gugahoi
Copy link
Collaborator

gugahoi commented Dec 30, 2011

Implemented on experimental branch.

@gugahoi gugahoi merged commit f5c09ff into mrkipling:master Dec 31, 2011
@gugahoi
Copy link
Collaborator

gugahoi commented Jan 2, 2012

Is this on master? I do not remember merging anything into it. What happened to this? How did it close? Very confused right now, nothing related to this is in master's history and it does not seem to be included.

@mrkipling can you check this out? I've been waiting on this pull so I can rebase experimental off master and do some more 'nightly' updates with the other pull requests.

@mrkipling
Copy link
Owner

Hmm, not sure - perhaps GitHub is getting confused because of this commit:

f5c09ff

whose SHA also starts with f5c09ff?

@N3MIS15
Copy link
Collaborator

N3MIS15 commented Jan 2, 2012

Would be a shame to see this get lost. Makes using maraschino on unraid server sooo much easier

@mrkipling
Copy link
Owner

I'm not seeing any commits for this pull request any more. Perhaps they got lost when it was closed above?

Mar2zz, would you be able to re-open the pull request and check that it is working on master? Doubt that I'll be able to get round to looking at it today, but I agree that it shouldn't get lost.

@gugahoi
Copy link
Collaborator

gugahoi commented Jan 2, 2012

I agree, makes it using it in any os extremely easy. Maybe @Mar2zz can re-do this? I'm thinking it got deleted when he re-forked the repo. Worst case scenario we have the modifications in the history of the experimental branch.

@mrkipling
Copy link
Owner

@gugahoi, that's not such a big deal as experimental is going to be periodically reset to master (as it's just a testbed which will end up containing lots of stuff that didn't make the cut). Not to be confused with a "prerelease" or "beta" branch, should we go down that route in the future.

@gugahoi
Copy link
Collaborator

gugahoi commented Jan 2, 2012

I know I just meant that we can reproduce the modifications looking at the experimental branch if we absolutely have to. the history will contain the commits made by Mar2zz and with that we will be able to re-do them on master.

@mrkipling
Copy link
Owner

Oh I see, I misunderstood what you meant. Yep, either way. Would be easiest if the pull request was re-opened so let's see if Mar2zz can do that.

@Mar2zz
Copy link
Contributor Author

Mar2zz commented Jan 2, 2012

Can't reopen it, but I will import every module again in a few hours
from now. Modules go in a subfolder module, and things like tools.py and
stuff in a subfolder lib. That's ok?
Did transmission make it to master?

Op 02-01-12 13:10, Bradley Abrahams schreef:

Oh I see, I misunderstood what you meant. Yep, either way. Would be easiest if the pull request was re-opened so let's see if Mar2zz can do that.


Reply to this email directly or view it on GitHub:
#12 (comment)

@mrkipling
Copy link
Owner

Mar2zz, sounds good - although I'm slightly confused what you mean by "module", as I thought that you were adding external libraries to the repo? My advice would be as follows:

  • If you're adding external libraries then add them in a folder called "lib"
  • If you're tidying up Maraschino's modules (like the Sickbeard module, library, etc.) then place them in a folder called "modules"

As for things like tools.py, I don't really mind too much, but it seems logical to keep it in the root perhaps?

@mrkipling
Copy link
Owner

Regarding transmission, that isn't on master yet (haven't had time to look at it).

@Mar2zz
Copy link
Contributor Author

Mar2zz commented Jan 2, 2012

It's here: #31

A slighty different approach this time, see my comment over there. Please let someone confirm it works before merging. (download my masterrepo and test.

(sudo pip uninstall flask flask-sqlalchemy sqlalchemy jsonrpc cherrypy will uninstall all external python libs there were mandatory before).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants