Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-08-08 06:22:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into qa

Browse source 
* master:
  expose more brozzle-page args
  update pillow dependency to get rid of github vul-
  more readme edits
  reformat readme to 80 columns
  Copy edits to job-conf readme
  bump up heartbeat interval (see comment)
  Copy edits
  back to dev version
  version 1.3 (messed up 1.2)
  setuptools wants README not readme
  back to dev version number
  version 1.2
  bump dev version after merge
  is test_time_limit is failing because of timing?
This commit is contained in:
Noah Levitt 2018-08-16 12:08:48 -07:00
commit 418a3ef20c
9 changed files with 130 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

6
setup.py
View file

@ -32,12 +32,12 @@ def find_package_data(package):
setuptools.setup(
name='brozzler',
version='1.1b13.dev291',
version='1.4.dev297',
description='Distributed web crawling with browsers',
url='https://github.com/internetarchive/brozzler',
author='Noah Levitt',
author_email='nlevitt@archive.org',
long_description=open('readme.rst', mode='rb').read().decode('UTF-8'),
long_description=open('README.rst', mode='rb').read().decode('UTF-8'),
license='Apache License 2.0',
packages=['brozzler', 'brozzler.dashboard'],
package_data={
@ -68,7 +68,7 @@ setuptools.setup(
'reppy==0.3.4',
'requests',
'websocket-client!=0.39.0',
'pillow==3.3.0',
'pillow>=5.2.0',
'urlcanon>=0.1.dev23',
'doublethink>=0.2.0.dev88',
'rethinkdb>=2.3,<2.4',