Merge branch 'master' into qa

* master:
  bump doublethink dependency
  verbiage tweaks
  safety check and --force for brozzler-purge
  new command brozzler-purge
This commit is contained in:
Noah Levitt 2018-09-28 11:12:35 -07:00
commit 87ec0f2f90
2 changed files with 93 additions and 2 deletions

View file

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.5.dev304',
version='1.5.dev305',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',
@ -57,6 +57,7 @@ setuptools.setup(
'brozzler-list-sites=brozzler.cli:brozzler_list_sites',
'brozzler-list-pages=brozzler.cli:brozzler_list_pages',
'brozzler-stop-crawl=brozzler.cli:brozzler_stop_crawl',
'brozzler-purge=brozzler.cli:brozzler_purge',
'brozzler-dashboard=brozzler.dashboard:main',
'brozzler-easy=brozzler.easy:main',
'brozzler-wayback=brozzler.pywb:main',
@ -70,7 +71,7 @@ setuptools.setup(
'websocket-client>=0.39.0,<=0.48.0',
'pillow>=5.2.0',
'urlcanon>=0.1.dev23',
'doublethink>=0.2.0.dev88',
'doublethink>=0.2.0.dev90',
'rethinkdb>=2.3',
'cerberus>=1.0.1',
'jinja2>=2.10',