From 089051f338859072aab625a64ee16e09047c3896 Mon Sep 17 00:00:00 2001 From: guzman-raphael Date: Tue, 22 Sep 2020 18:22:03 -0500 Subject: [PATCH] Update tests and add compiled toolbox. --- DataJoint.mltbx | Bin 70597 -> 70595 bytes LNX-docker-compose.yml | 10 +++++++++- local-docker-compose.yml | 9 +++++++-- tests/Prep.m | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/DataJoint.mltbx b/DataJoint.mltbx index 5a8528bd53794e760923ad025f51a49cfd98d79a..feb1a4996ac5e24495753848b2c3ec2aa34eb2a7 100644 GIT binary patch delta 3868 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 diff --git a/LNX-docker-compose.yml b/LNX-docker-compose.yml index 3ed651e9..3216a4a6 100644 --- a/LNX-docker-compose.yml +++ b/LNX-docker-compose.yml @@ -40,7 +40,15 @@ services: - -c - | matlab -nodisplay -r " - matlab.addons.toolbox.installToolbox('DataJoint.mltbx');\ + websave([tempdir 'GHToolbox.mltbx'],\ + ['https://github.com/datajoint/GHToolbox' \ + '/releases/download/' subsref(webread(['https://api.github.com/repos' \ + '/datajoint/GHToolbox' \ + '/releases/latest']),\ + substruct('.', 'tag_name')) \ + '/GHToolbox.mltbx']);\ + matlab.addons.toolbox.installToolbox([tempdir 'GHToolbox.mltbx']);\ + ghtb.install('DataJoint.mltbx');\ addpath('tests');\ res=run(Main);\ disp(res);\ diff --git a/local-docker-compose.yml b/local-docker-compose.yml index 95288efe..16a379aa 100644 --- a/local-docker-compose.yml +++ b/local-docker-compose.yml @@ -46,12 +46,13 @@ services: ports: - "8888:8888" user: ${MATLAB_UID}:${MATLAB_GID} - # working_dir: /home/muser/notebooks - working_dir: /src + working_dir: /home/muser/notebooks command: - /bin/bash - -c - | + ORIG_DIR=$$(pwd) + cd /src # package into toolbox, and install matlab -nodisplay -r " websave([tempdir 'GHToolbox.mltbx'],\ @@ -79,7 +80,11 @@ services: 'uni', false),\ '.'),\ {'+dj'});\ + matlab.addons.toolbox.installToolbox('DataJoint.mltbx');\ + cd(tempdir);\ + disp(dj.version);\ " + cd "$${ORIG_DIR}" # Copy preferences cp /tmp/matlab.prf /home/muser/.matlab/${MATLAB_VERSION}/matlab.prf # Interactive Jupyter Notebook environment diff --git a/tests/Prep.m b/tests/Prep.m index e936afbe..4cd26e5c 100644 --- a/tests/Prep.m +++ b/tests/Prep.m @@ -30,6 +30,7 @@ function init(testCase) disp('---------------INIT---------------'); clear functions; addpath([testCase.test_root '/test_schemas']); + dj.set('suppressPrompt', true); curr_conn = dj.conn(testCase.CONN_INFO_ROOT.host, ... testCase.CONN_INFO_ROOT.user, testCase.CONN_INFO_ROOT.password,'',true);