FIX/MAINT: update my mail etc (scikit-learn#8375)

dengemann · ogrisel · commit 8694278c027d · 2017-02-16T19:21:26.000+01:00
* update mail etc

* fix utf8
diff --git a/.mailmap b/.mailmap
@@ -23,10 +23,10 @@ Brian Holt <bh00038@cvplws63.eps.surrey.ac.uk> <bdholt1@gmail.com>
 Christian Osendorfer <osendorf@gmail.com>
 Clay Woolam <clay@woolam.org>
 Danny Sullivan <dsullivan7@hotmail.com> <dbsullivan23@gmail.com>
-Denis Engemann <d.engemann@fz-juelich.de>
-Denis Engemann <d.engemann@fz-juelich.de> <denis.engemann@gmail.com>
-Denis Engemann <d.engemann@fz-juelich.de> <dengemann@Deniss-MacBook-Pro.local>
-Denis Engemann <d.engemann@fz-juelich.de> <dengemann <denis.engemann@gmail.com>
+Denis Engemann <denis-alexander.engemann@inria.fr>
+Denis Engemann <denis-alexander.engemann@inria.fr> <denis.engemann@gmail.com>
+Denis Engemann <denis-alexander.engemann@inria.fr> <dengemann@Deniss-MacBook-Pro.local>
+Denis Engemann <denis-alexander.engemann@inria.fr> <dengemann <denis.engemann@gmail.com>
 Diego Molla <dmollaaliod@gmail.com> <diego@diego-desktop.(none)>
 DraXus <draxus@gmail.com> draxus <draxus@hammer.ugr>
 Edouard DUCHESNAY <ed203246@is206877.intra.cea.fr> <duchesnay@is143433.(none)>
@@ -61,7 +61,7 @@ Jake VanderPlas <vanderplas@astro.washington.edu> <jakevdp@gmail.com>
 Jake VanderPlas <vanderplas@astro.washington.edu> <vanderplas@astro.washington.edu>
 James Bergstra <james.bergstra@gmail.com>
 Jaques Grobler <jaques.grobler@inria.fr> <jaquesgrobler@gmail.com>
-Jan Schl�ter <scikit-learn@jan-schlueter.de>
+Jan Schlüter <scikit-learn@jan-schlueter.de>
 Jean Kossaifi <jean.kossaifi@gmail.com>
 Jean Kossaifi <jean.kossaifi@gmail.com> <jkossaifi@is208616.intra.cea.fr>
 Jean Kossaifi <jean.kossaifi@gmail.com> <kossaifi@is208616.intra.cea.fr>
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -2304,7 +2304,7 @@ Enhancements
      :class:`cluster.MeanShift`, by `Mathieu Blondel`_.
 
    - Vector and matrix multiplications have been optimised throughout the
-     library by :user:`Denis Engemann <dengemann>`, and `Alexandre Gramfort`_.
+     library by `Denis Engemann`_, and `Alexandre Gramfort`_.
      In particular, they should take less memory with older NumPy versions
      (prior to 1.7.2).
 
@@ -2317,7 +2317,7 @@ Enhancements
 
    - Added svd_method option with default value to "randomized" to
      :class:`decomposition.FactorAnalysis` to save memory and
-     significantly speedup computation by :user:`Denis Engemann <dengemann>`, and
+     significantly speedup computation by `Denis Engemann`_, and
      `Alexandre Gramfort`_.
 
    - Changed :class:`cross_validation.StratifiedKFold` to try and
@@ -2840,7 +2840,7 @@ Changelog
      faster on sparse data (the speedup depends on the sparsity). By
      `Lars Buitinck`_.
 
-   - Reduce memory footprint of FastICA by :user:`Denis Engemann <dengemann>` and
+   - Reduce memory footprint of FastICA by `Denis Engemann`_ and
      `Alexandre Gramfort`_.
 
    - Verbose output in :mod:`sklearn.ensemble.gradient_boosting` now uses
@@ -4986,3 +4986,5 @@ David Huard, Dave Morrill, Ed Schofield, Travis Oliphant, Pearu Peterson.
 .. _Kathleen Chen: https://github.com/kchen17
 
 .. _Vincent Pham: https://github.com/vincentpham1991
+
+.. _Denis Engemann: http://denis-engemann.de
diff --git a/sklearn/decomposition/base.py b/sklearn/decomposition/base.py
@@ -3,7 +3,7 @@
 # Author: Alexandre Gramfort <alexandre.gramfort@inria.fr>
 #         Olivier Grisel <olivier.grisel@ensta.org>
 #         Mathieu Blondel <mathieu@mblondel.org>
-#         Denis A. Engemann <d.engemann@fz-juelich.de>
+#         Denis A. Engemann <denis-alexander.engemann@inria.fr>
 #         Kyle Kastner <kastnerkyle@gmail.com>
 #
 # License: BSD 3 clause
diff --git a/sklearn/decomposition/factor_analysis.py b/sklearn/decomposition/factor_analysis.py
@@ -15,7 +15,7 @@
 
 # Author: Christian Osendorfer <osendorf@gmail.com>
 #         Alexandre Gramfort <alexandre.gramfort@inria.fr>
-#         Denis A. Engemann <d.engemann@fz-juelich.de>
+#         Denis A. Engemann <denis-alexander.engemann@inria.fr>
 
 # License: BSD3
 
diff --git a/sklearn/decomposition/pca.py b/sklearn/decomposition/pca.py
@@ -4,7 +4,7 @@
 # Author: Alexandre Gramfort <alexandre.gramfort@inria.fr>
 #         Olivier Grisel <olivier.grisel@ensta.org>
 #         Mathieu Blondel <mathieu@mblondel.org>
-#         Denis A. Engemann <d.engemann@fz-juelich.de>
+#         Denis A. Engemann <denis-alexander.engemann@inria.fr>
 #         Michael Eickenberg <michael.eickenberg@inria.fr>
 #         Giorgio Patrini <giorgio.patrini@anu.edu.au>
 #
diff --git a/sklearn/utils/tests/test_extmath.py b/sklearn/utils/tests/test_extmath.py
@@ -1,6 +1,6 @@
 # Authors: Olivier Grisel <olivier.grisel@ensta.org>
 #          Mathieu Blondel <mathieu@mblondel.org>
-#          Denis Engemann <d.engemann@fz-juelich.de>
+#          Denis Engemann <denis-alexander.engemann@inria.fr>
 #
 # License: BSD 3 clause
 

-Original file line number
+Diff line change
 Christian Osendorfer <[email protected]>
 Clay Woolam <[email protected]>
 Danny Sullivan <[email protected]> <[email protected]>
 -Denis Engemann <d.engemann@fz-juelich.de>
 -Denis Engemann <d.engemann@fz-juelich.de> <[email protected]>
 -Denis Engemann <d.engemann@fz-juelich.de> <[email protected]>
 -Denis Engemann <d.engemann@fz-juelich.de> <dengemann <[email protected]>
 +Denis Engemann <denis-alexander.engemann@inria.fr>
 +Denis Engemann <denis-alexander.engemann@inria.fr> <[email protected]>
 +Denis Engemann <denis-alexander.engemann@inria.fr> <[email protected]>
 +Denis Engemann <denis-alexander.engemann@inria.fr> <dengemann <[email protected]>
 Diego Molla <[email protected]> <diego@diego-desktop.(none)>
 DraXus <[email protected]> draxus <[email protected]>
 Edouard DUCHESNAY <[email protected]> <duchesnay@is143433.(none)>
 Jake VanderPlas <[email protected]> <[email protected]>
 James Bergstra <[email protected]>
 Jaques Grobler <[email protected]> <[email protected]>
 -Jan Schl�ter <[email protected]>
 +Jan Schlüter <[email protected]>
 Jean Kossaifi <[email protected]>
 Jean Kossaifi <[email protected]> <[email protected]>
 Jean Kossaifi <[email protected]> <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Author: Alexandre Gramfort <[email protected]>`
`4`	`4`	`# Olivier Grisel <[email protected]>`
`5`	`5`	`# Mathieu Blondel <[email protected]>`
`6`		`-# Denis A. Engemann <d.engemann@fz-juelich.de>`
	`6`	`+# Denis A. Engemann <denis-alexander.engemann@inria.fr>`
`7`	`7`	`# Kyle Kastner <[email protected]>`
`8`	`8`	`#`
`9`	`9`	`# License: BSD 3 clause`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Author: Alexandre Gramfort <[email protected]>`
`5`	`5`	`# Olivier Grisel <[email protected]>`
`6`	`6`	`# Mathieu Blondel <[email protected]>`
`7`		`-# Denis A. Engemann <d.engemann@fz-juelich.de>`
	`7`	`+# Denis A. Engemann <denis-alexander.engemann@inria.fr>`
`8`	`8`	`# Michael Eickenberg <[email protected]>`
`9`	`9`	`# Giorgio Patrini <[email protected]>`
`10`	`10`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Authors: Olivier Grisel <[email protected]>`
`2`	`2`	`# Mathieu Blondel <[email protected]>`
`3`		`-# Denis Engemann <d.engemann@fz-juelich.de>`
	`3`	`+# Denis Engemann <denis-alexander.engemann@inria.fr>`
`4`	`4`	`#`
`5`	`5`	`# License: BSD 3 clause`
`6`	`6`