Merge pull request #31 from AurelienBesnier/master

Lifting restriction on python version

conda/meta.yaml

@@ -20,7 +20,7 @@ requirements:
     - openalea.deploy
     - six
   run:
-    - python  <3.11
+    - python  x.x
     - ipykernel
     - configobj
     - six

src/openalea/core/threadmanager.py

@@ -42,10 +42,9 @@ def __init__(self, num_thread=NUM_THREAD):
 
         self.thread_list = []
 
-
         for i in range(num_thread):
             t = Thread(target=worker, args=(self.queue, ))
-            t.setDaemon(True)
+            t.daemon = True
             t.start()
 
             self.thread_list.append(t)
@@ -62,7 +61,7 @@ def add_task(self, func, params):
     def clear(self):
         """ clear pending task """
 
-        while(not self.queue.empty()):
+        while not self.queue.empty():
             self.queue.get()
 
 

src/openalea/core/version.py

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

test/test_export.py

@@ -9,18 +9,21 @@
 import os
 from io import open
 
+
 def test_export():
     """test export"""
-    d= {}
-    with open("catalog.py") as f:
-        code = compile(f.read(), "catalog.py", 'exec')
+    d = {}
+    file_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                             "catalog.py")
+    with open(file_path) as f:
+        code = compile(f.read(), file_path, 'exec')
         exec(code, globals(), d)
-    #execfile('catalog.py', globals(), d)
+    # execfile('catalog.py', globals(), d)
     pkg = d['pkg']
-    plus_node= pkg['plus'].instantiate()
-    float_node= pkg['float'].instantiate()
-    int_node= pkg['int'].instantiate()
-    string_node= pkg['string'].instantiate()
+    plus_node = pkg['plus'].instantiate()
+    float_node = pkg['float'].instantiate()
+    int_node = pkg['int'].instantiate()
+    string_node = pkg['string'].instantiate()
     pm = PackageManager()
     pm.add_package(pkg)