diff --git a/setup.py b/setup.py index fee81ff..503f965 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def find_package_data(package): setuptools.setup( name='brozzler', - version='1.4.dev297', + version='1.4.dev299', description='Distributed web crawling with browsers', url='https://github.com/internetarchive/brozzler', author='Noah Levitt', @@ -63,27 +63,30 @@ 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', + 'requests>=2.18.4', + 'websocket-client>=0.39.0,!=0.49.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', + 'python-magic>=0.4.15', ], 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, diff --git a/vagrant/README.rst b/vagrant/README.rst index d9e1545..fdb96bc 100644 --- a/vagrant/README.rst +++ b/vagrant/README.rst @@ -1,15 +1,14 @@ Single-VM Vagrant Brozzler Deployment ------------------------------------- -This is a work in progress. Vagrant + ansible configuration for a single-vm -deployment of brozzler and warcprox with dependencies (notably rethinkdb). +This is a vagrant + ansible configuration for a single-vm deployment of +brozzler and warcprox with dependencies (notably rethinkdb). The idea is for this to be a quick way for people to get up and running with a deployment resembling a real distributed deployment, and to offer a starting configuration for people to adapt to their clusters. -And equally important, as a harness for integration tests. (As of now brozzler -itself has no automated tests!) +And equally important, as a harness for integration tests. You'll need vagrant installed. https://www.vagrantup.com/docs/installation/ @@ -25,27 +24,27 @@ the brozzler virtualenv. :: my-laptop$ vagrant ssh - vagrant@brozzler-easy:~$ source ~/brozzler-ve34/bin/activate - (brozzler-ve34)vagrant@brozzler-easy:~$ + vagrant@brzl:~$ source /opt/brozzler-ve34/bin/activate + (brozzler-ve34)vagrant@brzl:~$ Then you can run brozzler-new-site: :: - (brozzler-ve34)vagrant@brozzler-easy:~$ brozzler-new-site \ - --proxy=localhost:8000 http://example.com/ + (brozzler-ve34)vagrant@brzl:~$ brozzler-new-site --proxy=localhost:8000 http://example.com/ Or brozzler-new-job (make sure to set the proxy to localhost:8000): :: - (brozzler-ve34)vagrant@brozzler-easy:~$ cat >job1.yml + (brozzler-ve34)vagrant@brzl:~$ cat >job1.yml <