Merge branch 'master' into qa

* master:
  quote that shell meta character
  need warcprox in python path for travis tests now
This commit is contained in:
Noah Levitt 2017-04-19 08:58:47 -07:00
commit 4f5553954c
2 changed files with 2 additions and 2 deletions

View File

@ -7,7 +7,7 @@ before_install:
- sudo pip install ansible==2.1.3.0
install:
- ansible-playbook --extra-vars="brozzler_pip_name=file://$TRAVIS_BUILD_DIR#egg=brozzler user=travis" --inventory-file=ansible/hosts-localhost ansible/playbook.yml
- pip install $TRAVIS_BUILD_DIR pytest
- pip install $TRAVIS_BUILD_DIR 'warcprox>=2.1b1.dev71' pytest
script:
- DISPLAY=:1 py.test -v tests
after_failure:

View File

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.1b11.dev236',
version='1.1b11.dev237',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',