update to the correct location for travis's script

Author: julie-sullivan

config/travis/init.sh

@@ -12,16 +12,26 @@ fi
 # Pull in the server code.
 git clone --single-branch --depth 1 https://github.com/intermine/intermine.git server
 
-# We need a running demo webapp
-source server/config/download_and_configure_tomcat.sh
-sleep 5 # wait for tomcat to come on line
-# Get messages from 500 errors.
-echo 'i.am.a.dev = true' >> server/testmodel/testmodel.properties
-PSQL_USER=postgres sh server/testmodel/setup.sh
-sleep 15 # wait for the webapp to come on line
+
+export PSQL_USER=postgres
+
+# Set up properties
+PROPDIR=$HOME/.intermine
+TESTMODEL_PROPS=$PROPDIR/testmodel.properties
+SED_SCRIPT='s/PSQL_USER/postgres/'
+
+mkdir -p $PROPDIR
+
+echo "#--- creating $TESTMODEL_PROPS"
+cp server/config/testmodel.properties $TESTMODEL_PROPS
+sed -i -e $SED_SCRIPT $TESTMODEL_PROPS
+
+# We will need a fully operational web-application
+echo '#---> Building and releasing web application to test against'
+(cd server/testmine && ./setup.sh)
+sleep 60 # let webapp startup
 
 # Warm up the keyword search by requesting results, but ignoring the results
-$GET $TESTMODEL_URL/service/search > /dev/null
-# Start any list upgrades by poking the lists service.
+$GET "$TESTMODEL_URL/service/search" > /dev/null
+# Start any list upgrades
 $GET "$TESTMODEL_URL/service/lists?token=test-user-token" > /dev/null
-

intermine/__init__.py

@@ -1 +1 @@
-VERSION = "1.09.09"
+VERSION = "1.11.0"