From 58b141bd532989407910b22dc2b93327758d8c69 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Feb 2017 11:02:53 -0800 Subject: [PATCH 1/6] add python 3 classifiers (#208) --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 629ea228..de880beb 100755 --- a/setup.py +++ b/setup.py @@ -108,6 +108,9 @@ setup( 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Topic :: Internet :: Proxy Servers', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: WSGI', From 4f6fa3ffd84f804bd7999f350c3a4c303d2ae736 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Feb 2017 11:04:42 -0800 Subject: [PATCH 2/6] client-rewrite: disable eval() override for now, needs more testing --- pywb/static/wombat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js index f8433590..21c83b73 100644 --- a/pywb/static/wombat.js +++ b/pywb/static/wombat.js @@ -2427,7 +2427,7 @@ var wombat_internal = function($wbwindow) { init_write_override(); // eval - init_eval_override(); + //init_eval_override(); // Ajax init_ajax_rewrite(); From 14e1dbb2685c431ad3995e3abc52901d1f635872 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Feb 2017 11:09:31 -0800 Subject: [PATCH 3/6] update CHANGELIST for 0.33.1 --- CHANGES.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index dbd990aa..b1205143 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,14 @@ +pywb 0.33.1 changelist +~~~~~~~~~~~~~~~~~~~~~~ + +* Client Rewriting Improvements: + - Better rules for Instagram, Medium + - Fix window.fetch() override + - Work on eval() override (disabled for more testing) + +* Add Python 3 classifiers to setup.py + + pywb 0.33.0 changelist ~~~~~~~~~~~~~~~~~~~~~~ From 7f95396be0797226c8f851afd81a7375abb290f3 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Feb 2017 11:29:09 -0800 Subject: [PATCH 4/6] setup: use jinja2<2.9 for now --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index de880beb..9793e437 100755 --- a/setup.py +++ b/setup.py @@ -77,7 +77,7 @@ setup( 'chardet', 'requests', 'redis', - 'jinja2', + 'jinja2<2.9', 'surt>=0.3.0', 'brotlipy', 'pyyaml', From 77960c13114b5132b5287c24c56869c5247c0f3d Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Feb 2017 14:32:14 -0800 Subject: [PATCH 5/6] setup: bound webtest for 2.6 support --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9793e437..14b50278 100755 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ setup( ], tests_require=[ 'pytest', - 'WebTest', + 'WebTest<=2.0.23', 'pytest-cov', 'fakeredis', 'mock', From 60f3c0a213666bf0401553f48ca0e3f10ee8bd83 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 16 Feb 2017 15:12:22 -0800 Subject: [PATCH 6/6] setup: further update trove classifiers, add python 2 and 3, switch to production stable, closes #208 --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 14b50278..ca765a70 100755 --- a/setup.py +++ b/setup.py @@ -102,12 +102,14 @@ setup( wb-manager = pywb.manager.manager:main_wrap_exc """, classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'License :: OSI Approved :: GNU General Public License (GPL)', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5',