diff --git a/DataJoint.mltbx b/DataJoint.mltbx index 5a8528bd..feb1a499 100644 Binary files a/DataJoint.mltbx and b/DataJoint.mltbx differ 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);