Merge branch 'feature-py3' into develop

DavisNT · Mar 21, 2020 · f55f52c · f55f52c
2 parents 3aaa491 + 463f898
commit f55f52c
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 63 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,25 @@
 language: python
+os: linux
+dist: bionic
 
 python:
-  - "2.7_with_system_site_packages"
+  - "3.7"
 
 env:
-  - TOX_ENV=py27
+  - TOX_ENV=py37
   - TOX_ENV=flake8
 
+before_install:
+  # Mock Python gi package
+  - export PYUSRSITEDIR=$(python -m site --user-site)
+  - mkdir -p $PYUSRSITEDIR
+  - "echo \"import sys; import mock; sys.modules['gi'] = mock.Mock(); sys.modules['gi.repository'] = mock.Mock(); sys.modules['gi.repository'].Gst.version.side_effect = lambda: (1, 14, 0)\" > ${PYUSRSITEDIR}/usercustomize.py"
+
 install:
   - "pip install tox"
 
 script:
   - "tox -e $TOX_ENV"
 
 after_success:
-  - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls; coveralls; fi"
+  - "if [ $TOX_ENV == 'py37' ]; then pip install coveralls requests; coveralls; fi"
diff --git a/mopidy_playbackdefaults/__init__.py b/mopidy_playbackdefaults/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 
 from mopidy import config, ext
@@ -36,10 +34,10 @@ def __init__(self, config, core):
         super(PlaybackDefaultsFrontend, self).__init__()
 
         if type(config[PlaybackDefaultsExtension.ext_name]['default_random']) is bool:
-            core.tracklist.random = config[PlaybackDefaultsExtension.ext_name]['default_random']
+            core.tracklist.set_random(config[PlaybackDefaultsExtension.ext_name]['default_random'])
         if type(config[PlaybackDefaultsExtension.ext_name]['default_repeat']) is bool:
-            core.tracklist.repeat = config[PlaybackDefaultsExtension.ext_name]['default_repeat']
+            core.tracklist.set_repeat(config[PlaybackDefaultsExtension.ext_name]['default_repeat'])
         if type(config[PlaybackDefaultsExtension.ext_name]['default_consume']) is bool:
-            core.tracklist.consume = config[PlaybackDefaultsExtension.ext_name]['default_consume']
+            core.tracklist.set_consume(config[PlaybackDefaultsExtension.ext_name]['default_consume'])
         if type(config[PlaybackDefaultsExtension.ext_name]['default_single']) is bool:
-            core.tracklist.single = config[PlaybackDefaultsExtension.ext_name]['default_single']
+            core.tracklist.set_single(config[PlaybackDefaultsExtension.ext_name]['default_single'])
diff --git a/setup.py b/setup.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import re
 
 from setuptools import find_packages, setup
@@ -23,9 +21,10 @@ def get_version(filename):
     packages=find_packages(exclude=['tests', 'tests.*']),
     zip_safe=False,
     include_package_data=True,
+    python_requires='>= 3.7',
     install_requires=[
         'setuptools',
-        'Mopidy >= 0.19',
+        'Mopidy >= 3.0',
         'Pykka >= 1.1',
     ],
     test_suite='nose.collector',
@@ -43,7 +42,7 @@ def get_version(filename):
         'Intended Audience :: End Users/Desktop',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Topic :: Multimedia :: Sound/Audio :: Players',
     ],
 )
diff --git a/tests/test_extension.py b/tests/test_extension.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import unittest
 
 import mock

diff --git a/tests/test_frontend.py b/tests/test_frontend.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import unittest
 
 import mock
@@ -12,94 +10,98 @@ class PlaybackDefaultsFrontendTest(unittest.TestCase):
     def test_no_settings(self):
         config = {'playbackdefaults': {'default_random': '', 'default_repeat': '', 'default_consume': '', 'default_single': ''}}
         core = mock.Mock()
-        core.tracklist.random = 'untouched'
-        core.tracklist.repeat = 'untouched'
-        core.tracklist.consume = 'untouched'
-        core.tracklist.single = 'untouched'
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
         PlaybackDefaultsFrontend(config, core)
 
-        self.assertEqual(core.tracklist.random, 'untouched')
-        self.assertEqual(core.tracklist.repeat, 'untouched')
-        self.assertEqual(core.tracklist.consume, 'untouched')
-        self.assertEqual(core.tracklist.single, 'untouched')
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
     def test_random(self):
         config = {'playbackdefaults': {'default_random': '', 'default_repeat': '', 'default_consume': '', 'default_single': ''}}
         core = mock.Mock()
-        core.tracklist.random = 'untouched'
-        core.tracklist.repeat = 'untouched'
-        core.tracklist.consume = 'untouched'
-        core.tracklist.single = 'untouched'
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
         config['playbackdefaults']['default_random'] = True
         PlaybackDefaultsFrontend(config, core)
-        self.assertTrue(core.tracklist.random)
+        core.tracklist.set_random.assert_called_once_with(True)
 
         config['playbackdefaults']['default_random'] = False
         PlaybackDefaultsFrontend(config, core)
-        self.assertFalse(core.tracklist.random)
+        self.assertEqual(core.tracklist.set_random.call_count, 2)
+        core.tracklist.set_random.assert_called_with(False)
 
-        self.assertEqual(core.tracklist.repeat, 'untouched')
-        self.assertEqual(core.tracklist.consume, 'untouched')
-        self.assertEqual(core.tracklist.single, 'untouched')
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
     def test_repeat(self):
         config = {'playbackdefaults': {'default_random': '', 'default_repeat': '', 'default_consume': '', 'default_single': ''}}
         core = mock.Mock()
-        core.tracklist.random = 'untouched'
-        core.tracklist.repeat = 'untouched'
-        core.tracklist.consume = 'untouched'
-        core.tracklist.single = 'untouched'
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
         config['playbackdefaults']['default_repeat'] = True
         PlaybackDefaultsFrontend(config, core)
-        self.assertTrue(core.tracklist.repeat)
+        core.tracklist.set_repeat.assert_called_once_with(True)
 
         config['playbackdefaults']['default_repeat'] = False
         PlaybackDefaultsFrontend(config, core)
-        self.assertFalse(core.tracklist.repeat)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 2)
+        core.tracklist.set_repeat.assert_called_with(False)
 
-        self.assertEqual(core.tracklist.random, 'untouched')
-        self.assertEqual(core.tracklist.consume, 'untouched')
-        self.assertEqual(core.tracklist.single, 'untouched')
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
     def test_consume(self):
         config = {'playbackdefaults': {'default_random': '', 'default_repeat': '', 'default_consume': '', 'default_single': ''}}
         core = mock.Mock()
-        core.tracklist.random = 'untouched'
-        core.tracklist.repeat = 'untouched'
-        core.tracklist.consume = 'untouched'
-        core.tracklist.single = 'untouched'
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
         config['playbackdefaults']['default_consume'] = True
         PlaybackDefaultsFrontend(config, core)
-        self.assertTrue(core.tracklist.consume)
+        core.tracklist.set_consume.assert_called_once_with(True)
 
         config['playbackdefaults']['default_consume'] = False
         PlaybackDefaultsFrontend(config, core)
-        self.assertFalse(core.tracklist.consume)
+        self.assertEqual(core.tracklist.set_consume.call_count, 2)
+        core.tracklist.set_consume.assert_called_with(False)
 
-        self.assertEqual(core.tracklist.random, 'untouched')
-        self.assertEqual(core.tracklist.repeat, 'untouched')
-        self.assertEqual(core.tracklist.single, 'untouched')
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
     def test_single(self):
         config = {'playbackdefaults': {'default_random': '', 'default_repeat': '', 'default_consume': '', 'default_single': ''}}
         core = mock.Mock()
-        core.tracklist.random = 'untouched'
-        core.tracklist.repeat = 'untouched'
-        core.tracklist.consume = 'untouched'
-        core.tracklist.single = 'untouched'
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
+        self.assertEqual(core.tracklist.set_single.call_count, 0)
 
         config['playbackdefaults']['default_single'] = True
         PlaybackDefaultsFrontend(config, core)
-        self.assertTrue(core.tracklist.single)
+        core.tracklist.set_single.assert_called_once_with(True)
 
         config['playbackdefaults']['default_single'] = False
         PlaybackDefaultsFrontend(config, core)
-        self.assertFalse(core.tracklist.single)
+        self.assertEqual(core.tracklist.set_single.call_count, 2)
+        core.tracklist.set_single.assert_called_with(False)
 
-        self.assertEqual(core.tracklist.random, 'untouched')
-        self.assertEqual(core.tracklist.repeat, 'untouched')
-        self.assertEqual(core.tracklist.consume, 'untouched')
+        self.assertEqual(core.tracklist.set_random.call_count, 0)
+        self.assertEqual(core.tracklist.set_repeat.call_count, 0)
+        self.assertEqual(core.tracklist.set_consume.call_count, 0)
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, flake8
+envlist = py37, flake8
 
 [testenv]
 sitepackages = true
@@ -9,7 +9,6 @@ deps =
     nose
     freezegun
     mopidy
-install_command = pip install --allow-unverified=mopidy --pre {opts} {packages}
 commands = nosetests -v --with-xunit --xunit-file=xunit-{envname}.xml --with-coverage --cover-package=mopidy_playbackdefaults
 
 [testenv:flake8]