Skip to content

Commit

Permalink
Removed requests from travis and added it to module setup.py
Browse files Browse the repository at this point in the history
trying to get heredocs to work
  • Loading branch information
wxtim committed Jul 10, 2019
1 parent 1d270e3 commit 4564d64
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ def find_version(*file_paths):
"tornado",
"sqlalchemy",
"isodatetime",
"requests"
]


Expand Down
4 changes: 2 additions & 2 deletions t/rosa-svn-post-commit/00-basic.t
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
2 changes: 1 addition & 1 deletion t/rosa-svn-post-commit/01-mail-passwd.t
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
2 changes: 1 addition & 1 deletion t/rosa-svn-post-commit/03-unicode.t
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
10 changes: 5 additions & 5 deletions t/rosa-svn-pre-commit/00-basic.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/rosa-svn-pre-commit/01-rosie-create.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/rosa-svn-pre-commit/02-passwd.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/rosa-svn-pre-commit/03-meta.t
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 4564d64

Please sign in to comment.