Merge branch 'master' into citation

.travis.yml

@@ -5,6 +5,11 @@ python:
         - 3.5
         - 3.6
 dist: trusty
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
 cache: pip
 before_install:
         - pip install --upgrade pip setuptools wheel

docs/source/conf.py

@@ -14,7 +14,7 @@
 class Mock(MagicMock):
     @classmethod
     def __getattr__(cls, name):
-            return Mock()
+        return Mock()
 
 
 MOCK_MODULES = ['pygtk', 'gtk', 'gobject', 'argparse', 'numpy', 'pandas']

requirements-test.txt

@@ -1,8 +1,8 @@
 # Test suite requirements
 -r requirements.txt
-pytest>=2.8
 pytest-cov
-pytest-timeout<1.3
+# pytest will be brought in by pytest-cov
+pytest-timeout
 flake8
 mock
 rig

spalloc/_keepalive_process.py

@@ -1,11 +1,10 @@
 """ A script for keeping Spalloc jobs alive, intended to only ever be run\
     from the Spalloc client itself.
 """
-
-
-from spalloc.protocol_client import ProtocolClient, ProtocolTimeoutError
+from __future__ import print_function
 import sys
 import threading
+from spalloc.protocol_client import ProtocolClient, ProtocolTimeoutError
 
 
 def wait_for_exit(stop_event):
