update around matplotlib unit test

sdpython · Feb 22, 2017 · d5a9940 · d5a9940
1 parent 717486c
commit d5a9940
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/_doc/sphinxdoc/source/td_2a.rst b/_doc/sphinxdoc/source/td_2a.rst
@@ -723,6 +723,7 @@ Interprétabilité des modèles
 
 *Lectures*
 
+* `Learning to learn by gradient descent by gradient descent <https://arxiv.org/pdf/1606.04474.pdf>`_
 * `Importance Weighting Without Importance Weights: An Effcient Algorithm for Combinatorial Semi-Bandits <http://jmlr.org/papers/volume17/15-091/15-091.pdf>`_
 * `Making Tree Ensembles Interpretable <https://arxiv.org/pdf/1606.05390v1.pdf>`_
 * `Understanding variable importances in forests of randomized trees <http://papers.nips.cc/paper/4928-understanding-variable-importances-in-forests-of-randomized-trees.pdf>`_

diff --git a/_unittests/ut_faq/test_ggplot_graph.py b/_unittests/ut_faq/test_ggplot_graph.py
@@ -188,7 +188,7 @@ def test_graph_ggplots(self):
             warnings.warn(
                 "Issue with Python 3.4, bug probably related to wrong pointers")
             return
-        fix_tkinter_issues_virtualenv()
+        fix_tkinter_issues_virtualenv(fLOG=fLOG)
         import matplotlib.pyplot as plt
         fig, ax = plt.subplots(figsize=(8, 3))
         graph_ggplot_with_label(x, y, xl, ax=ax)

diff --git a/bin/gitpull.bat b/bin/gitpull.bat
@@ -1,5 +1,5 @@
 set current=%~dp0
-cd ..   
+cd ..
 cd ..
 cd actuariat_python
 git pull

diff --git a/src/ensae_teaching_cs/faq/faq_matplotlib.py b/src/ensae_teaching_cs/faq/faq_matplotlib.py
@@ -3,9 +3,7 @@
 @file
 @brief Quelques problèmes récurrents avec `matplotlib <http://matplotlib.org/>`_.
 """
-from mpl_toolkits.basemap import Basemap
 import numpy
-import matplotlib.pyplot as plt
 
 
 def graph_style(style='ggplot'):
@@ -311,6 +309,7 @@ def graph_cities(df, names=["Longitude", "Latitude", "City"], ax=None, linked=Fa
     miny -= dy
     maxy += dy
 
+    from mpl_toolkits.basemap import Basemap
     m = Basemap(llcrnrlon=params.get('llcrnrlon', minx),
                 llcrnrlat=params.get('llcrnrlat', miny),
                 urcrnrlon=params.get('urcrnrlon', maxx),

diff --git a/src/ensae_teaching_cs/tests/american_cities.py b/src/ensae_teaching_cs/tests/american_cities.py
@@ -52,6 +52,7 @@ def haversine(p1, p2):
             dftrip.ix[i, "City"] = ""
 
     if img is not None:
+        fix_tkinter_issues_virtualenv()
         import matplotlib.pyplot as plt
         fig, ax = plt.subplots(figsize=(32, 32))
         ax = graph_cities(dftrip, ax=ax, markersize=3, linked=True, fLOG=fLOG,