From 0b550f953454cf309183a5c44b9d91d120cc5e0d Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 10:07:18 -0500
Subject: [PATCH 01/20] fixing bug with instance stop all

---
 CHANGELOG.md              | 1 +
 spython/main/instances.py | 9 +++++++--
 spython/version.py        | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abc21e12..b68da4b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
 singularity on pypi), and the versions here will coincide with these releases.
 
 ## [master](https://github.com/singularityhub/singularity-cli/tree/master)
+ - instance stop all missing check for Singularity V3.+ (0.0.52)
  - fixing bug with instances list, name not taken into account (0.0.51)
  - additional of args to instance start commands (0.0.50)
  - continued lines should not be split in docker.py recipe parser (_setup) (0.0.49)
diff --git a/spython/main/instances.py b/spython/main/instances.py
index 23a75c69..957a2f39 100644
--- a/spython/main/instances.py
+++ b/spython/main/instances.py
@@ -109,7 +109,12 @@ def stopall(self, sudo=False, quiet=True):
     from spython.utils import run_command, check_install
     check_install()
 
-    cmd = self._init_command('instance.stop')
+    subgroup = 'instance.stop'
+
+    if 'version 3' in get_singularity_version():
+        subgroup = ["instance", "stop"]
+
+    cmd = self._init_command(subgroup)
     cmd = cmd + ['--all']
     output = run_command(cmd, sudo=sudo, quiet=quiet)
 
@@ -119,4 +124,4 @@ def stopall(self, sudo=False, quiet=True):
         bot.error(message)
         return output['return_code']
 
-    return output['return_code']    
+    return output['return_code']
diff --git a/spython/version.py b/spython/version.py
index e2ce1160..45621e95 100644
--- a/spython/version.py
+++ b/spython/version.py
@@ -6,7 +6,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-__version__ = "0.0.51"
+__version__ = "0.0.52"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = 'vsochat@stanford.edu'
 NAME = 'spython'

From 54d2ea9c534163adfe1c47f255bb6a1ff8b265e0 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 11:13:44 -0500
Subject: [PATCH 02/20] testing travis with 3.1

---
 .travis.yml            |  6 +++++-
 .travis/before_install | 39 ++++++++++++++++++++++++++++-----------
 .travis/script         |  1 -
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bfad6304..a9186470 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,10 @@ python:
 services:
   - docker
 
+env:
+  - SINGULARITY_VERSION=3.1.0
+  - SINGULARITY_VERSION=2.6.0
+
 matrix:
   allow_failures:
     - python: "2.6"
@@ -18,7 +22,7 @@ matrix:
 
 before_install:
   - sudo chmod u+x .travis/*
-  - /bin/bash .travis/before_install
+  - /bin/bash .travis/before_install "${SINGULARITY_VERSION}"
 
 script:
   - /bin/bash .travis/script
diff --git a/.travis/before_install b/.travis/before_install
index 0bdc18cb..42654bd0 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -1,15 +1,6 @@
 #!/bin/bash
 
-sudo apt-get update && sudo apt-get install -y wget git build-essential squashfs-tools \
-                                                    libtool \
-                                                    autotools-dev \
-                                                    libarchive-dev \
-                                                    automake \
-                                                    autoconf \
-                                                    uuid-dev \
-                                                    libssl-dev
-
-
+SINGULARITY_VERSION="${1}"
 sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
 
 echo "PYTHON VERSION"
@@ -18,5 +9,31 @@ which python
 python setup.py sdist && python setup.py install
 
 # Install Singularity (development)
-cd /tmp && git clone -b vault/release-2.5 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
+if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
+
+        export GOPATH=/go && \
+            sudo apt-get update && \
+            sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
+            go get -u github.com/golang/dep/cmd/dep && \
+            mkdir -p ${GOPATH}/src/github.com/sylabs && \
+            cd ${GOPATH}/src/github.com/sylabs && \
+            wget https://github.com/sylabs/singularity/releases/download/v${singularity_version}/singularity-${singularity_version}.tar.gz && \
+            tar -xzvf singularity-${singularity_version}.tar.gz && \
+            cd singularity && \
+            ./mconfig -p /usr/local && \
+            make -C builddir && \
+            sudo make -C builddir install
+
+else
+
+    sudo apt-get update && sudo apt-get install -y wget git build-essential squashfs-tools \
+                                                        libtool \
+                                                        autotools-dev \
+                                                        libarchive-dev \
+                                                        automake \
+                                                        autoconf \
+                                                        uuid-dev \
+                                                        libssl-dev
 
+    cd /tmp && git clone -b vault/release-2.6 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
+fi
diff --git a/.travis/script b/.travis/script
index 9c2617a3..b16b7ee5 100644
--- a/.travis/script
+++ b/.travis/script
@@ -1,5 +1,4 @@
 #!/bin/bash
-sudo apt-get install -y squashfs-tools
 cd $TRAVIS_BUILD_DIR/spython
 python -m unittest tests.test_client
 python -m unittest tests.test_utils

From 58365020f2a4e570600720df04321fd3a739dd62 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 11:16:39 -0500
Subject: [PATCH 03/20] mkdir gopath

---
 .travis/before_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install b/.travis/before_install
index 42654bd0..36b259c5 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -15,7 +15,7 @@ if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
             sudo apt-get update && \
             sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
             go get -u github.com/golang/dep/cmd/dep && \
-            mkdir -p ${GOPATH}/src/github.com/sylabs && \
+            sudo mkdir -p ${GOPATH}/src/github.com/sylabs && \
             cd ${GOPATH}/src/github.com/sylabs && \
             wget https://github.com/sylabs/singularity/releases/download/v${singularity_version}/singularity-${singularity_version}.tar.gz && \
             tar -xzvf singularity-${singularity_version}.tar.gz && \

From 307f0d28d26c98967d3fead60640d8fa9e943ba5 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 11:24:13 -0500
Subject: [PATCH 04/20] mkdir gopath

---
 .travis/before_install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis/before_install b/.travis/before_install
index 36b259c5..cff49a66 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -12,6 +12,8 @@ python setup.py sdist && python setup.py install
 if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
 
         export GOPATH=/go && \
+            sudo mkdir -p /go && \
+            sudo chown -R $USER /go && \ 
             sudo apt-get update && \
             sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
             go get -u github.com/golang/dep/cmd/dep && \

From ccf81c5d06e5554dd1c050ec946dd848e6a76f07 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:18:15 -0500
Subject: [PATCH 05/20] trying installing recent golang

---
 .travis/before_install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis/before_install b/.travis/before_install
index cff49a66..12c08c0d 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -3,6 +3,7 @@
 SINGULARITY_VERSION="${1}"
 sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
 
+echo "Singularity Version ${SINGULARITY_VERSION}"
 echo "PYTHON VERSION"
 which python
 
@@ -12,6 +13,9 @@ python setup.py sdist && python setup.py install
 if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
 
         export GOPATH=/go && \
+            wget https://dl.google.com/go/go1.12.src.tar.gz && \
+            tar -xzvf go1.12.src.tar.gz && \
+            cd go && make && sudo make install && \
             sudo mkdir -p /go && \
             sudo chown -R $USER /go && \ 
             sudo apt-get update && \

From 0c115973dc4ac6c4b7222508f0e7dc5badb3059e Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:26:16 -0500
Subject: [PATCH 06/20] testing go install

---
 .travis/before_install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis/before_install b/.travis/before_install
index 12c08c0d..56aa3f8e 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -14,8 +14,8 @@ if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
 
         export GOPATH=/go && \
             wget https://dl.google.com/go/go1.12.src.tar.gz && \
-            tar -xzvf go1.12.src.tar.gz && \
-            cd go && make && sudo make install && \
+            tar -xzf https://dl.google.com/go/go1.12.linux-amd64.tar.gz && \
+            export PATH=$PWD/go/bin:$PATH && \
             sudo mkdir -p /go && \
             sudo chown -R $USER /go && \ 
             sudo apt-get update && \

From 1c047c6e06553dfbfe096425242dcebdf55e9547 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:30:09 -0500
Subject: [PATCH 07/20] testing go install

---
 .travis/before_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install b/.travis/before_install
index 56aa3f8e..0ff0ce9d 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -17,7 +17,7 @@ if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
             tar -xzf https://dl.google.com/go/go1.12.linux-amd64.tar.gz && \
             export PATH=$PWD/go/bin:$PATH && \
             sudo mkdir -p /go && \
-            sudo chown -R $USER /go && \ 
+            sudo chmod -R 0777 /go && \ 
             sudo apt-get update && \
             sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
             go get -u github.com/golang/dep/cmd/dep && \

From fc3932e1a5c93365db4459c0e41d3af83214ae08 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:31:24 -0500
Subject: [PATCH 08/20] testing go install

---
 .travis/before_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install b/.travis/before_install
index 0ff0ce9d..194904d1 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -14,7 +14,7 @@ if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
 
         export GOPATH=/go && \
             wget https://dl.google.com/go/go1.12.src.tar.gz && \
-            tar -xzf https://dl.google.com/go/go1.12.linux-amd64.tar.gz && \
+            tar -xzf go1.12.linux-amd64.tar.gz && \
             export PATH=$PWD/go/bin:$PATH && \
             sudo mkdir -p /go && \
             sudo chmod -R 0777 /go && \ 

From 980975cfb296b230a832d98aca76986ce65fe874 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:35:44 -0500
Subject: [PATCH 09/20] testing go install

---
 .travis/before_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install b/.travis/before_install
index 194904d1..7c13f26b 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -20,7 +20,7 @@ if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
             sudo chmod -R 0777 /go && \ 
             sudo apt-get update && \
             sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
-            go get -u github.com/golang/dep/cmd/dep && \
+            sudo go get -u github.com/golang/dep/cmd/dep && \
             sudo mkdir -p ${GOPATH}/src/github.com/sylabs && \
             cd ${GOPATH}/src/github.com/sylabs && \
             wget https://github.com/sylabs/singularity/releases/download/v${singularity_version}/singularity-${singularity_version}.tar.gz && \

From 0069cd5f4e1f1fdac971034d2f1608a2e4309338 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:43:59 -0500
Subject: [PATCH 10/20] testing go install

---
 .travis/before_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install b/.travis/before_install
index 7c13f26b..bedb5502 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -13,7 +13,7 @@ python setup.py sdist && python setup.py install
 if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
 
         export GOPATH=/go && \
-            wget https://dl.google.com/go/go1.12.src.tar.gz && \
+            wget https://dl.google.com/go/go1.12.linux-amd64.tar.gz && \
             tar -xzf go1.12.linux-amd64.tar.gz && \
             export PATH=$PWD/go/bin:$PATH && \
             sudo mkdir -p /go && \

From 6fdee7f830d07c3846c0380fa09b4d972c7fc100 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 12:55:08 -0500
Subject: [PATCH 11/20] testing go install

---
 .travis/before_install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis/before_install b/.travis/before_install
index bedb5502..fdaf87ce 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -20,11 +20,11 @@ if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
             sudo chmod -R 0777 /go && \ 
             sudo apt-get update && \
             sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
-            sudo go get -u github.com/golang/dep/cmd/dep && \
-            sudo mkdir -p ${GOPATH}/src/github.com/sylabs && \
+            go get -u github.com/golang/dep/cmd/dep && \
+            mkdir -p ${GOPATH}/src/github.com/sylabs && \
             cd ${GOPATH}/src/github.com/sylabs && \
-            wget https://github.com/sylabs/singularity/releases/download/v${singularity_version}/singularity-${singularity_version}.tar.gz && \
-            tar -xzvf singularity-${singularity_version}.tar.gz && \
+            wget https://github.com/sylabs/singularity/releases/download/v${SINGULARITY_VERSION}/singularity-${SINGULARITY_VERSION}.tar.gz && \
+            tar -xzvf singularity-${SINGULARITY_VERSION}.tar.gz && \
             cd singularity && \
             ./mconfig -p /usr/local && \
             make -C builddir && \

From c85aa852d19ac018a50c421e6b302211ad1840b3 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 13:12:24 -0500
Subject: [PATCH 12/20] testing go install

---
 .travis.yml            | 50 +++++++++++++++++++-----------------------
 .travis/before_install |  6 -----
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9186470..9a8d1f15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,24 @@
-language: python
-
-sudo: true
-
-os: linux
-
-python:
-    - "2.7"
-    - "3.5"
-
-services:
-  - docker
-
-env:
-  - SINGULARITY_VERSION=3.1.0
-  - SINGULARITY_VERSION=2.6.0
-
 matrix:
-  allow_failures:
-    - python: "2.6"
-    - python: "3.5"
-
-before_install:
-  - sudo chmod u+x .travis/*
-  - /bin/bash .travis/before_install "${SINGULARITY_VERSION}"
-
-script:
-  - /bin/bash .travis/script
+  include:
+    - language: go
+      os: linux
+      sudo: true
+      python:
+        - "2.7"
+        - "3.5"
+      before_install:
+          - sudo chmod u+x .travis/*
+          - /bin/bash .travis/before_install 3.1.0
+      script:
+        - /bin/bash .travis/script
+    - language: python
+      os: linux
+      sudo: true
+      python:
+        - "2.7"
+        - "3.5"
+      before_install:
+          - sudo chmod u+x .travis/*
+          - /bin/bash .travis/before_install 2.6.0
+      script:
+        - /bin/bash .travis/script
diff --git a/.travis/before_install b/.travis/before_install
index fdaf87ce..4c51373b 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -12,12 +12,6 @@ python setup.py sdist && python setup.py install
 # Install Singularity (development)
 if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
 
-        export GOPATH=/go && \
-            wget https://dl.google.com/go/go1.12.linux-amd64.tar.gz && \
-            tar -xzf go1.12.linux-amd64.tar.gz && \
-            export PATH=$PWD/go/bin:$PATH && \
-            sudo mkdir -p /go && \
-            sudo chmod -R 0777 /go && \ 
             sudo apt-get update && \
             sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
             go get -u github.com/golang/dep/cmd/dep && \

From e3631f0491fa0e2e2d5e29654aff0d8c45fad2e8 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 13:14:27 -0500
Subject: [PATCH 13/20] testing go install

---
 .travis/before_install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/before_install b/.travis/before_install
index 4c51373b..9ee67c9d 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -7,7 +7,7 @@ echo "Singularity Version ${SINGULARITY_VERSION}"
 echo "PYTHON VERSION"
 which python
 
-python setup.py sdist && python setup.py install
+python setup.py sdist && sudo python setup.py install
 
 # Install Singularity (development)
 if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then

From 7733761ed6edf0575364ced2d45229dad79e7e02 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 13:16:00 -0500
Subject: [PATCH 14/20] testing go install

---
 .travis.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9a8d1f15..b3bcf685 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,38 @@ matrix:
       sudo: true
       python:
         - "2.7"
+      before_install:
+          - sudo chmod u+x .travis/*
+          - /bin/bash .travis/before_install 3.1.0
+      script:
+        - /bin/bash .travis/script
+
+    - language: go
+      os: linux
+      sudo: true
+      python:
         - "3.5"
       before_install:
           - sudo chmod u+x .travis/*
           - /bin/bash .travis/before_install 3.1.0
       script:
         - /bin/bash .travis/script
+
     - language: python
       os: linux
       sudo: true
       python:
         - "2.7"
+      before_install:
+          - sudo chmod u+x .travis/*
+          - /bin/bash .travis/before_install 2.6.0
+      script:
+        - /bin/bash .travis/script
+
+    - language: python
+      os: linux
+      sudo: true
+      python:
         - "3.5"
       before_install:
           - sudo chmod u+x .travis/*

From 7ff61684858a3626a8945ba5948fb1c04b973193 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 13:28:20 -0500
Subject: [PATCH 15/20] testing go install

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b3bcf685..83dbef43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 matrix:
   include:
     - language: go
+      name: "Singularity 3.1.0, Python 2.7"
       os: linux
       sudo: true
       python:
@@ -12,6 +13,7 @@ matrix:
         - /bin/bash .travis/script
 
     - language: go
+      name: "Singularity 3.1.0, Python 3.5"
       os: linux
       sudo: true
       python:
@@ -23,6 +25,7 @@ matrix:
         - /bin/bash .travis/script
 
     - language: python
+      name: "Singularity 2.6.0, Python 2.7"
       os: linux
       sudo: true
       python:
@@ -34,6 +37,7 @@ matrix:
         - /bin/bash .travis/script
 
     - language: python
+      name: "Singularity 2.6.0, Python 3.5"
       os: linux
       sudo: true
       python:

From 72100bda4ac14ea541ed11477b00765ef9dbe92d Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 14:12:26 -0500
Subject: [PATCH 16/20] testing go install

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83dbef43..caf490f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 matrix:
   include:
-    - language: go
+    - language: go "1.11"
       name: "Singularity 3.1.0, Python 2.7"
       os: linux
       sudo: true
@@ -12,7 +12,7 @@ matrix:
       script:
         - /bin/bash .travis/script
 
-    - language: go
+    - language: go "1.11"
       name: "Singularity 3.1.0, Python 3.5"
       os: linux
       sudo: true

From 4a1b2104372e4334057ee9f9fe520b2c61bac0e4 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 14:17:18 -0500
Subject: [PATCH 17/20] testing go install

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index caf490f8..83dbef43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 matrix:
   include:
-    - language: go "1.11"
+    - language: go
       name: "Singularity 3.1.0, Python 2.7"
       os: linux
       sudo: true
@@ -12,7 +12,7 @@ matrix:
       script:
         - /bin/bash .travis/script
 
-    - language: go "1.11"
+    - language: go
       name: "Singularity 3.1.0, Python 3.5"
       os: linux
       sudo: true

From 77c6c342f45370c3263c2e58332b1deac410204c Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 14:18:48 -0500
Subject: [PATCH 18/20] try specific version

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 83dbef43..49e252e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 matrix:
   include:
     - language: go
+      go: 1.11.5
       name: "Singularity 3.1.0, Python 2.7"
       os: linux
       sudo: true
@@ -13,6 +14,7 @@ matrix:
         - /bin/bash .travis/script
 
     - language: go
+      go: 1.11.5
       name: "Singularity 3.1.0, Python 3.5"
       os: linux
       sudo: true

From 4cec9d5f1c4559b82955fe5609c5d53f8275305d Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 14:33:31 -0500
Subject: [PATCH 19/20] try cleaning cache

---
 .travis/before_install | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis/before_install b/.travis/before_install
index 9ee67c9d..9ec4ba58 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -7,6 +7,9 @@ echo "Singularity Version ${SINGULARITY_VERSION}"
 echo "PYTHON VERSION"
 which python
 
+# Clear caches
+sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
+
 python setup.py sdist && sudo python setup.py install
 
 # Install Singularity (development)

From dda0793a333aa97ee8147a37bedc4553ae6da029 Mon Sep 17 00:00:00 2001
From: Vanessa Sochat <vsochat@stanford.edu>
Date: Wed, 27 Feb 2019 14:38:27 -0500
Subject: [PATCH 20/20] restore old version

---
 .travis.yml            | 69 +++++++++++++-----------------------------
 .travis/before_install | 45 ++++++++-------------------
 2 files changed, 33 insertions(+), 81 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 49e252e4..bfad6304 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,51 +1,24 @@
-matrix:
-  include:
-    - language: go
-      go: 1.11.5
-      name: "Singularity 3.1.0, Python 2.7"
-      os: linux
-      sudo: true
-      python:
-        - "2.7"
-      before_install:
-          - sudo chmod u+x .travis/*
-          - /bin/bash .travis/before_install 3.1.0
-      script:
-        - /bin/bash .travis/script
+language: python
+
+sudo: true
+
+os: linux
 
-    - language: go
-      go: 1.11.5
-      name: "Singularity 3.1.0, Python 3.5"
-      os: linux
-      sudo: true
-      python:
-        - "3.5"
-      before_install:
-          - sudo chmod u+x .travis/*
-          - /bin/bash .travis/before_install 3.1.0
-      script:
-        - /bin/bash .travis/script
+python:
+    - "2.7"
+    - "3.5"
+
+services:
+  - docker
+
+matrix:
+  allow_failures:
+    - python: "2.6"
+    - python: "3.5"
 
-    - language: python
-      name: "Singularity 2.6.0, Python 2.7"
-      os: linux
-      sudo: true
-      python:
-        - "2.7"
-      before_install:
-          - sudo chmod u+x .travis/*
-          - /bin/bash .travis/before_install 2.6.0
-      script:
-        - /bin/bash .travis/script
+before_install:
+  - sudo chmod u+x .travis/*
+  - /bin/bash .travis/before_install
 
-    - language: python
-      name: "Singularity 2.6.0, Python 3.5"
-      os: linux
-      sudo: true
-      python:
-        - "3.5"
-      before_install:
-          - sudo chmod u+x .travis/*
-          - /bin/bash .travis/before_install 2.6.0
-      script:
-        - /bin/bash .travis/script
+script:
+  - /bin/bash .travis/script
diff --git a/.travis/before_install b/.travis/before_install
index 9ec4ba58..9e81eb2d 100644
--- a/.travis/before_install
+++ b/.travis/before_install
@@ -1,42 +1,21 @@
 #!/bin/bash
 
-SINGULARITY_VERSION="${1}"
+sudo apt-get update && sudo apt-get install -y wget git build-essential squashfs-tools \
+                                                    libtool \
+                                                    autotools-dev \
+                                                    libarchive-dev \
+                                                    automake \
+                                                    autoconf \
+                                                    uuid-dev \
+                                                    libssl-dev
+
+
 sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
 
-echo "Singularity Version ${SINGULARITY_VERSION}"
 echo "PYTHON VERSION"
 which python
 
-# Clear caches
-sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
-
-python setup.py sdist && sudo python setup.py install
+python setup.py sdist && python setup.py install
 
 # Install Singularity (development)
-if [ "${SINGULARITY_VERSION}" == "3.1.0" ]; then
-
-            sudo apt-get update && \
-            sudo apt-get install -y build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools libseccomp-dev pkg-config wget && \
-            go get -u github.com/golang/dep/cmd/dep && \
-            mkdir -p ${GOPATH}/src/github.com/sylabs && \
-            cd ${GOPATH}/src/github.com/sylabs && \
-            wget https://github.com/sylabs/singularity/releases/download/v${SINGULARITY_VERSION}/singularity-${SINGULARITY_VERSION}.tar.gz && \
-            tar -xzvf singularity-${SINGULARITY_VERSION}.tar.gz && \
-            cd singularity && \
-            ./mconfig -p /usr/local && \
-            make -C builddir && \
-            sudo make -C builddir install
-
-else
-
-    sudo apt-get update && sudo apt-get install -y wget git build-essential squashfs-tools \
-                                                        libtool \
-                                                        autotools-dev \
-                                                        libarchive-dev \
-                                                        automake \
-                                                        autoconf \
-                                                        uuid-dev \
-                                                        libssl-dev
-
-    cd /tmp && git clone -b vault/release-2.6 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
-fi
+cd /tmp && git clone -b vault/release-2.6 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install