Merge pull request #64 from kuba/pypi-augeas

python-augeas from PyPI

requirements.txt

@@ -1,6 +1,5 @@
 M2Crypto==0.22.3
 python2-pythondialog
 jsonschema==2.4.0
-#python-augeas==0.5.0
+python-augeas==0.5.0
 requests==2.4.3
-https://github.com/giraldeau/python-augeas/archive/v0.5.0.zip

setup.py

@@ -15,7 +15,7 @@ testing_extras = [
     'coverage',
     'nose',
     'pylint',
-    'tox>=1.6',
+    'tox',
 ]
 
 setup(
@@ -30,10 +30,6 @@ setup(
         'letsencrypt.client',
         'letsencrypt.scripts',
     ],
-    dependency_links=[
-        # http://augeas.net/download.html
-        'https://fedorahosted.org/released/python-augeas/',
-    ],
     install_requires=install_requires,
     tests_require=install_requires,
     extras_require={

tox.ini

@@ -7,8 +7,6 @@
 envlist = py26, py27, lint
 
 [testenv]
-# install_command requires tox>=1.6
-install_command = pip install --process-dependency-links {opts} {packages}
 commands = nosetests
 deps =
     nose
@@ -16,4 +14,4 @@ deps =
 [testenv:lint]
 commands = pylint letsencrypt
 deps =
-    pylint
+    pylint