Added python3.5 support to setup.py and tests for #108

- Added wheel to dev requirements

.travis.yml

@@ -1,10 +1,11 @@
 sudo: false
 language: python
-python: 2.7
+python: 3.5
 env:
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
+  - TOX_ENV=py35
   - TOX_ENV=pypy
 
 script:

README.rst

@@ -30,7 +30,7 @@ Quickstart: Installation and Usage
 *pypiserver* `> 1.2.x` works with python `2.7` and `3.3 --> 3.5` or *pypy*.
 Python `3.0 --> 3.2` may also work, but it is not being tested
 with these versions.
-For older python-2 version, use version `1.1.x` series.
+For older python-2 versions, use *pypiserver* `1.1.x` series.
 
 Run the following commands to get your PyPI server up and running::
 

requirements/dev.pip

@@ -10,7 +10,7 @@ setuptools
 setuptools-git>=0.3
 passlib
 tox
-wheel
+wheel>=0.25.0
 pytest>=2.3
 webtest;        python_version != '2.5'
 mock;           python_version <= '3.2'

setup.py

@@ -13,6 +13,12 @@ tests_require = ['pytest>=2.3', 'tox', 'twine', 'pip>=7', 'passlib', 'webtest']
 if sys.version_info <= (3, 2):
     tests_require.append('mock')
 
+setup_requires = ['setuptools', 'setuptools-git >= 0.3']
+if sys.version_info >= (3,5):
+    setup_requires.append('wheel >= 0.25.0')  # earlier wheels fail in 3.5
+else:
+    setup_requires.append('wheel')
+
 
 def get_version():
     d = {}
@@ -29,12 +35,7 @@ setup(name="pypiserver",
       version=get_version(),
       packages=["pypiserver"],
       package_data={'pypiserver': ['welcome.html']},
-      setup_requires=[
-          'setuptools',
-          # Gather package-data from all files in git.
-          'setuptools-git >= 0.3',
-          'wheel',
-      ],
+      setup_requires=setup_requires,
       extras_require={
           'passlib': ['passlib'],
           'cache': ['watchdog']

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34
+envlist = py27,py33,py34,py35
 
 [testenv]
 deps=-r{toxinidir}/requirements/dev.pip