Merge branch 'v1.4.2' into v1.4.x

tacaswell · tacaswell · commit e762d0e05104 · 2014-10-22T21:54:31.000-04:00
Conflicts:
	lib/matplotlib/__init__.py

White-space conflicts
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -245,7 +245,17 @@ <h3>{{ _('Navigation') }}</h3>
 href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     {%- endif %}
     </div>
-{%- endblock %}
+ {%- endblock %}
+
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-55954603-1', 'auto');
+  ga('send', 'pageview');
 
+</script>
 </body>
 </html>
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -107,8 +107,8 @@
 import distutils.version
 from itertools import chain
 
-__version__  = str('1.4.x')
-__version__numpy__ = str('1.6') # minimum required numpy version
+__version__ = str('1.4.x')
+__version__numpy__ = str('1.6')  # minimum required numpy version
 
 try:
     import dateutil
diff --git a/setupext.py b/setupext.py
@@ -147,9 +147,10 @@ def get_base_dirs():
         return options['basedirlist']
 
     basedir_map = {
-        'win32': ['win32_static',],
-        'darwin': ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
-        'sunos5': [os.getenv('MPLIB_BASE') or '/usr/local',],
+        'win32': ['win32_static', ],
+        'darwin': ['/usr/local/', '/usr', '/usr/X11',
+                   '/opt/X11', '/opt/local'],
+        'sunos5': [os.getenv('MPLIB_BASE') or '/usr/local', ],
         'gnu0': ['/usr'],
         'aix5': ['/usr/local'],
         }
