Merge branch 'release/0.12.5'

pygridtools · May 12, 2014 · 39d3b1b · 39d3b1b
2 parents 1fc9e89 + 8a2d30b
commit 39d3b1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/gridmap/job.py b/gridmap/job.py
@@ -639,6 +639,7 @@ def _execute(job):
     Used by _process_jobs_locally
     """
     job.execute()
+    return job.ret
 
 
 def _process_jobs_locally(jobs, max_processes=1):
@@ -663,8 +664,8 @@ def _process_jobs_locally(jobs, max_processes=1):
     else:
         pool = Pool(max_processes)
         result = pool.map(_execute, jobs)
-        for ix, job in enumerate(jobs):
-            job.ret = result[ix]
+        for ret_val, job in zip(result, jobs):
+            job.ret = ret_val
         pool.close()
         pool.join()
 

diff --git a/gridmap/version.py b/gridmap/version.py
@@ -28,5 +28,5 @@
 :organization: ETS
 '''
 
-__version__ = '0.12.4'
+__version__ = '0.12.5'
 VERSION = tuple(int(x) for x in __version__.split('.'))