Merge branch 'ci-tests'

Author: awilson-kx

.travis.yml

@@ -4,11 +4,33 @@ os:
 - osx
 git:
   depth: 1
+
+before_install:
+- if [ $TRAVIS_OS_NAME = osx ]; then brew outdated pyenv || brew upgrade pyenv ; export PYTHON_CONFIGURE_OPTS="--enable-framework" ; fi
+- PY=$(pyenv install --list | grep -v - |grep -v [a-z]|grep -e  '^  3\.5\..*'|tail -1)
+- pyenv install $PY && pyenv local $PY
 script:
+- if [ $TRAVIS_OS_NAME = osx ]; then pyenv init - > pyenv.init && source pyenv.init ; fi
+- if [ $TRAVIS_OS_NAME = linux ]; then QLIBDIR=l64;OD=$L64; elif [ $TRAVIS_OS_NAME = osx ]; then QLIBDIR=m64;OD=$M64; else echo "unknown OS ('$TRAVIS_OS_NAME')" >&2; exit 1; fi; export QLIBDIR
+- mkdir q && export QHOME=$(pwd)/q && export PATH=$QHOME/$QLIBDIR:$PATH
+- if [[ "x$OD" != "x" ]]; then
+    curl -o q/q.zip -L $OD;
+    unzip -d q q/q.zip;
+  else
+    echo No kdb+;
+  fi
 - make p.so
+- cp [ml]64/p.so q/$QLIBDIR;
 - echo "Preparing version $TRAVIS_BRANCH-$TRAVIS_COMMIT"
 - tar czf embedPy_$TRAVIS_OS_NAME-$TRAVIS_BRANCH.tgz p.q p.k test.q tests [ml]64/p.so LICENSE README.md
 - echo "Packaged as embedPy_$TRAVIS_OS_NAME-$TRAVIS_BRANCH.zip"
+- if [[ "x$QLIC_KC" != "x" ]]; then
+    echo -n $QLIC_KC |base64 --decode > q/kc.lic;
+    pip3 -q install -r tests/requirements.txt;
+    q test.q -q;
+  else
+    echo No kdb+, no tests;
+  fi
 compiler:
 - clang
 deploy:
@@ -25,6 +47,7 @@ jobs:
       sudo: required
       services:
         - docker
+      before_install: skip
       script:
         - docker build -t kxsys/embedpy:latest -f docker/Dockerfile .
         - docker tag kxsys/embedpy:latest kxsys/embedpy:$TRAVIS_BRANCH

README.md

@@ -12,7 +12,7 @@ Please [report issues](https://github.com/KxSystems/embedpy/issues) in this repo
 ## Requirements
 
 - kdb+ >=3.5 64-bit
-- Anaconda Python 3.x
+- Anaconda Python >=3.5.0
 
 ## Installation
 ### Download

makefile

@@ -1,4 +1,3 @@
-QHOME=$(shell echo '-1 getenv`QHOME;'|q -q)
 CFLAGS=-ggdb3 -O2 -Wno-pointer-sign -Wno-parentheses
 ifeq ($(shell uname),Linux)
 LDFLAGS=-fPIC -shared

test.q

@@ -1,6 +1,13 @@
 \l p.q
-.t.n:0
-.t.e:{v:@[value;x;0b];if[not (1b~v)|(::)~v;-1 x;.t.n+:1]}
-system each "l ",/:$[count .z.x;.z.x;"tests/",/:string til`:tests];
-if[.t.n;-2"failed ",string[.t.n]," ",(neg .t.n=1)_"tests";exit 1]
+\d .t
+n:ne:nf:0
+pt:{-2 $[first[x]~`..err;err;fail][x;y]}
+i:{` sv"  ",/:` vs x}
+ge:{v:.Q.trp[x;y;{(`..err;x,"\n",.Q.sbt 1#y)}];n+:1;if[not(1b~v)|(::)~v;pt[v](y;file)]}
+e:ge value;.p.e:ge .p.e
+err:{ne+:1;"ERROR:\n test:\n",i[y 0]," message:\n",i[x 1]," file:\n",i y 1}
+fail:{nf+:1;"FAIL:\n test:\n",i[y 0]," result:\n",i[.Q.s x]," file:\n",i y 1}
+{file::x;system"l ",x}each $[count .z.x;.z.x;"tests/",/:string u@:where(u:til`:tests)like"*.t"];
+tn:{`$(0-x=1)_"tests"}
+if[ne+nf;-2" "sv string(`failed;nf;tn nf;`errored;ne;tn ne;n;`total;tn n);exit 1]
 \\

tests/matplotlib.t

@@ -1,5 +1,7 @@
 / https://github.com/JuliaPy/PyPlot.jl/issues/278
 if[count r:@[read0;`$.p.import[`sys;`:exec_prefix;`],"/qt.conf";""];.p.import[`os;`:putenv;`QT_PLUGIN_PATH;(trim(1+r?"=")_ r:first r where r like"Prefix*"),"/plugins"]]
+p)import matplotlib as mpl
+p)mpl.use('Agg')
 p)import matplotlib.pyplot as plt
 .p.set[`x]x:til[50]%50
 .p.set[`y]sin[4*x*4*atan 1]*exp -5*x

tests/memory.t

@@ -4,12 +4,12 @@ a:til 100;
 .p.set[`bbb]a;
 initmem:pmem[];
 do[10000;.p.set[`bbb]a];
-initmem=pmem[]
+10000>abs initmem-pmem[]
 initmem:pmem[];
 .p.set[`bbb]{.z.s,x+y};
-initmem~{do[100000;.p.set[`bbb]{.z.s,x+y}];pmem[]}[]
+10000>abs initmem-{do[100000;.p.set[`bbb]{.z.s,x+y}];pmem[]}[]
 a:.p.eval"bbb(10,11)";
 initmem:pmem[];
-initmem~{do[100000;.p.eval"bbb(10,11)"];pmem[]}[]
+10000>abs initmem-{do[100000;.p.eval"bbb(10,11)"];pmem[]}[]
 do[10000;.p.q2py 1b];
 do[10000;.p.q2py(::)];

tests/pandas.t

@@ -1,5 +1,9 @@
-df:.p.import[`pandas]`:DataFrame
-qt2df:{df flip x}
-df2qt:{flip{.p.wrap[x][`:values]`}each x[`:to_dict;"series"]`}
-x:([]c1:1 2 3;c2:1.5 2.5 3.5)
-x~df2qt qt2df x
+tab2df:{
+  r:.p.import[`pandas;`:DataFrame.from_dict;flip 0!x][@;cols x];
+  $[count k:keys x;r[`:set_index]k;r]}
+df2tab:{
+  n:$[.p.isinstance[x`:index;.p.import[`pandas]`:RangeIndex]`;0;x[`:index.nlevels]`];
+  n!raze[`$$[n;x[`:index.names]`;0#`],x[`:columns.values]`]xcols flip$[n;x[`:reset_index][];x][`:to_dict;`list]`}
+k:1!`c3`c2`c1 xcols x:([]c1:1 2 3;c2:("one";"two";"three");c3:1.5 2.5 3.5)
+x~df2tab tab2df x
+k~df2tab tab2df k

tests/requirements.txt

@@ -0,0 +1,6 @@
+numpy
+beautifulsoup4
+pandas
+tensorflow
+scipy
+matplotlib