old_contents: import sys
  
  from setuptools import setup
  from setuptools import find_packages
  
  
  version = '0.1.0.dev0'
  
  install_requires = [
      # load_pem_private/public_key (>=0.6)
      # rsa_recover_prime_factors (>=0.8)
      'cryptography>=0.8',
      'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)
      'pyasn1',  # urllib3 InsecurePlatformWarning (#304)
      # Connection.set_tlsext_host_name (>=0.13), X509Req.get_extensions (>=0.15)
      'PyOpenSSL>=0.15',
      'pyrfc3339',
      'pytz',
      'requests',
      'setuptools==18.5',  # pkg_resources
      'six',
      'werkzeug',
  ]
  
  # env markers in extras_require cause problems with older pip: #517
  if sys.version_info < (2, 7):
      install_requires.extend([
          # only some distros recognize stdlib argparse as already satisfying
          'argparse',
          'mock<1.1.0',
      ])
  else:
      install_requires.append('mock')
  
  docs_extras = [
      'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
      'sphinx_rtd_theme',
      'sphinxcontrib-programoutput',
  ]
  
  testing_extras = [
      'nose',
      'tox',
  ]
  
  
  setup(
      name='acme',
      version=version,
      description='ACME protocol implementation in Python',
      url='https://github.com/letsencrypt/letsencrypt',
      author="Let's Encrypt Project",
      author_email='client-dev@letsencrypt.org',
      license='Apache License 2.0',
      classifiers=[
          'Development Status :: 3 - Alpha',
          'Intended Audience :: Developers',
          'License :: OSI Approved :: Apache Software License',
          'Programming Language :: Python',
          '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',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Security',
      ],
  
      packages=find_packages(),
      include_package_data=True,
      install_requires=install_requires,
      extras_require={
          'docs': docs_extras,
          'testing': testing_extras,
      },
      entry_points={
          'console_scripts': [
              'jws = acme.jose.jws:CLI.run',
          ],
      },
      test_suite='acme',
  )
  
new_contents: import sys
  
  from setuptools import setup
  from setuptools import find_packages
  
  
  version = '0.1.0.dev0'
  
  install_requires = [
      # load_pem_private/public_key (>=0.6)
      # rsa_recover_prime_factors (>=0.8)
      'cryptography>=0.8',
      'ndg-httpsclient',  # urllib3 InsecurePlatformWarning (#304)
      'pyasn1',  # urllib3 InsecurePlatformWarning (#304)
      # Connection.set_tlsext_host_name (>=0.13), X509Req.get_extensions (>=0.15)
      'PyOpenSSL>=0.15',
      'pyrfc3339',
      'pytz',
      'requests',
      'setuptools',  # pkg_resources
      'six',
      'werkzeug',
  ]
  
  # env markers in extras_require cause problems with older pip: #517
  if sys.version_info < (2, 7):
      install_requires.extend([
          # only some distros recognize stdlib argparse as already satisfying
          'argparse',
          'mock<1.1.0',
      ])
  else:
      install_requires.append('mock')
  
  docs_extras = [
      'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
      'sphinx_rtd_theme',
      'sphinxcontrib-programoutput',
  ]
  
  testing_extras = [
      'nose',
      'tox',
  ]
  
  
  setup(
      name='acme',
      version=version,
      description='ACME protocol implementation in Python',
      url='https://github.com/letsencrypt/letsencrypt',
      author="Let's Encrypt Project",
      author_email='client-dev@letsencrypt.org',
      license='Apache License 2.0',
      classifiers=[
          'Development Status :: 3 - Alpha',
          'Intended Audience :: Developers',
          'License :: OSI Approved :: Apache Software License',
          'Programming Language :: Python',
          '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',
          'Topic :: Internet :: WWW/HTTP',
          'Topic :: Security',
      ],
  
      packages=find_packages(),
      include_package_data=True,
      install_requires=install_requires,
      extras_require={
          'docs': docs_extras,
          'testing': testing_extras,
      },
      entry_points={
          'console_scripts': [
              'jws = acme.jose.jws:CLI.run',
          ],
      },
      test_suite='acme',
  )
  
subject: Revert "Quikfix"