Skip to content

Commit b767079

Browse files
authored
Merge pull request #12 from opencobra/develop
Regular merge of develop
2 parents 21a2724 + 8681281 commit b767079

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3155
-494
lines changed

.travis.yml renamed to .artenolis.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ script:
4848
- cd $CURRENT_DIR;
4949

5050
# launch the tests
51-
- sh ./runtests.sh;
51+
- sh ./.artenolis/runtests.sh;
5252

5353
- cd ~/fork-MATLAB.devTools.CI;
5454
- git reset --hard origin/develop;
@@ -58,4 +58,8 @@ after_success:
5858
# remove the cloned fork-repo
5959
- if [ "$MATLAB_VER" == "R2016b" ]; then
6060
bash <(curl -s https://codecov.io/bash) -f "!*.lst";
61+
export PATH="/home/sbg-jenkins/.local/bin":$PATH;
62+
cd $CURRENT_DIR;
63+
pip install --upgrade --user -r docs/requirements.txt;
64+
python -c "from documenter.deploy import Documentation; doc = Documentation('github.com/opencobra/MATLAB.devTools', ci='jenkins'); doc.deploy()";
6165
fi

.artenolis/runtests.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
cd ./test
3+
/mnt/prince-data/MATLAB/$MATLAB_VER/bin/./matlab -nodesktop -nosplash -r "launchTests;" < inputCI.txt;
4+
CODE=$?
5+
exit $CODE

.gitignore

+39-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,40 @@
1+
build
2+
*.*~
13
.DS_Store
2-
Thumbs.db
4+
.AppleDouble
5+
.LSOverride
6+
7+
# Icon must end with two \r
8+
Icon
9+
10+
# Thumbnails
11+
._*
12+
13+
# Files that might appear in the root of a volume
14+
.DocumentRevisions-V100
15+
.fseventsd
16+
.Spotlight-V100
17+
.TemporaryItems
18+
.Trashes
19+
.VolumeIcon.icns
20+
.com.apple.timemachine.donotpresent
21+
22+
# Directories potentially created on remote AFP share
23+
.AppleDB
24+
.AppleDesktop
25+
Network Trash Folder
26+
Temporary Items
27+
.apdisk
28+
29+
# Windows shortcuts
30+
*.lnk
31+
32+
# Dump file
33+
*.stackdump
34+
35+
# Folder config file
36+
[Dd]esktop.ini
37+
38+
# Documentation related files
39+
docs/source/_static/json/functions.json
40+
*.pyc

FAQ.md

-52
This file was deleted.

PREREQUISITES.md

-78
This file was deleted.

README.md

-80
This file was deleted.

0 commit comments

Comments
 (0)