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

Move Pykka version check to startup, to unbreak docs building

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-10-16 22:09:40 +02:00
parent 986c0a9ad3
commit 074fb431bf
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mopidy/__init__.py
View File

@ -1,17 +1,12 @@
import os
import platform
import sys import sys
if not (2, 6) <= sys.version_info < (3,): if not (2, 6) <= sys.version_info < (3,):
sys.exit(u'Mopidy requires Python >= 2.6, < 3') sys.exit(u'Mopidy requires Python >= 2.6, < 3')
from distutils.version import StrictVersion
import os
import platform
import glib import glib
import pykka
if StrictVersion(pykka.__version__) < StrictVersion('0.16'):
sys.exit(u'Mopidy requires Pykka >= 0.16')
__version__ = '0.8.0' __version__ = '0.8.0'
DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy') DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy')

12
mopidy/__main__.py
View File

@ -1,3 +1,4 @@
from distutils.version import StrictVersion
import logging import logging
import optparse import optparse
import os import os
@ -7,6 +8,8 @@ import sys
import gobject import gobject
gobject.threads_init() gobject.threads_init()
import pykka
# Extract any non-GStreamer arguments, and leave the GStreamer arguments for # Extract any non-GStreamer arguments, and leave the GStreamer arguments for
# processing by GStreamer. This needs to be done before GStreamer is imported, # processing by GStreamer. This needs to be done before GStreamer is imported,
@ -39,6 +42,7 @@ logger = logging.getLogger('mopidy.main')
def main(): def main():
check_dependencies()
signal.signal(signal.SIGTERM, process.exit_handler) signal.signal(signal.SIGTERM, process.exit_handler)
loop = gobject.MainLoop() loop = gobject.MainLoop()
options = parse_options() options = parse_options()
@ -66,6 +70,14 @@ def main():
process.stop_remaining_actors() process.stop_remaining_actors()
def check_dependencies():
pykka_required = '0.16'
if StrictVersion(pykka.__version__) < StrictVersion(pykka_required):
sys.exit(
u'Mopidy requires Pykka >= %s, but found %s' %
(pykka_required, pykka.__version__))
def parse_options(): def parse_options():
parser = optparse.OptionParser( parser = optparse.OptionParser(
version=u'Mopidy %s' % versioning.get_version()) version=u'Mopidy %s' % versioning.get_version())