Add PyPy[3]

Also add badges to README and rename .txt -> .rst.

Fix version number so that restview doesn't complain.

.travis.yml

@@ -6,6 +6,8 @@ python:
     - 3.4
     - 3.5
     - 3.6
+    - pypy
+    - pypy3
 install:
     - pip install coveralls coverage
     - pip install -e ".[test]"

CHANGES.txt → CHANGES.rst

@@ -1,21 +1,23 @@
-=======
-CHANGES
-=======
+=========
+ CHANGES
+=========
 
 4.0.0 (unreleased)
-------------------
+==================
 
-- Add support for Python 3.4, 3.5, and 3.6
+- Add support for Python 3.4, 3.5, and 3.6.
+
+- Add support for PyPy.
 
 
 3.6.0 (2011-03-23)
-------------------
+==================
 
 - Moved ``zope.app.server.zpasswd`` to ``zope.password.zpasswd``.
 
 
 3.5.0 (2009-12-19)
-------------------
+==================
 
 - Use ``zope.password`` instead of ``zope.app.authentication``
 
@@ -24,20 +26,20 @@ CHANGES
 
 
 3.4.2 (2008-08-18)
-------------------
+==================
 
 - Moved a doctest into a unittest to fix failures in the KGS test suite
   (see LP #257954)
 
 3.4.1 (2008-02-25)
-------------------
+==================
 
 - Fixed restart so that the process exits with a non-zero exit status
   so it gets restarted by zdaemon, or an equivalent mechanism.
 
 - Removed the use of ``ThreadedAsync``.
 
 3.4.0 (2007-10-27)
-------------------
+==================
 
 - Initial release independent of the main Zope tree.

MANIFEST.in

@@ -1,5 +1,6 @@
 include *.py
 include *.txt
+include *.rst
 include buildout.cfg
 recursive-include src *.in
 recursive-include src *.xml

README.rst

@@ -0,0 +1,18 @@
+.. image:: https://img.shields.io/pypi/v/zope.app.server.svg
+        :target: https://pypi.python.org/pypi/zope.app.server/
+        :alt: Latest release
+
+.. image:: https://img.shields.io/pypi/pyversions/zope.app.server.svg
+        :target: https://pypi.org/project/zope.app.server/
+        :alt: Supported Python versions
+
+.. image:: https://travis-ci.org/zopefoundation/zope.app.server.svg?branch=master
+        :target: https://travis-ci.org/zopefoundation/zope.app.server
+
+.. image:: https://coveralls.io/repos/github/zopefoundation/zope.app.server/badge.svg?branch=master
+        :target: https://coveralls.io/github/zopefoundation/zope.app.server?branch=master
+
+
+This package integrates ZServer -- Zope's HTTP and FTP server -- into a Zope 3
+application setup. It also defines the script skeleton for a classic Zope 3
+application.

setup.py

@@ -29,14 +29,14 @@ def read(*rnames):
 
 setup(
     name='zope.app.server',
-    version='4.0.0dev',
+    version='4.0.0.dev0',
     author='Zope Corporation and Contributors',
     author_email='zope-dev@zope.org',
     description='ZServer integration for Zope 3 Applications',
     long_description=(
-        read('README.txt')
+        read('README.rst')
         + '\n\n' +
-        read('CHANGES.txt')
+        read('CHANGES.rst')
     ),
     keywords="zope3 zserver server http ftp wsgi",
     classifiers=[
@@ -49,6 +49,8 @@ def read(*rnames):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
@@ -63,6 +65,7 @@ def read(*rnames):
         test=[
             'zope.testrunner',
             'zope.app.testing',
+            'ZODB',
         ],
     ),
     install_requires=[
@@ -81,7 +84,6 @@ def read(*rnames):
         'zope.processlifetime',
         'zdaemon',
         'ZConfig',
-        'ZODB3',
     ],
     include_package_data=True,
     zip_safe=False,

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, pypy, pypy3
 
 [testenv]
 deps =