1
0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00

Merge branch 'master' into new-pywb

This commit is contained in:
Ilya Kreymer 2017-02-17 18:49:01 -08:00
commit 2a7da54be9
2 changed files with 18 additions and 2 deletions

View File

@ -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 pywb 0.33.0 changelist
~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~

View File

@ -89,7 +89,7 @@ setup(
], ],
tests_require=[ tests_require=[
'pytest', 'pytest',
'WebTest', 'WebTest<=2.0.23',
'pytest-cov', 'pytest-cov',
'fakeredis', 'fakeredis',
'mock', 'mock',
@ -110,12 +110,17 @@ setup(
new-wayback = pywb.apps.cli:new_wayback new-wayback = pywb.apps.cli:new_wayback
""", """,
classifiers=[ classifiers=[
'Development Status :: 4 - Beta', 'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment', 'Environment :: Web Environment',
'License :: OSI Approved :: GNU General Public License (GPL)', 'License :: OSI Approved :: GNU General Public License (GPL)',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Internet :: Proxy Servers', 'Topic :: Internet :: Proxy Servers',
'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: WSGI', 'Topic :: Internet :: WWW/HTTP :: WSGI',