Commit c460ec6b authored by eric pellegrini's avatar eric pellegrini

Merge branch 'release-1.0'

parents 6cf64aff 26b840c1
Pipeline #1012 passed with stages
in 15 minutes and 1 second
......@@ -4,7 +4,6 @@ stages:
- deploy
# trusty pipeline
build:trusty:
stage: build
script:
......
......@@ -11,10 +11,16 @@ ROUGE="\\033[1;31m"
BLEU="\\033[1;34m"
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [ "${CI_BUILD_REF_NAME}" == "develop" ]
if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
then
if [ -n "${WEEKLY_BUILD}" ]
then
VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi
export VERSION_NAME
##Select the build target
......
......@@ -17,10 +17,9 @@ if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
then
if [ -n "${WEEKLY_BUILD}" ]
then
VERSION_NAME=${VERSION_NAME}-"weekly-build-"`date +%Y-%m-%d`
else
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi
##Select the build target
......
......@@ -13,11 +13,18 @@ else
fi
VERSION_NAME=`sed -n 's/__version__.*=.*\"\(.*\)\"/\1/p' MDANSE/__pkginfo__.py`
if [ "${CI_BUILD_REF_NAME}" == "develop" ]
if [[ ${CI_BUILD_REF_NAME} =~ develop ]]
then
if [ -n "${WEEKLY_BUILD}" ]
then
VERSION_NAME=${VERSION_NAME}-"weekly-"`date +%Y-%m-%d`
fi
VERSION_NAME=${VERSION_NAME}-`git rev-parse --short HEAD`
fi
##Which versions of external programs to use
PYTHON_VERSION=2.7.6
......
test
version 1.0:
- first release
#MDANSE : Molecular Dynamics Analysis for Neutron Scattering Experiments
#------------------------------------------------------------------------------------------
#Copyright (C)
#2015- Eric C. Pellegrini Institut Laue-Langevin
#BP 156
#6, rue Jules Horowitz
#38042 Grenoble Cedex 9
#France
#pellegrini[at]ill.fr
#goret[at]ill.fr
#aoun[at]ill.fr
#
#This library is free software; you can redistribute it and/or
#modify it under the terms of the GNU Lesser General Public
#License as published by the Free Software Foundation; either
#version 2.1 of the License, or (at your option) any later version.
#
#This library is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
#Lesser General Public License for more details.
#
#You should have received a copy of the GNU Lesser General Public
#License along with this library; if not, write to the Free Software
#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
'''
Created on Oct 04, 2016
:author: Eric C. Pellegrini
'''
import wx
from MDANSE.Framework.Plugins.Plotter.PlotterPlugin import PlotterFrame
from MDANSE.GUI.ElementsDatabaseEditor import ElementsDatabaseEditor
from MDANSE.GUI.MainFrame import MainFrame
from MDANSE.GUI.PeriodicTableViewer import PeriodicTableViewer
from MDANSE.GUI.UserDefinitionViewer import UserDefinitionViewer
class ElementsDatabaseEditorApp(wx.App):
def OnInit(self):
f = ElementsDatabaseEditor(None)
f.Show()
self.SetTopWindow(f)
return True
class MainApplication(wx.App):
def OnInit(self):
f = MainFrame(None)
f.Show()
return True
class PeriodicTableViewerApp(wx.App):
def OnInit(self):
f = PeriodicTableViewer(None)
f.Show()
self.SetTopWindow(f)
return True
class PlotterApp(wx.App):
def OnInit(self):
f = PlotterFrame(None)
f.Show()
return True
class UserDefinitionViewerApp(wx.App):
def OnInit(self):
f = UserDefinitionViewer(None)
self.SetTopWindow(f)
f.Show()
return True
#!python
import wx
from MDANSE.GUI.ElementsDatabaseEditor import ElementsDatabaseEditor
class ElementsDatabaseEditorApp(wx.App):
def OnInit(self):
f = ElementsDatabaseEditor(None)
f.Show()
self.SetTopWindow(f)
return True
if __name__ == "__main__":
from MDANSE.GUI.Apps import ElementsDatabaseEditorApp
app = ElementsDatabaseEditorApp(None)
app.MainLoop()
#!/usr/bin/env python
import wx
from MDANSE.GUI.MainFrame import MainFrame
class MainApplication(wx.App):
def OnInit(self):
f = MainFrame(None)
f.Show()
return True
if __name__ == "__main__":
from MDANSE.GUI.Apps import MainApplication
app = MainApplication(None)
app.MainLoop()
......
#!python
import wx
from MDANSE.GUI.PeriodicTableViewer import PeriodicTableViewer
class PeriodicTableViewerApp(wx.App):
def OnInit(self):
f = PeriodicTableViewer(None)
f.Show()
self.SetTopWindow(f)
return True
if __name__ == "__main__":
from MDANSE.GUI.Apps import PeriodicTableViewerApp
app = PeriodicTableViewerApp(None)
app.MainLoop()
#!python
import wx
from MDANSE.Framework.Plugins.Plotter.PlotterPlugin import PlotterFrame
class Plotter(wx.App):
def OnInit(self):
f = PlotterFrame(None)
f.Show()
return True
if __name__ == "__main__":
app = Plotter()
from MDANSE.GUI.Apps import PlotterApp
app = PlotterApp()
app.MainLoop()
\ No newline at end of file
#!python
import wx
from MDANSE.GUI.UserDefinitionViewer import UserDefinitionViewer
class UserDefinitionViewerApp(wx.App):
def OnInit(self):
f = UserDefinitionViewer(None)
self.SetTopWindow(f)
f.Show()
return True
if __name__ == "__main__":
from MDANSE.GUI.Apps import UserDefinitionViewerApp
app = UserDefinitionViewerApp(None)
app.MainLoop()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment