Merge branch 'master' of github.com:Kozea/pygal

pygal_gen.py

@@ -49,9 +49,7 @@ for key, val in pygal.config.Config.__dict__.items():
             if val:
                 opt_name = 'no-' + opt_name
         if key == 'interpolate':
-            opts['choices'] = [
-                'linear', 'nearest', 'zero', 'slinear', 'quadratic',
-                'cubic', 'krogh', 'barycentric', 'univariate']
+            opts['choices'] = ['quadratic', 'cubic']
         parser.add_argument(
             '--%s' % opt_name, dest=key, default=val, **opts)
 

tox.ini

@@ -2,6 +2,7 @@
 envlist = py26,py27,py32,py33
 
 [testenv]
+sitepackages=True
 deps =
      pytest
      pytest-cov