Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MDANSE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
MDANSE
Commits
8edc4ce5
Commit
8edc4ce5
authored
Aug 07, 2018
by
eric pellegrini
Committed by
Remi Perenon
Aug 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated files with MDANSE to Src renaming
parent
a2b9347e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
15 deletions
+15
-15
BuildServer/Unix/Debian/deploy.sh
BuildServer/Unix/Debian/deploy.sh
+1
-1
BuildServer/Unix/MacOS/build.py
BuildServer/Unix/MacOS/build.py
+1
-1
BuildServer/Unix/setup_ci.sh
BuildServer/Unix/setup_ci.sh
+1
-1
BuildServer/Windows/setup_ci.bat
BuildServer/Windows/setup_ci.bat
+5
-5
Doc/coverage.sh
Doc/coverage.sh
+2
-2
MANIFEST.in
MANIFEST.in
+3
-3
bump_version.sh
bump_version.sh
+2
-2
No files found.
BuildServer/Unix/Debian/deploy.sh
View file @
8edc4ce5
...
...
@@ -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
...
...
BuildServer/Unix/MacOS/build.py
View file @
8edc4ce5
...
...
@@ -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'
,
...
...
BuildServer/Unix/setup_ci.sh
View file @
8edc4ce5
...
...
@@ -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
}
...
...
BuildServer/Windows/setup_ci.bat
View file @
8edc4ce5
...
...
@@ -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
)
)
Doc/coverage.sh
View file @
8edc4ce5
#!/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/
*
MANIFEST.in
View file @
8edc4ce5
...
...
@@ -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 *
...
...
bump_version.sh
View file @
8edc4ce5
...
...
@@ -4,8 +4,8 @@ VERSION=$1
# Update version number to python source code (will appear in "About..." dialog)
# see http://stackoverflow.com/questions/7648328/getting-sed-error
sed
-i
"s/.*__version__.*/__version__ =
\"
${
VERSION
}
\"
/"
MDANSE
/__pkginfo__.py
sed
-i
"s/.*__version__.*/__version__ =
\"
${
VERSION
}
\"
/"
Src
/__pkginfo__.py
# Update the date of the version
sed
-i
"s/.*__date__.*/__date__ =
\"
`
date
+
"%d-%m-%Y"
`
\"
/"
MDANSE
/__pkginfo__.py
sed
-i
"s/.*__date__.*/__date__ =
\"
`
date
+
"%d-%m-%Y"
`
\"
/"
Src
/__pkginfo__.py
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment