Merge pull request #521 from peterjc/travis_pip_update

Update pip and setuptools on TravisCI; fix travis_init

Author: bgruening

planemo/commands/cmd_travis_init.py

@@ -46,6 +46,7 @@
 # TODO: Add your instructions here:
 """
 
+
 @click.command('travis_init')
 @options.optional_project_arg()
 @command_function
@@ -78,5 +79,5 @@ def cli(ctx, path):
     if not os.path.exists(setup_sh):
         open(setup_sh, "w").write(TRAVIS_SETUP)
     else:
-        warning(".travis/setup_custom_dependencies.bash already exists, not overwriting.")
+        warn(".travis/setup_custom_dependencies.bash already exists, not overwriting.")
     info(PREPARE_MESSAGE)

scripts/travis_test.sh

@@ -2,6 +2,7 @@
 sudo apt-get install -y python-virtualenv
 virtualenv planemo-venv
 . planemo-venv/bin/activate
+pip install --upgrade pip setuptools
 pip install planemo
 planemo travis_before_install # runs .travis/setup_custom_dependencies.bash
 . ${TRAVIS_BUILD_DIR}/.travis/env.sh # source environment created by planemo