Merge pull request #40 from elopezaguilera/espe

Run All fixed
KxSystems · Feb 1, 2019 · 0c0f8a9 · 0c0f8a9
2 parents 01a4f12 + a866194
commit 0c0f8a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build/build.bat b/build/build.bat
@@ -17,6 +17,7 @@ if not defined QLIC_KC (
 set PATH=%OP%
 call build\getkdb.bat                                || goto :error
 set PATH=C:\Miniconda3-x64;C:\Miniconda3-x64\Scripts;%PATH%
+conda init cmd.exe
 mkdir embedpy
 cd embedpy
 echo getembedpy"latest" | q ..\build\getembedpy.q -q || goto :error

diff --git a/build/conda_build.bat b/build/conda_build.bat
@@ -4,8 +4,8 @@ set PATH=C:\Miniconda3-x64;C:\Miniconda3-x64\Scripts;%PATH%
 rmdir /S /Q C:\projects\jupyterq\q\
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
 :: install conda build requirements (use version < 3.12 to avoid warning about verify in output file)
-conda install -y "conda-build<3.12"                                       || goto :error
-conda install -y anaconda-client                                          || goto :error
+conda install -y "conda-build<3.12" conda=4.5.11                          || goto :error
+conda install -y anaconda-client conda=4.5.11                             || goto :error
 :: set up requirements from requirements.txt
 python -c "print('|'.join([line.strip('\n')for line in open('requirements.txt')]))" > reqs.txt
 set /P JUPYTERQ_REQS=<reqs.txt

diff --git a/jupyterq_kernel.q b/jupyterq_kernel.q
@@ -84,8 +84,10 @@ if[.z.o like"w*";
  startsrv:{ / x is string port
   stdfd[`stdout`stderr]:npcreate each`$oe:{"\\\\.\\pipe\\jupyterq_",""sv string x,1?.z.p}each`out`err;
   system"start /B cmd /C ",srvcmd[x]," ^>",oe[0]," 2^>",oe 1};
- .z.ts:{stdcb each stdfd;};system"t 50";]; / TODO can we select on named pipe
-if[not .z.o like"w*";startsrv:{system srvcmd x}];
+ .z.ts:{stdcb each stdfd;zcb each key fd2s;};system"t 50";]; / TODO can we select on named pipe
+if[not .z.o like"w*";
+ startsrv:{system srvcmd x};
+ .z.ts:{zcb each key fd2s};system"t 50";];           / workaround until python threads can call q;
 debmsg"loading embedPy";
 \l p.k
 debmsg"loading pyzmq";