Merge branch 'release-1.0.6'

BuildServer/Darwin/Scripts/run_build.sh

@@ -17,8 +17,8 @@ BUILD_TARGET=darwin
 echo -e "$BLEU""Getting last MDANSE revision" "$NORMAL"
 
 # Get revision number from git (without trailing newline)
-REV_NUMBER=$(git rev-list --count HEAD)
-echo -e "$BLEU""Revision number = ${REV_NUMBER}" "$NORMAL"
+COMMIT_ID=$(git rev-parse --long HEAD)
+echo -e "$BLEU""Commit id = ${COMMIT_ID}" "$NORMAL"
 
 # Now build last version and install it in our homebrewed python
 echo -e "$BLEU""Building MDANSE" "$NORMAL"

BuildServer/Darwin/Scripts/run_deploy.sh

 #!/bin/bash
 
-# This script is to package the nMolDyn package for Mac OS X
+# This script is to package the MDANSE package for Mac OS X
 
 #############################
 # CONFIGURATION
@@ -10,6 +10,10 @@
 ROUGE="\\033[1;31m"
 BLEU="\\033[1;34m"
 
+# Update the __pkginfo__ file with the current commit 
+COMMIT_ID=$(git rev-parse --long HEAD)
+sed -i 's/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/' MDANSE/__pkginfo__.py
+
 VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
 
 if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
@@ -18,7 +22,7 @@ then
     then
         VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
     fi
-    VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
+    VERSION_NAME=${VERSION_NAME}-${COMMIT_ID}
 fi
 
 export VERSION_NAME

BuildServer/Debian/run_build.sh

@@ -14,8 +14,8 @@ cd
 cd $CI_PROJECT_DIR
 
 # Get revision number from git (without trailing newline)
-REV_NUMBER=$(git rev-list --count HEAD)
-echo -e "$BLEU""Revision number = ${REV_NUMBER}<--" "$NORMAL"
+COMMIT_ID=$(git rev-parse --long HEAD)
+echo -e "$BLEU""Commit id = ${COMMIT_ID}<--" "$NORMAL"
 
 # Now build last version
 echo "$BLEU""Building MDANSE" "$NORMAL"

BuildServer/Debian/run_deploy.sh

@@ -11,6 +11,10 @@ export DISTRO=$2
 ROUGE="\\033[1;31m"
 BLEU="\\033[1;34m"
 
+# Update the __pkginfo__ file with the current commit 
+COMMIT_ID=$(git rev-parse --long HEAD)
+sed -i 's/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/' MDANSE/__pkginfo__.py
+
 VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
 
 if [[ ${CI_BUILD_REF_NAME} =~ develop ]]

BuildServer/Windows/run_build.sh

@@ -195,8 +195,8 @@ rm pythonlog.txt
 cd ${CI_PROJECT_DIR}
 
 # Get revision number from GIT
-REV_NUMBER=$(git rev-list --count HEAD)
-echo "Revision number is $REV_NUMBER"
+COMMIT_ID=$(git rev-parse --long HEAD)
+echo "Commit id ${COMMIT_ID}"
 
 # setup the environment for a visual studio build of MDANSE using microsoft SDK 7.0 and build MDANSE
 echo "MDANSE setup and build"

BuildServer/Windows/run_deploy.sh

@@ -12,6 +12,10 @@ else
     BUILD_TARGET=$1
 fi
 
+# Update the __pkginfo__ file with the current commit 
+COMMIT_ID=$(git rev-parse --long HEAD)
+sed -i 's/.*__commit__.*/__commit__ = \"${COMMIT_ID}\"/' MDANSE/__pkginfo__.py
+
 VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
 
 if [[ ${CI_BUILD_REF_NAME} =~ develop ]]

CHANGELOG

+version 1.0.6
+----------------
+* the bug report button opens now the default mail client for sending bug report
+* the __pkginfo__ is now updated with the commit id when MDANSE is built
+
+version 1.0.5
+----------------
+* bug fix on macos when closing the application from the Finder: the jobs manager thread was not properly closed
+* the macos dmg file was corrupted due to the use of pkg_resources module for storing resources
+
 version 1.0.4.rc4
 ----------------
 * bug fix in coordination number analysis: some pairs were never taken into account

MDANSE/GUI/MainFrame.py

@@ -39,7 +39,7 @@ import wx
 import wx.aui as aui
  
 from MDANSE import LOGGER, PLATFORM, REGISTRY
-from MDANSE.__pkginfo__ import __version__
+from MDANSE.__pkginfo__ import __commit__, __version__
 from MDANSE.Framework.Jobs.Converter import Converter
 from MDANSE.GUI.ControllerPanel import ControllerPanel
 from MDANSE.GUI.DataController import DATA_CONTROLLER
@@ -233,7 +233,7 @@ class MainFrame(wx.Frame):
     def on_about(self, event=None):
                                 
         about_str = \
-"""MDANSE version %s.
+"""MDANSE version %s (commit %s).
 
 An interactive program for analyzing Molecular Dynamics simulations.
 
@@ -241,33 +241,15 @@ Authors:
 \tEric C. Pellegrini
 \tGael Goret
 \tBachir Aoun
-""" % (__version__,)
+""" % (__version__,__commit__)
         
         d = wx.MessageDialog(self, about_str, 'About', style=wx.OK|wx.ICON_INFORMATION)
         d.ShowModal()
         d.Destroy()
 
     def on_bug_report(self, event=None):
-        report_str = \
-"""The version 1 of MDANSE is currently under testing.
-In order to facilitate the integration of new features and bug fixes, please send pull request to: 
 
-https://github.com/mdanseproject/MDANSE/tree/master/MDANSE
-
-for any other request, please send an email to:
-
-\tpellegrini@ill.fr
-\tgonzalezm@ill.fr
-\tjohnson@ill.fr
-
-or directly to the MDANSE mailing list:
-
-\tmdanse@ill.fr
-"""
-        
-        d = wx.MessageDialog(self, report_str, 'Bug report', style=wx.OK|wx.ICON_INFORMATION)
-        d.ShowModal()
-        d.Destroy()
+        webbrowser.open("mailto:mdanse@ill.fr?subject=MDANSE query")        
 
     def on_simple_help(self,event):
 
@@ -439,7 +421,7 @@ or directly to the MDANSE mailing list:
         
 if __name__ == "__main__":
     
-    app = wx.App(False)
-    f = MainFrame(None)
-    f.Show()
+    from MDANSE.GUI.Apps import MainApplication
+    
+    app = MainApplication(None)
     app.MainLoop()

MDANSE/__pkginfo__.py

-__version__ = "1.0.5"
+__version__ = "1.0.6"
 
-__date__ = "06-03-2017"
+__date__ = "07-03-2017"
 
 __author__ = "Eric Pellegrini"
 
+__commit__ = "undefined"
+
+