From 4564d647ba2b404706daefe5af93c94f151518e5 Mon Sep 17 00:00:00 2001
From: Tim Pillinger <tim.pillinger@metoffice.gov.uk>
Date: Wed, 10 Jul 2019 09:51:45 +0100
Subject: [PATCH] Removed requests from travis and added it to module setup.py

trying to get heredocs to work
---
 .travis.yml                             |  2 +-
 setup.py                                |  1 +
 t/rosa-svn-post-commit/00-basic.t       |  4 ++--
 t/rosa-svn-post-commit/01-mail-passwd.t |  2 +-
 t/rosa-svn-post-commit/03-unicode.t     |  2 +-
 t/rosa-svn-pre-commit/00-basic.t        | 10 +++++-----
 t/rosa-svn-pre-commit/01-rosie-create.t |  2 +-
 t/rosa-svn-pre-commit/02-passwd.t       |  2 +-
 t/rosa-svn-pre-commit/03-meta.t         |  2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70a425ebe8..0f09181461 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ jobs:
     - name: "Test Battery"
       before_install:
         - export PATH="$PWD/.travis:$PATH"
-        - now install coverage fcm tut_suite requests
+        - now install coverage fcm tut_suite
       install:
         - now install isodatetime cylc rose
       script:
diff --git a/setup.py b/setup.py
index 6ea55168e9..53f8e86af7 100644
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ def find_version(*file_paths):
     "tornado",
     "sqlalchemy",
     "isodatetime",
+    "requests"
 ]
 
 
diff --git a/t/rosa-svn-post-commit/00-basic.t b/t/rosa-svn-post-commit/00-basic.t
index db4b185e15..232cbeb897 100755
--- a/t/rosa-svn-post-commit/00-basic.t
+++ b/t/rosa-svn-post-commit/00-basic.t
@@ -45,9 +45,9 @@ export ROSE_CONF_PATH=$PWD/conf
 ROSE_BIN_HOME=$(dirname $(command -v rose))
 cat >repos/foo/hooks/post-commit <<__POST_COMMIT__
 #!/bin/bash
-export ROSE_CONF_PATH=$ROSE_CONF_PATH
+export ROSE_CONF_PATH=${ROSE_CONF_PATH}
 export PATH=$PATH:${ROSE_BIN_HOME}
-${ROSE_BIN_HOME}/rosa svn-post-commit --debug "\$@" \\
+rosa svn-post-commit --debug "\$@" \\
     1>$PWD/rosa-svn-post-commit.out 2>$PWD/rosa-svn-post-commit.err
 echo \$? >$PWD/rosa-svn-post-commit.rc
 __POST_COMMIT__
diff --git a/t/rosa-svn-post-commit/01-mail-passwd.t b/t/rosa-svn-post-commit/01-mail-passwd.t
index 4effdbb22a..2e7e3875af 100755
--- a/t/rosa-svn-post-commit/01-mail-passwd.t
+++ b/t/rosa-svn-post-commit/01-mail-passwd.t
@@ -76,7 +76,7 @@ cat >repos/foo/hooks/post-commit <<__POST_COMMIT__
 #!/bin/bash
 export ROSE_CONF_PATH=$ROSE_CONF_PATH
 export PATH=$PATH:${ROSE_BIN_HOME}
-${ROSE_BIN_HOME}/rosa svn-post-commit --debug "\$@" \\
+rosa svn-post-commit --debug "\$@" \\
     1>$PWD/rosa-svn-post-commit.out 2>$PWD/rosa-svn-post-commit.err
 echo \$? >$PWD/rosa-svn-post-commit.rc
 __POST_COMMIT__
diff --git a/t/rosa-svn-post-commit/03-unicode.t b/t/rosa-svn-post-commit/03-unicode.t
index ea7cfb8f11..328013ee5a 100755
--- a/t/rosa-svn-post-commit/03-unicode.t
+++ b/t/rosa-svn-post-commit/03-unicode.t
@@ -48,7 +48,7 @@ cat >'repos/foo/hooks/post-commit' <<__POST_COMMIT__
 #!/bin/bash
 export ROSE_CONF_PATH="${ROSE_CONF_PATH}"
 export PATH=$PATH:${ROSE_BIN_HOME}
-'${ROSE_BIN_HOME}/rosa' 'svn-post-commit' --debug "\$@" \\
+rosa svn-post-commit --debug "\$@" \\
     1>'${PWD}/rosa-svn-post-commit.out' 2>'${PWD}/rosa-svn-post-commit.err'
 echo "\$?" >'${PWD}/rosa-svn-post-commit.rc'
 __POST_COMMIT__
diff --git a/t/rosa-svn-pre-commit/00-basic.t b/t/rosa-svn-pre-commit/00-basic.t
index a3428e39a5..94654febe7 100755
--- a/t/rosa-svn-pre-commit/00-basic.t
+++ b/t/rosa-svn-pre-commit/00-basic.t
@@ -33,15 +33,15 @@ tests 117
 mkdir repos
 svnadmin create repos/foo
 SVN_URL=file://$PWD/repos/foo
-#echo $ROSE_BIN_HOME
-ROSE_BIN_HOME=$(dirname $(command -v rose))
+ROSE_BIN=$(dirname $(command -v rose))
 ROSE_LIB=$(dirname $(python -c "import metomi.rose; print(metomi.rose.__file__)"))
+export ROSE_LIB ROSE_BIN
 cat >repos/foo/hooks/pre-commit <<__PRE_COMMIT__
 #!/bin/bash
 export ROSE_CONF_PATH=$PWD/conf
-export PATH=$PATH:${ROSE_BIN_HOME}
-export ROSE_LIB="${ROSE_LIB}"
-exec ${ROSE_BIN_HOME}/rosa svn-pre-commit "\$@"
+export PATH=$PATH:${ROSE_BIN}
+export ROSE_LIB=${ROSE_LIB}
+rosa svn-pre-commit "\$@"
 __PRE_COMMIT__
 chmod +x repos/foo/hooks/pre-commit
 export LANG=C
diff --git a/t/rosa-svn-pre-commit/01-rosie-create.t b/t/rosa-svn-pre-commit/01-rosie-create.t
index e5565ee6dd..50e9076927 100755
--- a/t/rosa-svn-pre-commit/01-rosie-create.t
+++ b/t/rosa-svn-pre-commit/01-rosie-create.t
@@ -43,7 +43,7 @@ cat >repos/foo/hooks/pre-commit <<__PRE_COMMIT__
 export ROSE_CONF_PATH=$ROSE_CONF_PATH
 export PATH=$PATH:${ROSE_BIN_HOME}
 export ROSE_LIB="${ROSE_LIB}"
-exec ${ROSE_BIN_HOME}/rosa svn-pre-commit --debug "\$@"
+rosa svn-pre-commit --debug "\$@"
 __PRE_COMMIT__
 chmod +x repos/foo/hooks/pre-commit
 export LANG=C
diff --git a/t/rosa-svn-pre-commit/02-passwd.t b/t/rosa-svn-pre-commit/02-passwd.t
index 8a5961e0b5..3f77fbcb07 100755
--- a/t/rosa-svn-pre-commit/02-passwd.t
+++ b/t/rosa-svn-pre-commit/02-passwd.t
@@ -41,7 +41,7 @@ cat >repos/foo/hooks/pre-commit <<__PRE_COMMIT__
 export ROSE_CONF_PATH=$PWD/conf
 export PATH=$PATH:${ROSE_BIN_HOME}
 export ROSE_LIB="${ROSE_LIB}"
-exec ${ROSE_BIN_HOME}/rosa svn-pre-commit "\$@"
+rosa svn-pre-commit "\$@"
 __PRE_COMMIT__
 chmod +x repos/foo/hooks/pre-commit
 export LANG=C
diff --git a/t/rosa-svn-pre-commit/03-meta.t b/t/rosa-svn-pre-commit/03-meta.t
index d6a18afaeb..f064be8a93 100755
--- a/t/rosa-svn-pre-commit/03-meta.t
+++ b/t/rosa-svn-pre-commit/03-meta.t
@@ -47,7 +47,7 @@ cat >'repos/foo/hooks/pre-commit' <<__PRE_COMMIT__
 export ROSE_CONF_PATH=${PWD}/conf
 export PATH=$PATH:${ROSE_BIN_HOME}
 export ROSE_LIB="${ROSE_LIB}"
-exec ${ROSE_BIN_HOME}/rosa svn-pre-commit "\$@"
+rosa svn-pre-commit "\$@"
 __PRE_COMMIT__
 chmod +x 'repos/foo/hooks/pre-commit'
 export LANG='C'