Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

28 setup py #42

Merged
merged 7 commits into from Apr 8, 2013

Conversation

Projects
None yet
4 participants
Collaborator

felixhummel commented Mar 23, 2013

This is a rebased branch for #28.

@felixhummel felixhummel referenced this pull request Mar 23, 2013

Closed

setup.py #28

tony commented Mar 23, 2013

@tooxie Is this okay or should @felixhummel do a full rebase to scrunch the commits?

@felixhummel can we try to do a git rebase -i against this remote's master? If it's done to this branch (instead of making a new one) it may need a git push --force to your branch. http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html.

@kumar303 kumar303 commented on an outdated diff Mar 23, 2013

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 filetype=python :
+
+from setuptools import setup, find_packages
+
+setup(name='shiva',
+ version='1.0.0',
+ description='A RESTful API to your music collection',
+ author='Alvaro Mouriño',
+ author_email='alvaro@mourino.net',
+ url='https://github.com/tooxie/shiva-server',
+ package_dir={'':'.'},
+ packages=find_packages('.'),
+ install_requires=[
@kumar303

kumar303 Mar 23, 2013

btw, requirements files make things a little more flexible so if you wanted both you could do this:

      install_requires=[ln.strip() for ln in
                        open(os.path.join(os.path.dirname(__file__),
                                          'requirements.pip'))
                        if not ln.startswith('#')]

For that to work you also have to add a MANIFEST.in file at the same level as the setup.py file and add this:

include requirements.pip
Owner

tooxie commented Mar 24, 2013

@tony I would appreciate some squashing of the commits for a cleaner history, yes =)

@felixhummel let me know if you can't, I could do it, no problem.

@tooxie tooxie and 1 other commented on an outdated diff Mar 24, 2013

-Then continue with the installation process as described previously.
+* Go to http://127.0.0.1:9002/artists and http://127.0.0.1:9002/<resource> (See `Resources`_)
@tooxie

tooxie Mar 24, 2013

Owner

I totally agree with the idea of having a working link as an example; the thing is that find this line a little unclear. What about:

Point your browser to a Resource, like: http://127.0.0.1:5000/artists (See `Resources`_)
@felixhummel

felixhummel Mar 24, 2013

Collaborator

I like that.

@tooxie tooxie commented on an outdated diff Mar 24, 2013

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 filetype=python :
+
+from setuptools import setup, find_packages
+
+setup(name='shiva',
+ version='1.0.0',
@tooxie

tooxie Mar 24, 2013

Owner

Let's start with version 0.1.0.

Collaborator

felixhummel commented Mar 24, 2013

OK. I'll get on it tomorrow evening. It's a good opportunity for me to dive deeper into rebasing and squashing. Force push to this master it is.

Owner

tooxie commented Mar 24, 2013

@felixhummel Great. Check git rebase -i and git add -p, those are great features. Very helpful. Let me know if you need help with that.

Collaborator

felixhummel commented Mar 24, 2013

@tooxie I rebased and integrated the version and resource link issues. I also squashed some things; though I'm not totally happy, but I think good is good enough.
Unfortunately, this PR does not reflect the changes to my master. @tony Do you have any ideas what to do now?

Owner

tooxie commented Mar 24, 2013

@felixhummel I'd recommend you to follow the following steps (assuming that upstream is my remote, tooxie, and your fork is origin):

  • git pull --rebase upstream master (you'll have to resolve some conflicts)
  • git rebase -i upstream/master (fixup, edit, and all the magic...)
  • git push -f origin 28-setup-py

With that you will have a mergeable PR.

tony commented Mar 24, 2013

@felixhummel if you give me access to your repository I'll rebase for you.

Collaborator

felixhummel commented Mar 24, 2013

It works! :)
Problem was: We are in PR #42 which is based on 28-setup-py. I thought we were in PR #28, which is based on master.

Owner

tooxie commented Mar 31, 2013

I would like to merge the oggsupport branch before this PR, because it will make some backward-incompatible changes. Then I'll help you rebase this one. I'm looking forward to merging it and integrating the setup.py 👍

Owner

tooxie commented Apr 1, 2013

The oggsupport branch was just merged. This may result in some conflicts when rebasing. Sorry for that 😅

Collaborator

felixhummel commented Apr 4, 2013

Hi, @tooxie. It would be great if you could rebase this. I'm a little busy at the moment.

Owner

tooxie commented Apr 4, 2013

Sure! Don't worry. I would need push access to your branch, though.

Collaborator

felixhummel commented Apr 4, 2013

I added you as a collaborator. Is that enough?

Owner

tooxie commented Apr 4, 2013

I guess so, if I can't push I'll let you know. Thanks!

Owner

tooxie commented Apr 6, 2013

Rebased. @felixhummel could you please review it once again before I merge it?

@tooxie tooxie referenced this pull request Apr 6, 2013

Closed

Replace Eyed3 with Mutagen #47

Collaborator

felixhummel commented Apr 8, 2013

Jup, looks good.

@tooxie tooxie added a commit that referenced this pull request Apr 8, 2013

@tooxie tooxie Merge pull request #42 from felixhummel/28-setup-py
28 setup py
7f54b79

@tooxie tooxie merged commit 7f54b79 into tooxie:master Apr 8, 2013

Collaborator

felixhummel commented Apr 8, 2013

Woohoo! \o/
:feelsgood:

Owner

tooxie commented Apr 8, 2013

🍻

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment