From 07e6d118508d25243528fad6947896f92956457d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 16 Apr 2013 22:33:32 +0200 Subject: [PATCH] deps: Remove old manual deps checkers --- mopidy/utils/deps.py | 87 --------------------------------------- tests/utils/deps_test.py | 88 ---------------------------------------- 2 files changed, 175 deletions(-) diff --git a/mopidy/utils/deps.py b/mopidy/utils/deps.py index 2c55efb3..e743e19e 100644 --- a/mopidy/utils/deps.py +++ b/mopidy/utils/deps.py @@ -10,7 +10,6 @@ pygst.require('0.10') import gst import pkg_resources -import pykka from . import formatting @@ -32,13 +31,6 @@ def format_dependency_list(adapters=None): platform_info, python_info, gstreamer_info, - pykka_info, - pyspotify_info, - pylast_info, - dbus_info, - serial_info, - cherrypy_info, - ws4py_info, functools.partial(pkg_info, 'Mopidy', True), ] @@ -172,82 +164,3 @@ def _gstreamer_check_elements(): gst.registry_get_default().get_feature_list(gst.TYPE_ELEMENT_FACTORY)] return [ (element, element in known_elements) for element in elements_to_check] - - -def pykka_info(): - return { - 'name': 'Pykka', - 'version': pykka.__version__, - 'path': pykka.__file__, - } - - -def pyspotify_info(): - dep_info = {'name': 'pyspotify'} - try: - import spotify - if hasattr(spotify, '__version__'): - dep_info['version'] = spotify.__version__ - else: - dep_info['version'] = '< 1.3' - dep_info['path'] = spotify.__file__ - dep_info['other'] = 'Built for libspotify API version %d' % ( - spotify.api_version,) - except ImportError: - pass - return dep_info - - -def pylast_info(): - dep_info = {'name': 'pylast'} - try: - import pylast - dep_info['version'] = pylast.__version__ - dep_info['path'] = pylast.__file__ - except ImportError: - pass - return dep_info - - -def dbus_info(): - dep_info = {'name': 'dbus-python'} - try: - import dbus - dep_info['version'] = dbus.__version__ - dep_info['path'] = dbus.__file__ - except ImportError: - pass - return dep_info - - -def serial_info(): - dep_info = {'name': 'pyserial'} - try: - import serial - dep_info['version'] = serial.VERSION - dep_info['path'] = serial.__file__ - except ImportError: - pass - return dep_info - - -def cherrypy_info(): - dep_info = {'name': 'cherrypy'} - try: - import cherrypy - dep_info['version'] = cherrypy.__version__ - dep_info['path'] = cherrypy.__file__ - except ImportError: - pass - return dep_info - - -def ws4py_info(): - dep_info = {'name': 'ws4py'} - try: - import ws4py - dep_info['version'] = ws4py.__version__ - dep_info['path'] = ws4py.__file__ - except ImportError: - pass - return dep_info diff --git a/tests/utils/deps_test.py b/tests/utils/deps_test.py index fff0c1c3..482a1cf5 100644 --- a/tests/utils/deps_test.py +++ b/tests/utils/deps_test.py @@ -7,37 +7,6 @@ pygst.require('0.10') import gst import mock -import pykka - -try: - import dbus -except ImportError: - dbus = False - -try: - import pylast -except ImportError: - pylast = False - -try: - import serial -except ImportError: - serial = False - -try: - import spotify -except ImportError: - spotify = False - -try: - import cherrypy -except ImportError: - cherrypy = False - -try: - import ws4py -except ImportError: - ws4py = False from mopidy.utils import deps @@ -102,63 +71,6 @@ class DepsTest(unittest.TestCase): '.'.join(map(str, gst.get_pygst_version())), result['other']) self.assertIn('Relevant elements:', result['other']) - def test_pykka_info(self): - result = deps.pykka_info() - - self.assertEquals('Pykka', result['name']) - self.assertEquals(pykka.__version__, result['version']) - self.assertIn('pykka', result['path']) - - @unittest.skipUnless(spotify, 'pyspotify not found') - def test_pyspotify_info(self): - result = deps.pyspotify_info() - - self.assertEquals('pyspotify', result['name']) - self.assertEquals(spotify.__version__, result['version']) - self.assertIn('spotify', result['path']) - self.assertIn('Built for libspotify API version', result['other']) - self.assertIn(str(spotify.api_version), result['other']) - - @unittest.skipUnless(pylast, 'pylast not found') - def test_pylast_info(self): - result = deps.pylast_info() - - self.assertEquals('pylast', result['name']) - self.assertEquals(pylast.__version__, result['version']) - self.assertIn('pylast', result['path']) - - @unittest.skipUnless(dbus, 'dbus not found') - def test_dbus_info(self): - result = deps.dbus_info() - - self.assertEquals('dbus-python', result['name']) - self.assertEquals(dbus.__version__, result['version']) - self.assertIn('dbus', result['path']) - - @unittest.skipUnless(serial, 'serial not found') - def test_serial_info(self): - result = deps.serial_info() - - self.assertEquals('pyserial', result['name']) - self.assertEquals(serial.VERSION, result['version']) - self.assertIn('serial', result['path']) - - @unittest.skipUnless(cherrypy, 'cherrypy not found') - def test_cherrypy_info(self): - result = deps.cherrypy_info() - - self.assertEquals('cherrypy', result['name']) - self.assertEquals(cherrypy.__version__, result['version']) - self.assertIn('cherrypy', result['path']) - - @unittest.skipUnless(ws4py, 'ws4py not found') - def test_ws4py_info(self): - result = deps.ws4py_info() - - self.assertEquals('ws4py', result['name']) - self.assertEquals(ws4py.__version__, result['version']) - self.assertIn('ws4py', result['path']) - @mock.patch('pkg_resources.get_distribution') def test_pkg_info(self, get_distribution_mock): dist_mopidy = mock.Mock()