diff --git a/.travis.yml b/.travis.yml index 7bac95a..1391441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,14 +3,16 @@ python: - 3.5 - 3.4 - 2.7 -- nightly - pypy - pypy3 +- 3.6-dev +- nightly matrix: allow_failures: - - python: pypy - python: pypy3 + - python: nightly + - python: 3.6-dev addons: apt: diff --git a/setup.py b/setup.py index 9e87a09..9ec73b6 100755 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ except: setuptools.setup( name='warcprox', - version='2.0b2.dev32', + version='2.0b2.dev33', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/tests/test_warcprox.py b/tests/test_warcprox.py index 6d4b986..d02bd35 100755 --- a/tests/test_warcprox.py +++ b/tests/test_warcprox.py @@ -1099,7 +1099,7 @@ def test_domain_data_soft_limit( # XXX this test relies on a tor proxy running at localhost:9050 with a working # connection to the internet, and relies on a third party site (facebook) being # up and behaving a certain way -def _test_tor_onion(archiving_proxies): +def test_tor_onion(archiving_proxies): response = requests.get('http://www.facebookcorewwwi.onion/', proxies=archiving_proxies, verify=False, allow_redirects=False) assert response.status_code == 302