andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #373 from jodal/feature/use-setuptools

Browse Source 
Switch from distutils to setuptools
This commit is contained in:
Thomas Adamcik 2013-04-01 04:34:38 -07:00
commit 257d3d6332
10 changed files with 57 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.egg-info
*.pyc
*.swp
.coverage

2
MANIFEST.in
View File

@ -7,7 +7,7 @@ include mopidy/backends/spotify/spotify_appkey.key
include pylintrc
recursive-include docs *
prune docs/_build
recursive-include mopidy/frontends/http/data/
recursive-include mopidy/frontends/http/data *
recursive-include requirements *
recursive-include tests *.py
recursive-include tests/data *

5
bin/mopidy
View File

@ -1,5 +0,0 @@
#! /usr/bin/env python
if __name__ == '__main__':
from mopidy.__main__ import main
main()

5
bin/mopidy-scan
View File

@ -1,5 +0,0 @@
#! /usr/bin/env python
if __name__ == '__main__':
from mopidy.scanner import main
main()

9
docs/changes.rst
View File

@ -4,6 +4,15 @@ Changes
This change log is used to track all major changes to Mopidy.
v0.14.0 (UNRELEASED)
====================
**Dependencies**
- setuptools or distribute is now required. We've introduced this dependency to
use setuptools' entry points functionality to find installed Mopidy
extensions.
v0.13.0 (2013-03-31)
====================

1
docs/development.rst
View File

@ -359,7 +359,6 @@ Creating releases
#. Build package and upload to PyPI::
rm MANIFEST # Will be regenerated by setup.py
python setup.py sdist upload
#. Update the Debian package.

3
docs/extensiondev.rst
View File

