Merge pull request #59 from yarikoptic/master

ENH+BF: recently introduced entries got fixed up
duecredit · Sep 24, 2015 · 61fe6e1 · 61fe6e1
2 parents 300b09b + 600369a
commit 61fe6e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/duecredit/injections/mod_mdp.py b/duecredit/injections/mod_mdp.py
@@ -30,7 +30,7 @@ def inject(injector):
                  tags=['implementation'])
 
     injector.add('mdp.nodes', 'NIPALSNode', BibTeX("""
-        @incollection{
+        @incollection{Word1966,
             author={Wold, H.},
             title={Nonlinear estimation by iterative least squares procedures.},
             booktitle={Research Papers in Statistics},
@@ -51,7 +51,7 @@ def inject(injector):
                  tags=['implementation'])
 
     injector.add('mdp.nodes', 'NIPALSNode', BibTeX("""
-        @conference{
+        @conference{ZieheMuller1998,
             author={Ziehe, Andreas and Muller, Klaus-Robert},
             title={TDSEP an efficient algorithm for blind separation using time structure.},
             booktitle={Proc. 8th Int. Conf. Artificial Neural Networks},
@@ -85,7 +85,7 @@ def inject(injector):
 
 
     injector.add('mdp.nodes', 'XSFANode', BibTeX("""
-        @article{
+        @article{SprekelerZitoWiskott2009,
             author={Sprekeler, H., Zito, T., and Wiskott, L.},
             title={An Extension of Slow Feature Analysis for Nonlinear Blind Source Separation.},
             journal={Journal of Machine Learning Research.},
@@ -97,7 +97,7 @@ def inject(injector):
         tags=['edu'])
 
     injector.add('mdp.nodes', 'FDANode._train', BibTeX("""
-        @book{
+        @book{Nishop2011,
             author={Christopher M. Bishop},
             title={Neural Networks for Pattern Recognition},
             publisher={Oxford University Press, Inc}

diff --git a/duecredit/injections/mod_psychopy.py b/duecredit/injections/mod_psychopy.py
@@ -21,7 +21,7 @@
 
 def inject(injector):
     injector.add('psychopy', None, Doi('doi:10.1016/j.jneumeth.2006.11.017'),
-                 description="PsychoPy—Psychophysics software in Python.",
+                 description="PsychoPy -- Psychophysics software in Python.",
                  tags=['implementation'])
 
     injector.add('psychopy', None, Doi('10.3389/neuro.11.010.2008'),

diff --git a/duecredit/tests/test_injections.py b/duecredit/tests/test_injections.py
@@ -162,18 +162,25 @@ def test_no_double_activation():
 
 def test_get_modules_for_injection():
     assert_equal(get_modules_for_injection(), [
-        'mod_biosig', 'mod_numpy', 'mod_pandas', 'mod_scipy', 'mod_sklearn'])
+        'mod_biosig',
+        'mod_dipy',
+        'mod_mdp',
+        'mod_mne',
+        'mod_nipype',
+        'mod_numpy',
+        'mod_pandas',
+        'mod_psychopy',
+        'mod_scipy',
+        'mod_skimage',
+        'mod_sklearn'])
 
 def test_cover_our_injections():
     # this one tests only import/syntax/api for the injections
     due = DueCreditCollector()
     inj = DueCreditInjector(collector=due)
-    from duecredit.injections import mod_numpy
-    mod_numpy.inject(inj)
-    from duecredit.injections import mod_scipy
-    mod_scipy.inject(inj)
-    from duecredit.injections import mod_sklearn
-    mod_sklearn.inject(inj)
+    for modname in get_modules_for_injection():
+        mod = __import__('duecredit.injections.' + modname, fromlist=["duecredit.injections"])
+        mod.inject(inj)
 
 def test_no_harm_from_deactivate():
     # if we have not activated one -- shouldn't blow if we deactivate it