rpy2: simplify initialisation code

f1a0c2a0 · Jérome Perrin · 48eefab5 · f1a0c2a0 · f1a0c2a0
Commit f1a0c2a0 authored Jan 28, 2015 by Jérome Perrin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

component/manpy/buildout.cfg component/manpy/buildout.cfg +1 -4

component/rpy2/buildout.cfg component/rpy2/buildout.cfg +4 -0

No files found.
--- a/component/manpy/buildout.cfg
+++ b/component/manpy/buildout.cfg
@@ -30,8 +30,5 @@ eggs = dream
 environment = manpy-env
 setup-eggs =
  ${scipy:egg}
-  ${rpy2:egg}
 initialization =
-  # rpy2 needs R in $PATH
+  ${rpy2:initialization}
-  import os
-  os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ.get('PATH', '')
--- a/component/rpy2/buildout.cfg
+++ b/component/rpy2/buildout.cfg
@@ -15,3 +15,7 @@ LDFLAGS = -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${r-l
 recipe = zc.recipe.egg:custom
 environment = rpy2_env
 egg = rpy2
+initialization =
+  # rpy2 needs R in $PATH
+  import os
+  os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ.get('PATH', '')