old_contents: import io
  import os
  
  from setuptools import setup, find_packages
  
  __version__ = "0.6.0"
  
  
  def read_from(file):
      reply = []
      with io.open(os.path.join(here, file), encoding='utf8') as f:
          for l in f:
              l = l.strip()
              if not l:
                  break
              if l[0] != '#' or l[:2] != '//':
                  reply.append(l)
      return reply
  
  
  here = os.path.abspath(os.path.dirname(__file__))
  with io.open(os.path.join(here, 'README.md'), encoding='utf8') as f:
      README = f.read()
  with io.open(os.path.join(here, 'CHANGELOG.md'), encoding='utf8') as f:
      CHANGES = f.read()
  
  setup(name="py-vapid",
        version=__version__,
        description='Simple VAPID header generation library',
        long_description=README + '\n\n' + CHANGES,
        classifiers=["Topic :: Internet :: WWW/HTTP",
                     'Programming Language :: Python',
                     "Programming Language :: Python :: 2",
                     "Programming Language :: Python :: 2.7"
                     ],
        keywords='vapid push webpush',
        author="JR Conlin",
        author_email="src+vapid@jrconlin.com",
        url='https://github.com/mozilla-services/vapid',
        license="MPL2",
        test_suite="nose.collector",
        include_package_data=True,
        zip_safe=False,
        packages=find_packages(),
        package_data={'': ['README.md', 'CHANGELOG.md',
                           'requirements.txt', 'test-requirements.txt']},
        install_requires=read_from('requirements.txt'),
        tests_require=read_from('test-requirements.txt'),
        entry_points="""
        [console_scripts]
        vapid = py_vapid.main:main
        [nose.plugins]
        object-tracker = autopush.noseplugin:ObjectTracker
        """,
        )
  
new_contents: import io
  import os
  
  from setuptools import setup, find_packages
  
  __version__ = "0.7.0"
  
  
  def read_from(file):
      reply = []
      with io.open(os.path.join(here, file), encoding='utf8') as f:
          for l in f:
              l = l.strip()
              if not l:
                  break
              if l[0] != '#' or l[:2] != '//':
                  reply.append(l)
      return reply
  
  
  here = os.path.abspath(os.path.dirname(__file__))
  with io.open(os.path.join(here, 'README.md'), encoding='utf8') as f:
      README = f.read()
  with io.open(os.path.join(here, 'CHANGELOG.md'), encoding='utf8') as f:
      CHANGES = f.read()
  
  setup(name="py-vapid",
        version=__version__,
        description='Simple VAPID header generation library',
        long_description=README + '\n\n' + CHANGES,
        classifiers=["Topic :: Internet :: WWW/HTTP",
                     "Programming Language :: Python",
                     "Programming Language :: Python :: 2",
                     "Programming Language :: Python :: 2.7",
                     "Programming Language :: Python :: 3",
                     "Programming Language :: Python :: 3.4",
                     ],
        keywords='vapid push webpush',
        author="JR Conlin",
        author_email="src+vapid@jrconlin.com",
        url='https://github.com/mozilla-services/vapid',
        license="MPL2",
        test_suite="nose.collector",
        include_package_data=True,
        zip_safe=False,
        packages=find_packages(),
        package_data={'': ['README.md', 'CHANGELOG.md',
                           'requirements.txt', 'test-requirements.txt']},
        install_requires=read_from('requirements.txt'),
        tests_require=read_from('test-requirements.txt'),
        entry_points="""
        [console_scripts]
        vapid = py_vapid.main:main
        [nose.plugins]
        object-tracker = autopush.noseplugin:ObjectTracker
        """,
        )
  
subject: Bump to 0.7.0 and add Python 3 classifiers