FIX Requirements.

+ Have `tox` read from requirements-file.
+ Add forgotten 'passlib' dep in `setup.py'!

pypiserver/_app.py

@@ -117,7 +117,7 @@ def configure(root=None,
     config.fallback_url = fallback_url
     config.cache_control = cache_control
     if password_file and password_file != '.':
-        from passlib.apache import HtpasswdFile  # @UnresolvedImport
+        from passlib.apache import HtpasswdFile
         config.htpasswdfile = HtpasswdFile(password_file)
     config.overwrite = overwrite
 

requirements/dev.pip

@@ -8,10 +8,14 @@
 pip>6
 setuptools
 setuptools-git>=0.3
+tox
 wheel
-pytest
-webtest
+pytest>=2.3
+webtest;        python_version != '2.5'
 mock;           python_version < '3'
 gevent>=1.1b4;  python_version >= '3'
 twine>=1.6.0
 
+WebOb==0.9.6.1;         python_version == '2.5'
+BeautifulSoup==3.2.1;   python_version == '2.5'
+WebTest==1.4.3;         python_version == '2.5'

setup.py

@@ -4,7 +4,7 @@ import sys
 
 from setuptools import setup
 
-tests_require =  ['pytest', 'twine']
+tests_require =  ['pytest>=2.3', 'tox', 'twine']
 if sys.version_info >= (3, 0):
     exec("def do_exec(co, loc): exec(co, loc)\n")
 else:
@@ -32,6 +32,7 @@ setup(name="pypiserver",
           'setuptools-git >= 0.3',  # Gather package-data from all files in git.
           'wheel',
       ],
+      install_requires=['passlib'],
       tests_require=tests_require,
       url="https://github.com/pypiserver/pypiserver",
       maintainer="Kostis Anagnostopoulos",

tox.ini

@@ -2,21 +2,9 @@
 envlist = py25,py26,py27,py32,py33,py34
 
 [testenv]
-deps=pytest>=2.3
-     webtest
-     beautifulsoup4
-     mock
-     twine>=1.6.0
+deps=-r{toxinidir}/requirements/dev.pip
 commands=py.test []
 sitepackages=False
 
-[testenv:py25]
-deps=pytest>=2.3
-     WebTest==1.4.3
-     WebOb==0.9.6.1
-     BeautifulSoup==3.2.1
-     mock
-     twine>=1.6.0
-
 [pytest]
 norecursedirs = bin parts develop-eggs eggs .* _* CVS {args}