Merge branch 'release-1.0.5'

MDANSE/Data/ElementsDatabase.py

@@ -35,7 +35,6 @@ import copy
 import csv
 import numbers
 import os
-import pkg_resources
 import sys
 import xml.etree.ElementTree as etree
 
@@ -113,15 +112,8 @@ class ElementsDatabase(object):
     
     __metaclass__ = Singleton
     
-    try:  
-        _DEFAULT_DATABASE = pkg_resources.resource_filename(__name__,"elements_database.csv")
-    except:  
-        if hasattr(sys,'frozen'):
-            _DEFAULT_DATABASE = os.path.join(os.path.dirname(sys.executable),"elements_database.csv")
-        else:
-            raise
-
-
+    _DEFAULT_DATABASE = os.path.join(os.path.dirname(__file__),"elements_database.csv")
+    
     # The user path
     _USER_DATABASE = os.path.join(PLATFORM.application_directory(), "elements_database.csv")
     

MDANSE/GUI/Icons/__init__.py

 import os
-import pkg_resources
 import sys
 
 import wx
@@ -14,13 +13,7 @@ class Icons(object):
 
         name, width, height = item
 
-        try:  
-            icon = pkg_resources.resource_filename(__name__,name+".png")
-        except:  
-            if hasattr(sys,'frozen'):
-                icon = os.path.join(os.path.dirname(sys.executable),name+".png")
-            else:
-                raise
+        icon = os.path.join(os.path.dirname(__file__),name+".png")
 
         image = wx.ImageFromBitmap(wx.Bitmap(icon))
         image = image.Scale(width, height, wx.IMAGE_QUALITY_HIGH)

MDANSE/GUI/JobControllerPanel.py

@@ -75,6 +75,8 @@ class JobController(threading.Thread):
         '''
         
         threading.Thread.__init__(self)
+
+        self.setDaemon(True)
         
         # The wx object related to this thread
         self._window = window
@@ -366,4 +368,4 @@ if __name__ == "__main__":
     
     
     
-    
\ No newline at end of file
+    

MDANSE/__pkginfo__.py

-__version__ = "1.0.4"
+__version__ = "1.0.5"
 
-__date__ = "25-01-2017"
+__date__ = "06-03-2017"
 
 __author__ = "Eric Pellegrini"