@ -162,14 +162,13 @@ class that will connect the rest of the dots.
#py_modules=['mopidy_soundspot'],
zip_safe=False,
include_package_data=True,
platforms='any',
install_requires=[
'setuptools',
'Mopidy',
'pysoundspot',
],
entry_points={
'mopidy.extension': [
b'mopidy.extension': [
'soundspot = mopidy_soundspot:Extension',
],
},

23
docs/installation/index.rst
View File

@ -135,10 +135,10 @@ Pip.
sudo easy_install pip
#. Then get, build, and install the latest releast of pyspotify, pylast, pykka,
#. Then get, build, and install the latest release of pyspotify, pylast,
and Mopidy using Pip::
sudo pip install -U pyspotify pylast pykka mopidy
sudo pip install -U pyspotify pylast mopidy
#. Finally, you need to set a couple of :doc:`settings </settings>`, and then
you're ready to :doc:`run Mopidy </running>`.
@ -171,15 +171,7 @@ can install Mopidy from PyPI using Pip.
sudo yum install -y gcc python-devel python-pip
#. Then you'll need to install all of Mopidy's hard dependencies:
- Pykka >= 1.0::
sudo pip install -U pykka
On Fedora the binary is called ``pip-python``::
sudo pip-python install -U pykka
#. Then you'll need to install all of Mopidy's hard non-Python dependencies:
- GStreamer 0.10.x, with Python bindings. GStreamer is packaged for most
popular Linux distributions. Search for GStreamer in your package manager,
@ -235,7 +227,8 @@ can install Mopidy from PyPI using Pip.
sudo pip install -U pyspotify
# Fedora:
On Fedora the binary is called ``pip-python``::
sudo pip-python install -U pyspotify
#. Optional: If you want to scrobble your played tracks to Last.fm, you need
@ -243,7 +236,8 @@ can install Mopidy from PyPI using Pip.
sudo pip install -U pylast
# Fedora:
On Fedora the binary is called ``pip-python``::
sudo pip-python install -U pylast
#. Optional: To use MPRIS, e.g. for controlling Mopidy from the Ubuntu Sound
@ -259,7 +253,8 @@ can install Mopidy from PyPI using Pip.
sudo pip install -U mopidy
# Fedora:
On Fedora the binary is called ``pip-python``::
sudo pip-python install -U mopidy
To upgrade Mopidy to future releases, just rerun this command.

3
requirements/core.txt
View File

@ -1,2 +1,5 @@
setuptools
# Available as python-setuptools in Debian/Ubuntu
Pykka >= 1.1
# Available as python-pykka from apt.mopidy.com

116
setup.py
View File

@ -1,101 +1,51 @@
"""
Most of this file is taken from the Django project, which is BSD licensed.
"""
from __future__ import unicode_literals
from distutils.core import setup
from distutils.command.install_data import install_data
from distutils.command.install import INSTALL_SCHEMES
import os
import re
import sys
from setuptools import setup, find_packages
def get_version():
init_py = open('mopidy/__init__.py').read()
def get_version(filename):
init_py = open(filename).read()
metadata = dict(re.findall("__([a-z]+)__ = '([^']+)'", init_py))
return metadata['version']
class osx_install_data(install_data):
# On MacOS, the platform-specific lib dir is
# /System/Library/Framework/Python/.../ which is wrong. Python 2.5 supplied
# with MacOS 10.5 has an Apple-specific fix for this in
# distutils.command.install_data#306. It fixes install_lib but not
# install_data, which is why we roll our own install_data class.
def finalize_options(self):
# By the time finalize_options is called, install.install_lib is set to
# the fixed directory, so we set the installdir to install_lib. The
# install_data class uses ('install_data', 'install_dir') instead.
self.set_undefined_options('install', ('install_lib', 'install_dir'))
install_data.finalize_options(self)
if sys.platform == "darwin":
cmdclasses = {'install_data': osx_install_data}
else:
cmdclasses = {'install_data': install_data}
def fullsplit(path, result=None):
"""
Split a pathname into components (the opposite of os.path.join) in a
platform-neutral way.
"""
if result is None:
result = []
head, tail = os.path.split(path)
if head == '':
return [tail] + result
if head == path:
return result
return fullsplit(head, [tail] + result)
# Tell distutils to put the data_files in platform-specific installation
# locations. See here for an explanation:
# http://groups.google.com/group/comp.lang.python/browse_thread/
# thread/35ec7b2fed36eaec/2105ee4d9e8042cb
for scheme in INSTALL_SCHEMES.values():
scheme['data'] = scheme['purelib']
# Compile the list of packages available, because distutils doesn't have
# an easy way to do this.
packages, data_files = [], []
root_dir = os.path.dirname(__file__)
if root_dir != b'':
os.chdir(root_dir)
project_dir = b'mopidy'
for dirpath, dirnames, filenames in os.walk(project_dir):
# Ignore dirnames that start with '.'
for i, dirname in enumerate(dirnames):
if dirname.startswith(b'.'):
del dirnames[i]
if b'__init__.py' in filenames:
packages.append(b'.'.join(fullsplit(dirpath)))
elif filenames:
data_files.append([
dirpath, [os.path.join(dirpath, f) for f in filenames]])
setup(
name='Mopidy',
version=get_version(),
author='Stein Magnus Jodal',
author_email='stein.magnus@jodal.no',
packages=packages,
package_data={b'mopidy': ['backends/spotify/spotify_appkey.key']},
cmdclass=cmdclasses,
data_files=data_files,
scripts=['bin/mopidy', 'bin/mopidy-scan'],
version=get_version('mopidy/__init__.py'),
url='http://www.mopidy.com/',
license='Apache License, Version 2.0',
author='Stein Magnus Jodal',
author_email='stein.magnus@jodal.no',
description='Music server with MPD and Spotify support',
long_description=open('README.rst').read(),
packages=find_packages(exclude=['tests', 'tests.*']),
zip_safe=False,
include_package_data=True,
install_requires=[
'setuptools',
'Pykka >= 1.1',
],
extras_require={
b'spotify': ['pyspotify >= 1.9, < 1.11'],
b'lastfm': ['pylast >= 0.5.7'],
b'http': ['cherrypy >= 3.2.2', 'ws4py >= 0.2.3'],
b'external_mixers': ['pyserial'],
},
test_suite='nose.collector',
tests_require=[
'nose',
'mock >= 0.7',
'unittest2',
],
entry_points={
b'console_scripts': [
'mopidy = mopidy.__main__:main',
'mopidy-scan = mopidy.scanner:main',
],
b'mopidy.extension': [],
},
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: No Input/Output (Daemon)',