Merge branch 'master' of https://github.com/internetarchive/warcprox

* 'master' of https://github.com/internetarchive/warcprox:
  oops, adding missing comma
  add some classifiers
  since we depend on warctools trunk now, update the readme, and update the version number, so we can push latest to pypi

README.rst

@@ -2,8 +2,6 @@ warcprox - WARC writing MITM HTTP/S proxy
 -----------------------------------------
 .. image:: https://travis-ci.org/internetarchive/warcprox.png?branch=master   
         :target: https://travis-ci.org/internetarchive/warcprox
-.. image:: https://pypip.in/d/warcprox/badge.png
-        :target: https://pypi.python.org/pypi/warcprox
 
 Based on the excellent and simple pymiproxy by Nadeem Douba.
 https://github.com/allfro/pymiproxy
@@ -20,14 +18,6 @@ get the warning when you visit each new site. But worse, any embedded
 https content on a different server will simply fail to load, because
 the browser will reject the certificate without telling you.
 
-Dependencies
-~~~~~~~~~~~~
-
-Currently depends on tweaks branch of my fork of warctools.
-https://github.com/nlevitt/warctools/tree/tweaks Hopefully the changes
-in that branch, or something equivalent, will be incorporated into
-warctools mainline.
-
 Usage
 ~~~~~
 

setup.py

@@ -4,7 +4,7 @@
 import setuptools 
 
 setuptools.setup(name='warcprox',
-        version='1.0',
+        version='1.1',
         description='WARC writing MITM HTTP/S proxy',
         url='https://github.com/internetarchive/warcprox',
         author='Noah Levitt',
@@ -17,5 +17,18 @@ setuptools.setup(name='warcprox',
         tests_require=['requests>=2.0.1'],  # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636
         test_suite='warcprox.tests',
         scripts=['bin/dump-anydbm', 'bin/warcprox'],
-        zip_safe=False)
+        zip_safe=False,
+        classifiers=[
+            'Development Status :: 5 - Production/Stable',
+            'Environment :: Console',
+            'License :: OSI Approved :: GNU General Public License (GPL)',
+            'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.2',
+            'Programming Language :: Python :: 3.3',
+            'Topic :: Internet :: Proxy Servers',
+            'Topic :: Internet :: WWW/HTTP',
+            'Topic :: Software Development :: Libraries :: Python Modules',
+            'Topic :: System :: Archiving',
+        ])