Merge pull request #220 from cmd-ntrf/cleanup

Remove code no longer used

Author: consideRatio

batchspawner/batchspawner.py

@@ -16,11 +16,10 @@
   * job names instead of PIDs
 """
 import asyncio
-from async_generator import async_generator, yield_, yield_from_
+from async_generator import async_generator, yield_
 import pwd
 import os
 import re
-import sys
 
 import xml.etree.ElementTree as ET
 
@@ -29,17 +28,11 @@
 from jinja2 import Template
 
 from tornado import gen
-from tornado.process import Subprocess
-from subprocess import CalledProcessError
-from tornado.iostream import StreamClosedError
 
 from jupyterhub.spawner import Spawner
-from jupyterhub.traitlets import Command
 from traitlets import Integer, Unicode, Float, Dict, default
 
-from jupyterhub.utils import random_port
 from jupyterhub.spawner import set_user_setuid
-import jupyterhub
 
 
 def format_template(template, *args, **kwargs):
@@ -422,7 +415,7 @@ async def start(self):
         self.ip = self.traits()["ip"].default_value
         self.port = self.traits()["port"].default_value
 
-        if jupyterhub.version_info >= (0, 8) and self.server:
+        if self.server:
             self.server.port = self.port
 
         job = await self.submit_batch_script()
@@ -466,10 +459,6 @@ async def start(self):
             if hasattr(self, "mock_port"):
                 self.port = self.mock_port
 
-        if jupyterhub.version_info < (0, 7):
-            # store on user for pre-jupyterhub-0.7:
-            self.user.server.port = self.port
-            self.user.server.ip = self.ip
         self.db.commit()
         self.log.info(
             "Notebook server job {0} started at {1}:{2}".format(

batchspawner/tests/test_spawners.py

@@ -6,7 +6,7 @@
 from traitlets import Unicode
 import time
 import pytest
-from jupyterhub import orm, version_info
+from jupyterhub import orm
 from tornado import gen
 
 try:
@@ -61,25 +61,18 @@ def run_command(self, *args, **kwargs):
 def new_spawner(db, spawner_class=BatchDummy, **kwargs):
     kwargs.setdefault("cmd", ["singleuser_command"])
     user = db.query(orm.User).first()
-    if version_info < (0, 8):
-        hub = db.query(orm.Hub).first()
-    else:
-        hub = Hub()
-        user = User(user, {})
-        server = Server()
-        # Set it after constructions because it isn't a traitlet.
+    hub = Hub()
+    user = User(user, {})
+    server = Server()
+    # Set it after constructions because it isn't a traitlet.
     kwargs.setdefault("hub", hub)
     kwargs.setdefault("user", user)
     kwargs.setdefault("poll_interval", 1)
-    if version_info < (0, 8):
-        spawner = spawner_class(db=db, **kwargs)
-        spawner.mock_port = testport
-    else:
-        print("JupyterHub >=0.8 detected, using new spawner creation")
-        # These are not traitlets so we have to set them here
-        spawner = user._new_spawner("", spawner_class=spawner_class, **kwargs)
-        spawner.server = server
-        spawner.mock_port = testport
+
+    # These are not traitlets so we have to set them here
+    spawner = user._new_spawner("", spawner_class=spawner_class, **kwargs)
+    spawner.server = server
+    spawner.mock_port = testport
     return spawner
 
 
@@ -91,10 +84,7 @@ def test_stress_submit(db, io_loop):
 
 
 def check_ip(spawner, value):
-    if version_info < (0, 7):
-        assert spawner.user.server.ip == value
-    else:
-        assert spawner.ip == value
+    assert spawner.ip == value
 
 
 def test_spawner_start_stop_poll(db, io_loop):

requirements.txt

@@ -1,3 +1,3 @@
 async_generator>=1.8
 jinja2
-jupyterhub>=0.5
+jupyterhub>=0.9

setup.py

@@ -40,7 +40,7 @@
     url="http://jupyter.org",
     license="BSD",
     platforms="Linux, Mac OS X",
-    python_requires="~=3.3",
+    python_requires="~=3.5",
     keywords=["Interactive", "Interpreter", "Shell", "Web", "Jupyter"],
     classifiers=[
         "Intended Audience :: Developers",