Merge pull request #21 from AgriculturalModelExchangeInitiative/master

merge master with release

Author: cyrillemidingoyi

src/pycropml/cyml.py

@@ -198,7 +198,7 @@ def transpile_component(component, package, language):
                 'run_%s' % NAMES[format])
         for format in cymltx_languages
 }
-
+    print('translator :', translator)
     translator[language](component, package)
 
     return 0

src/pycropml/transpiler/antlr_py/parse.py

@@ -31,9 +31,9 @@
 from operator import methodcaller
 from antlr4 import InputStream
 
-languages = ['cs',"bioma", 'f90', 'dssat', 'java', "xml", "cmake", "py", "openalea"]
-gen = {'cs':"csharp","bioma":"csharp", 'f90':"fortran", 'dssat':"fortran", "java":"java", "xml":"xml", "cmake":"cmake", "py":"python", "openalea":"python"}
-NAMES = {'cs':'CSharp','sirius':'CSharp',"bioma":"CSharp", 'f90':'Fortran90', 'dssat':'Fortran90', "java":"Java8", "xml":"XML", "cmake":"CMake", "py":"Python", "openalea":"Python"}
+languages = ['cs','bioma', 'f90', 'dssat', 'java', 'xml', 'cmake', 'py', 'openalea']
+gen = {'cs':'csharp','bioma':'csharp', 'f90':'fortran', 'dssat':'fortran', 'java':'java', 'xml':'xml', 'cmake':'cmake', 'py':'python', 'openalea':'python'}
+NAMES = {'cs':'CSharp','sirius':'CSharp','bioma':'CSharp', 'f90':'Fortran90', 'dssat':'Fortran90', 'java':'Java8', 'xml':'XML', 'cmake':'CMake', 'py':'Python', 'openalea':'Python'}
 
 def langLexerParser(ant):
     generator = {

src/pycropml/transpiler/generators/openaleaGenerator.py

@@ -83,8 +83,11 @@ def generate_wralea(self, mc):
                     'url': 'http://crop2ml.org',
                     'icon': ''}
         metainfo['alias']= [mc.name]
-        #name = mc.name
-        name = ('amei.'+mc.id).lower()
+        
+        split_name = (mc.id).lower().split('.') # remove the name of the workflow
+        names = split_name[:-1] if len(split_name) >1 else split_name
+        names.insert(0, 'amei')
+        name = '.'.join(names).lower()
         wra_path = mc.path.split(os.path.sep)[-1]
         path = Path(os.path.join(mc.path,"src","openalea", wra_path))
         _package = package.UserPackage(name, metainfo, path)

src/pycropml/version.py

@@ -11,7 +11,7 @@
 MINOR = 2
 """(int) Version minor component."""
 
-POST = 2
+POST = 3
 """(int) Version post or bugfix component."""
 
 __version__ = ".".join([str(s) for s in (MAJOR, MINOR, POST)])