From 88d3d3b310056b6f163dc36bc92a8de1ab98de6e Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 22 Aug 2018 14:35:39 -0700 Subject: [PATCH] why did those tests fail??? (#117) 1.4 for pypi --- .travis.yml | 2 +- README.rst | 2 +- setup.py | 34 +++++++++++++++++----------------- tests/test_cli.py | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cb807b..59bd04d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: - chromium-browser --version - sudo service brozzler-worker restart script: -- DISPLAY=:1 py.test -v tests +- DISPLAY=:1 py.test --tb=native -v tests after_failure: - chromium-browser --version - sudo cat /var/log/upstart/warcprox.log diff --git a/README.rst b/README.rst index bbc6101..bf194bb 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -.. image:: https://travis-ci.org/internetarchive/brozzler.svg?branch=master +.. image:: https://travis-ci.org/internetarchive/brozzler.svg?branch=1.4 :target: https://travis-ci.org/internetarchive/brozzler .. |logo| image:: https://cdn.rawgit.com/internetarchive/brozzler/1.1b12/brozzler/dashboard/static/brozzler.svg diff --git a/setup.py b/setup.py index bf6ac45..a2ff8f1 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def find_package_data(package): setuptools.setup( name='brozzler', - version='1.5.dev301', + version='1.4', description='Distributed web crawling with browsers', url='https://github.com/internetarchive/brozzler', author='Noah Levitt', @@ -63,29 +63,29 @@ setuptools.setup( ], }, install_requires=[ - 'PyYAML>=3.12', - 'youtube-dl>=2018.7.21', + 'PyYAML>=3.12,<=3.12', + 'youtube-dl>=2018.7.21,<=2018.7.21', 'reppy==0.3.4', - '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', - 'cerberus>=1.0.1', - 'jinja2>=2.10', - 'cryptography>=2.3', + 'requests>=2.18.4,<=2.19.1', + 'websocket-client>=0.39.0,<=0.48.0', + 'pillow>=5.2.0,<=5.2.0', + 'urlcanon>=0.1.dev23,<=0.2.dev27', + 'doublethink>=0.2.0.dev88,<=0.2.0.dev88', + 'rethinkdb>=2.3,<=2.3.0.post6', + 'cerberus>=1.0.1,<=1.0.1', + 'jinja2>=2.10,<=2.10', + 'cryptography>=2.3,<=2.3.1', ], extras_require={ 'dashboard': [ - 'flask>=0.11', - 'gunicorn>=19.8.1' + 'flask>=0.11,<=1.0.2', + 'gunicorn>=19.8.1,<=19.8.1' ], 'easy': [ - 'warcprox>=2.4b2.dev173', + 'warcprox>=2.4b2.dev173,<=2.4b3.dev183', 'pywb>=0.33.2,<2', - 'flask>=0.11', - 'gunicorn>=19.8.1' + 'flask>=0.11,<=1.0.2', + 'gunicorn>=19.8.1,<=19.8.1' ], }, zip_safe=False, diff --git a/tests/test_cli.py b/tests/test_cli.py index 0235416..03ec39a 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -53,9 +53,9 @@ def test_run_command(capsys, cmd): proc = subprocess.Popen( [cmd, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) out, err = proc.communicate() + assert err == b'' assert out == ('brozzler %s - %s\n' % ( brozzler.__version__, cmd)).encode('ascii') - assert err == b'' def test_rethinkdb_up(): '''Check that rethinkdb is up and running.'''