Merge branch 'rel/0.31.0' into 'v0.31'

Rel/0.31.0

See merge request fsl/fsleyes/fsleyes!154

.ci/setup_ssh.sh

@@ -22,6 +22,22 @@ set -e
 
 if [[ -f /.dockerenv ]]; then
 
+  # We have to use different host names to connect
+  # to the docker daemon host on mac as opposed
+  # to on linux.
+  #
+  # On linux (assuming the docker job is running
+  # with --net=host), we can connect via
+  # username@localhost.
+  #
+  # On mac, we have to connect via
+  # username@host.docker.internal
+  if [[ "$CI_RUNNER_TAGS" == *"macOS"* ]]; then
+    if [[ "$FSL_HOST" == *"@localhost" ]]; then
+      FSL_HOST=${FSL_HOST/localhost/host.docker.internal}
+    fi
+  fi
+
   apt-get update -y                           || yum -y check-update                     || true;
   apt-get install -y git rsync openssh-client || yum install -y git rsync openssh-client || true;
 

setup.py

@@ -133,13 +133,10 @@ class apidoc(docbuilder):
 
 
 class custom_build(build):
-    description = 'Custom build command which builds the '\
-                  'user documentation.'
+    description = 'Custom build command'
 
     def run(self):
 
-        self.run_command('userdoc')
-
         # In its source form, the FSLeyes asset files
         # and documentation live outside the FSLeyes
         # package directroy hierarchy. But setuptools
@@ -150,8 +147,8 @@ class custom_build(build):
         #
         # I can't believe that this is so difficult to
         # accomplish.
-        targets = ['assets', op.join('userdoc', 'html')]
-        dests   = ['assets', 'userdoc']
+        targets = ['assets']
+        dests   = ['assets']
         targets = [op.join(basedir, t)            for t in targets]
         dests   = [op.join(basedir, 'fsleyes', d) for d in dests]
 
@@ -219,7 +216,9 @@ def get_fsleyes_dev_deps():
 
 def main():
 
-    packages         = find_packages(exclude=('tests', ))
+    packages         = find_packages(exclude=('tests',
+                                              'tests.overlays',
+                                              'tests.actions'))
     version          = get_fsleyes_version()
     readme           = get_fsleyes_readme()
     install_requires = get_fsleyes_deps()