@@ -67,6 +66,8 @@ def keep_job_alive(hostname, port, job_id, keepalive_period, timeout,
 
 
 if __name__ == "__main__":
+    print("KEEPALIVE")
+    sys.stdout.flush()
     if len(sys.argv) != 7:
         sys.stderr.write(
             "wrong # args: should be '" + sys.argv[0] + " hostname port "

spalloc/config.py

@@ -64,16 +64,13 @@
     requires the allocation of a whole machine. If False, wrap-around links may
     or may-not be present in allocated machines. (Default: False)
 """
-
+# pylint: disable=import-error
 import os
 import os.path
 import appdirs
-
 from six import iteritems
-# pylint: disable=import-error
 from six.moves.configparser import ConfigParser, NoOptionError
 
-
 # The application name to use in config file names
 _name = "spalloc"
 

spalloc/job.py

@@ -1,12 +1,13 @@
 """ A high-level Python interface for allocating SpiNNaker boards.
 """
-
-from collections import namedtuple
+try:
+    from collections.abc import namedtuple
+except ImportError:
+    from collections import namedtuple
 import logging
 import subprocess
 import time
 import sys
-
 from .protocol_client import ProtocolClient, ProtocolTimeoutError
 from .config import read_config, SEARCH_PATH
 from .states import JobState
@@ -302,7 +303,14 @@ def __init__(self, *args, **kwargs):
         self._keepalive_process = subprocess.Popen(map(str, [
                 sys.executable, "-m", "spalloc._keepalive_process", hostname,
                 port, self.id, self._keepalive, self._timeout,
-                self._reconnect_delay]), stdin=subprocess.PIPE)
+                self._reconnect_delay]), stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        first_line = self._keepalive_process.stdout.readline().strip()
+        while "pydev debugger" in str(first_line) or len(first_line) == 0:
+            first_line = self._keepalive_process.stdout.readline().strip()
+        if first_line != b"KEEPALIVE":
+            raise Exception("Keepalive process wrote odd line: {}".format(
+                first_line))
 
     def __enter__(self):
         """ Convenience context manager for common case where a new job is to

spalloc/protocol_client.py

@@ -1,14 +1,16 @@
 """ A simple blocking spalloc_server protocol implementation.
 """
-
-import socket
-import json
-from threading import current_thread, RLock, local
-from collections import deque
-from spalloc._utils import time_left, timed_out, make_timeout
+try:
+    from collections.abc import deque
+except ImportError:
+    from collections import deque
 import errno
+import json
+import socket
 import sys
+from threading import current_thread, RLock, local
 from six import raise_from
+from spalloc._utils import time_left, timed_out, make_timeout
 
 
 class ProtocolError(Exception):

spalloc/scripts/alloc.py

@@ -95,22 +95,22 @@
 messages are sent automatically but after exiting the commands are no longer
 sent. Adding the ``--keepalive -1`` option when creating a job disables this.
 """
-
 import argparse
-from collections import OrderedDict
+try:
+    from collections.abc import OrderedDict
+except ImportError:
+    from collections import OrderedDict
 import logging
 import os
-from six import iteritems
-from six.moves import input, shlex_quote  # @UnresolvedImport
 import subprocess
 import sys
 import tempfile
-
-from spalloc import config
-from spalloc import Job, JobState, __version__
+from six import iteritems
+from six.moves import input, shlex_quote  # @UnresolvedImport
+from spalloc import (
+    config, Job, JobState, __version__, ProtocolError, ProtocolTimeoutError,
+    SpallocServerException)
 from spalloc.term import Terminal, render_definitions
-from spalloc import ProtocolError, ProtocolTimeoutError, SpallocServerException
-
 # Rig is used to implement the optional '--boot' facility.
 try:
     from rig.machine_control import MachineController

spalloc/scripts/job.py

@@ -60,16 +60,18 @@
     their boards being powered down and re-partitioned ready for another user.
 """
 import argparse
-from collections import OrderedDict
+try:
+    from collections.abc import OrderedDict
+except ImportError:
+    from collections import OrderedDict
 import datetime
-from pytz import utc
-from six import iteritems
 import sys
+from pytz import utc
 from tzlocal import get_localzone
-
+from six import iteritems
 from spalloc import __version__, JobState
-from spalloc.term import \
-    Terminal, render_definitions, render_boards, DEFAULT_BOARD_EDGES
+from spalloc.term import (
+    Terminal, render_definitions, render_boards, DEFAULT_BOARD_EDGES)
 from .support import Terminate, Script
 
 

spalloc/scripts/machine.py

@@ -16,17 +16,18 @@
 real-time.
 """
 import argparse
-from collections import defaultdict, OrderedDict
-from six import next  # pylint: disable=redefined-builtin
+try:
+    from collections.abc import defaultdict, OrderedDict
+except ImportError:
+    from collections import defaultdict, OrderedDict
 import sys
-
+from six import next  # pylint: disable=redefined-builtin
 from spalloc import __version__
-from spalloc.term import \
-    Terminal, render_table, render_definitions, render_boards, render_cells, \
-    DEFAULT_BOARD_EDGES
+from spalloc.term import (
+    Terminal, render_table, render_definitions, render_boards, render_cells,
+    DEFAULT_BOARD_EDGES)
 from .support import Terminate, Script
 
-
 # The acceptable range of server version numbers
 VERSION_RANGE_START = (0, 1, 0)
 VERSION_RANGE_STOP = (2, 0, 0)

spalloc/scripts/ps.py

@@ -10,13 +10,11 @@
 This list may be filtered by owner or machine with the ``--owner`` and
 ``--machine`` arguments.
 """
-
 import argparse
 import datetime
-from pytz import utc
 import sys
+from pytz import utc
 from tzlocal import get_localzone
-
 from spalloc import __version__, JobState
 from spalloc.term import Terminal, render_table
 from .support import Script

spalloc/scripts/support.py

@@ -1,7 +1,7 @@
 import sys
-from spalloc import config
-from spalloc import \
-    ProtocolClient, ProtocolError, ProtocolTimeoutError, SpallocServerException
+from spalloc import (
+    config, ProtocolClient, ProtocolError, ProtocolTimeoutError,
+    SpallocServerException)
 
 # The acceptable range of server version numbers
 VERSION_RANGE_START = (0, 1, 0)

spalloc/scripts/where_is.py

@@ -52,9 +52,10 @@
 """
 import sys
 import argparse
-
-from collections import OrderedDict
-
+try:
+    from collections.abc import OrderedDict
+except ImportError:
+    from collections import OrderedDict
 from spalloc import __version__
 from spalloc.term import render_definitions
 from .support import Terminate, Script

spalloc/term.py

@@ -3,14 +3,14 @@
 
 import os
 import sys
-
-from functools import partial
 from itertools import chain
-from collections import defaultdict
-
-from six import iteritems, string_types
-
+try:
+    from collections.abc import defaultdict
+except ImportError:
+    from collections import defaultdict
 from enum import IntEnum
+from functools import partial
+from six import iteritems, string_types
 
 
 class ANSIDisplayAttributes(IntEnum):
@@ -298,7 +298,7 @@ def _board_to_cartesian(x, y, z):
     -------
     x, y : int
         Equivalent Cartesian coordinates.
-    """
+    """  # noqa: W605
     cx = (2*x) - y + (1 if z == 1 else 0)
     cy = (3*y) + z
 

tests/conftest.py

@@ -1,15 +1,11 @@
-import pytest
-
-from mock import Mock
-
 import os
 import sys
 import threading
 import tempfile
-
+import pytest
+from mock import Mock
 from spalloc import ProtocolClient
 from spalloc.config import SEARCH_PATH
-
 from .common import MockServer
 
 

tests/scripts/test_alloc.py

@@ -1,14 +1,10 @@
-import pytest
-
-from mock import Mock, PropertyMock
-
 import os
 import tempfile
-
+import pytest
+from mock import Mock, PropertyMock
 from spalloc import JobState, JobDestroyedError
-
-from spalloc.scripts.alloc import \
-    write_ips_to_csv, print_info, run_command, main
+from spalloc.scripts.alloc import (
+    write_ips_to_csv, print_info, run_command, main)
 
 
 @pytest.yield_fixture

tests/scripts/test_job_script.py

@@ -1,15 +1,12 @@
+import datetime
 import pytest
-
 from mock import Mock, MagicMock
-
-import datetime
-
 from spalloc import JobState, ProtocolError
 from spalloc.term import Terminal
-from spalloc.scripts.job import \
-    show_job_info, watch_job, power_job, list_ips, destroy_job, main
-from spalloc.scripts.support import \
-    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate
+from spalloc.scripts.job import (
+    show_job_info, watch_job, power_job, list_ips, destroy_job, main)
+from spalloc.scripts.support import (
+    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate)
 
 
 @pytest.fixture

tests/scripts/test_machine.py

@@ -1,13 +1,10 @@
 import pytest
-
 from mock import Mock, MagicMock
-
 from spalloc.term import Terminal
-
-from spalloc.scripts.machine import \
-    main, generate_keys, list_machines, show_machine
-from spalloc.scripts.support import \
-    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate
+from spalloc.scripts.machine import (
+    main, generate_keys, list_machines, show_machine)
+from spalloc.scripts.support import (
+    VERSION_RANGE_START, VERSION_RANGE_STOP, Terminate)
 from spalloc.protocol_client import ProtocolError
 
 

tests/scripts/test_ps.py

@@ -2,7 +2,6 @@
 import datetime
 from mock import Mock, MagicMock
 import pytest
-
 from spalloc.scripts.ps import main, render_job_list
 from spalloc.scripts.support import VERSION_RANGE_START, VERSION_RANGE_STOP
 from spalloc.term import Terminal

tests/scripts/test_where_is.py

@@ -1,7 +1,5 @@
 import pytest
-
 from mock import Mock, MagicMock
-
 from spalloc.scripts.where_is import main
 from spalloc.scripts.support import VERSION_RANGE_START, VERSION_RANGE_STOP
 from spalloc.protocol_client import ProtocolError

tests/test_config.py

@@ -1,9 +1,7 @@
-import pytest
-
 import tempfile
 import shutil
 import os.path
-
+import pytest
 from spalloc.config import read_config