Merge branch 'master' into qa

* master:
  oops, back to dev version number
  wait 20 seconds to claim sites if none were avail-
  tweak logging
  why did those tests fail??? (#117)
  Add screenshots
  Add screenshots
  back to dev version
  1.4 for pypi
  explain --warcprox-auto briefly
  vagrant readme fixes (thanks funkyfuture)
  update cryptography dep version
This commit is contained in:
Noah Levitt 2018-09-04 10:54:26 -07:00
commit c4fdbe578d
12 changed files with 79 additions and 54 deletions

View file

@ -32,7 +32,7 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.4.dev297',
version='1.5.dev302',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',
@ -63,32 +63,35 @@ setuptools.setup(
],
},
install_requires=[
'PyYAML',
'youtube-dl',
'PyYAML>=3.12',
'youtube-dl>=2018.7.21',
'reppy==0.3.4',
'requests',
'websocket-client!=0.39.0,!=0.49.0',
'python-magic',
'requests>=2.18.4',
'websocket-client>=0.39.0,<=0.48.0',
'pillow>=5.2.0',
'urlcanon>=0.1.dev23',
'doublethink>=0.2.0.dev88',
'rethinkdb>=2.3,<2.4',
'cerberus==1.0.1',
'jinja2',
'cryptography!=2.1.1', # 2.1.1 installation is failing on ubuntu
'python-magic',
'rethinkdb>=2.3',
'cerberus>=1.0.1',
'jinja2>=2.10',
'cryptography>=2.3',
],
extras_require={
'dashboard': ['flask>=0.11', 'gunicorn'],
'dashboard': [
'flask>=0.11',
'gunicorn>=19.8.1'
],
'easy': [
'warcprox>=2.4b2.dev173',
'pywb<2',
'pywb>=0.33.2,<2',
'flask>=0.11',
'gunicorn'
'gunicorn>=19.8.1'
],
},
zip_safe=False,
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Environment :: Console',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3.4',