Updating conda deps

Author: AurelienBesnier

conda/meta.yaml

@@ -30,10 +30,6 @@ requirements:
 
   run:
     - python
-    - openalea.mtg
-    - openalea.plantgl
-    - alinea.caribu
-    - alinea.astk
     {% for dep in deps + conda_deps %}
     - {{ dep }}
     {% endfor %}

pyproject.toml

@@ -64,3 +64,17 @@ where = ["src"]
 
 [tool.setuptools.package-data]
 "hydroshoot_data" = ["*"]
+
+# not used yet by pip, but by meta.yaml
+[tool.conda-environment]
+channels = [
+  "openalea3",
+  "conda-forge",
+]
+# deps not available in pip with conda name
+dependencies = [
+  "openalea.mtg",
+  "openalea.plantgl",
+  "alinea.caribu",
+  "openalea.astk",
+]

src/hydroshoot/energy.py

@@ -10,7 +10,7 @@
 
 from math import pi
 
-import alinea.astk.icosphere as ico
+import openalea.astk.icosphere as ico
 import openalea.plantgl.all as pgl
 from alinea.caribu.CaribuScene import CaribuScene
 from alinea.caribu.sky_tools import turtle

src/hydroshoot/irradiance.py

@@ -6,7 +6,7 @@
 TODO: plug to the standard interface of Caribu module.
 """
 
-import alinea.astk.icosphere as ico
+import openalea.astk.icosphere as ico
 from alinea.caribu.CaribuScene import CaribuScene
 from alinea.caribu.sky_tools import turtle, Gensun, GetLightsSun
 from alinea.caribu.sky_tools.spitters_horaire import RdRsH