The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit b8396007 authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'build-moved_MDANSE_package_to_Src' into 'develop'

Build moved mdanse package to src

See merge request !36
parents 17010329 e15ee395
Pipeline #4346 passed with stages
in 22 minutes and 57 seconds
......@@ -35,7 +35,7 @@ cp ${SCRIPT_DIR}/Resources/MDANSE.desktop ${DEBIAN_APP_DIR}/
# Build the /usr/share/pixmaps directory inside the debian root directory and copy the mdanse icon file inside
DEBIAN_PIXMAPS_DIR=${DEBIAN_ROOT_DIR}/usr/share/pixmaps
mkdir -p ${DEBIAN_PIXMAPS_DIR}
cp ${CI_PROJECT_DIR}/MDANSE/GUI/Icons/mdanse.png ${DEBIAN_PIXMAPS_DIR}/
cp ${CI_PROJECT_DIR}/Src/GUI/Icons/mdanse.png ${DEBIAN_PIXMAPS_DIR}/
# Build the /usr/local/bin directory inside the debian root directory and copy the mdanse scripts inside
DEBIAN_BIN_DIR=${DEBIAN_ROOT_DIR}/usr/local/bin
......
......@@ -20,7 +20,7 @@ if sys.platform.startswith('darwin'):
}
OPTIONS = {
'argv_emulation': False,# has to be False otherwise triggers problems with wxPython which lose some events that are captured by OS
'iconfile': os.path.join(project_dir,'MDANSE','GUI','Icons','mdanse.icns'),
'iconfile': os.path.join(project_dir,'Src','GUI','Icons','mdanse.icns'),
'excludes': 'PyQt4',
'matplotlib_backends': '-',
'optimize': '1',
......
......@@ -35,7 +35,7 @@ fi
echo -e "${BLUE}""Commit id = ${CI_COMMIT_ID}""${NORMAL}"
echo -e "${BLUE}""Branch name = ${CI_COMMIT_REF_NAME}""${NORMAL}"
PKG_INFO=${CI_PROJECT_DIR}/MDANSE/__pkginfo__.py
PKG_INFO=${CI_PROJECT_DIR}/Src/__pkginfo__.py
# Update the __pkginfo__ file with the current commit
"${SED_I_COMMAND[@]}" "s/.*__commit__.*/__commit__ = \"${CI_COMMIT_ID}\"/" ${PKG_INFO}
......
......@@ -7,23 +7,23 @@ rem To understand this syntax "set cmd=...... for /F %%ii ......", see https://s
rem Update the __pkginfo__ file with the current commit
echo "Commit id %MDANSE_GIT_CURRENT_COMMIT%"
echo "Branch name %MDANSE_GIT_BRANCH_NAME%"
sed -i "s/.*__commit__.*/__commit__ = \"%MDANSE_GIT_CURRENT_COMMIT%\"/" MDANSE/__pkginfo__.py
sed -i "s/.*__commit__.*/__commit__ = \"%MDANSE_GIT_CURRENT_COMMIT%\"/" Src/__pkginfo__.py
rem Get MDANSE version
set cmd="sed -n "s/__version__.*=.*\"\(.*\)\"/\1/p" MDANSE/__pkginfo__.py"
set cmd="sed -n "s/__version__.*=.*\"\(.*\)\"/\1/p" Src/__pkginfo__.py"
for /F %%i in (' %cmd% ') do set MDANSE_VERSION=%%i
rem Check if branch is master, tag as draft otherwise
if "%MDANSE_GIT_BRANCH_NAME%" == "master" (
set VERSION_NAME=%MDANSE_VERSION%
sed -i "s/.*__beta__.*/__beta__ = None/" MDANSE/__pkginfo__.py
sed -i "s/.*__beta__.*/__beta__ = None/" Src/__pkginfo__.py
) else (
rem Check if branch is release*
if "%MDANSE_GIT_BRANCH_NAME:~0,7%" == "release" (
set VERSION_NAME=%MDANSE_VERSION%-rc-%MDANSE_GIT_CURRENT_COMMIT%
sed -i "s/.*__beta__.*/__beta__ = \"rc\"/" MDANSE/__pkginfo__.py
sed -i "s/.*__beta__.*/__beta__ = \"rc\"/" Src/__pkginfo__.py
) else (
set VERSION_NAME=%MDANSE_VERSION%-beta-%MDANSE_GIT_CURRENT_COMMIT%
sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" MDANSE/__pkginfo__.py
sed -i "s/.*__beta__.*/__beta__ = \"beta\"/" Src/__pkginfo__.py
)
)
......@@ -14,6 +14,7 @@ version 1.2.0
* FIXED issue #20 Opening the theoretical help on MacOS is now OK
* FIXED issue #18 The items of the checkable combobox are now checkable on Windows
* FIXED issue #16 The file filter combo box is now available from the input file dialog on MacOS
* CHANGED (internal) issue #34 source code is moved to Src/ instead of MDANSE/
* CHANGED (internal) issue #33 The macOS dmg is now ligher than before
* CHANGED (internal) MDANSE is now built with system python (2.7.10)
......
#!/bin/sh
cd ../Tests/
coverage run --source=../MDANSE/ ../Tests/AllTests.py
coverage html --omit=../MDANSE/Externals/*,../MDANSE/GUI/*,../MDANSE/Framework/Plugins/*,../MDANSE/Framework/ConfiguratorWidgets/*
coverage run --source=../Src/ ../Tests/AllTests.py
coverage html --omit=../Src/Externals/*,../Src/GUI/*,../Src/Framework/Plugins/*,../Src/Framework/ConfiguratorWidgets/*
......@@ -3,11 +3,11 @@ include LICENCE
recursive-include Extensions/qhull_lib *.h *c *.pxd
recursive-include MDANSE/GUI/Resources/Icons *.png
recursive-include Src/GUI/Resources/Icons *.png
include MDANSE/Data/elements_database.csv
include Src/Data/elements_database.csv
include MDANSE/Data/Atoms/*
include Src/Data/Atoms/*
recursive-include Data *
......
#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 Mar 26, 2015
:author: Eric C. Pellegrini
'''
import sys
sys.setrecursionlimit(10000)
import os
import warnings
warnings.filterwarnings("ignore")
from __pkginfo__ import __version__, __author__, __date__
from MDANSE.Logging.Logger import LOGGER
from MDANSE.Core.Platform import PLATFORM
from MDANSE.Core.ClassRegistry import REGISTRY
from MDANSE.Data.ElementsDatabase import ELEMENTS
import MDANSE.Framework
PLATFORM.create_directory(PLATFORM.macros_directory())
# MMTK imports.
from MMTK import Database
# The default database is still the MMTK one
Database.path.append(os.path.join(PLATFORM.package_directory(), 'Data'))
Database.path.append(os.path.join(PLATFORM.application_directory(), 'mmtk_database'))
# Update the database with user defined atom entries
import glob
userDefinedAtoms = glob.glob(os.path.join(PLATFORM.application_directory(), 'mmtk_database','Atoms','*'))
for atomFile in userDefinedAtoms:
atomName = os.path.basename(atomFile)
if not ELEMENTS.has_element(atomName):
ELEMENTS.add_element(atomName)
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