Merge branch 'develop'

Dockerfile

@@ -1,4 +1,6 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
+
+COPY . /iris
 
 RUN set -ex \
 # Official Mopidy install for Debian/Ubuntu along with some extensions
@@ -13,7 +15,9 @@ RUN set -ex \
        gstreamer1.0-plugins-bad \
        python-crypto \
        python-pykka \
+       python-tornado \
        git \
+       nano \
  && curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \
  && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
  && apt-get update \

mopidy_iris/handlers.py

@@ -16,20 +16,6 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
 
     def check_origin(self, origin):
         return True
-        
-    def select_subprotocol(self, subprotocols):
-
-        # select one of our subprotocol elements and return it. This confirms the connection has been accepted.
-        protocols = mem.iris.digest_protocol(subprotocols)
-
-        # if we've auto-generated some ids, the provided subprotocols was a string, so just return it right back
-        # this allows a connection to be completed
-        if protocols['generated']:
-            return subprotocols[0]
-            
-        # otherwise, just return one of the supplied subprotocols
-        else:
-            return protocols['client_id']
 
     def open(self):
 

setup.py

@@ -24,8 +24,7 @@ setup(
         'Mopidy >= 2.0',
         'Mopidy-Local-Images >= 1.0',
         'ConfigObj >= 5.0.6',
-        'requests >= 2.0.0',
-        'tornado >= 3.2, < 5.0'
+        'requests >= 2.0.0'
     ],
     classifiers=[
         'Environment :: No Input/Output (Daemon)',