Update tests and add compiled toolbox.

guzman-raphael · Sep 22, 2020 · 089051f · 089051f
1 parent 058227c
commit 089051f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/DataJoint.mltbx b/DataJoint.mltbx
diff --git 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
@@ -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
@@ -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);