Merge branch 'rel1.3'

awilson-kx · awilson-kx · commit 9f79bd591dbc · 2018-08-22T11:01:48.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+stage: standalone
 language: c
 os:
 - linux
@@ -21,13 +22,11 @@ script:
   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;
+    q test.q -s 4 -q;
   else
     echo No kdb+, no tests;
   fi
@@ -43,7 +42,9 @@ deploy:
     tags: true
 jobs:
   include:
-    - stage: docker
+    - stage: deploy_target
+      env:
+        - TARGET=docker
       sudo: required
       services:
         - docker
@@ -56,9 +57,45 @@ jobs:
         script:
           - echo $DOCKER_PASSWORD|docker login --username $DOCKER_USERNAME --password-stdin && docker push kxsys/embedpy:latest && docker push kxsys/embedpy:$TRAVIS_BRANCH
         skip_cleanup: true
+        on:
+          tags: true
+          condition: $TRAVIS_BRANCH =~ ^[0-9]+\. && $TRAVIS_REPOSLUG = KxSystems/embedPy
+    - &conda_build
+      stage: deploy_target
+      env:
+        - TARGET=conda
+      os:
+        - linux
+      before_install: skip
+      install:
+        - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+           wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+          else
+           wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
+          fi
+        - bash miniconda.sh -b -p $HOME/miniconda
+        - export PATH="$HOME/miniconda/bin:$PATH"
+        - hash -r
+        - conda config --set always_yes yes --set changeps1 no
+        - conda install -q "conda-build<3.12"
+      script:
+        - if [ $TRAVIS_OS_NAME = linux ]; then QLIBDIR=l64; elif [ $TRAVIS_OS_NAME = osx ]; then QLIBDIR=m64; fi; export QLIBDIR
+        - if [[ "x$QLIC_KC" != "x" ]]; then mkdir -p q; echo -n $QLIC_KC |base64 --decode > q/kc.lic; export QLIC=$(pwd)/q; fi
+        - export EMBEDPY_VERSION=$TRAVIS_BRANCH
+        - conda build conda-recipe --output -c kx > packagenames.txt
+        - conda build -c kx conda-recipe --no-long-test-prefix
+      deploy:
+        provider: script
+        script:
+          - build/anaconda_upload.sh
+        skip_cleanup: true
         on:
           tags: true
           condition: $TRAVIS_BRANCH =~ ^[0-9]+\.
+    - <<: *conda_build
+      os:
+        - osx
+
 notifications:
   slack:
     secure: "MR5icOywJJSFy7gnxeNXACN2nKiHniVgX1myiF+H9U4wsW6+2BHzPMcmy3FIUjL3Tb+PcAfq7+8RHerAx/XEB7nsVJsu9TyCjYWgaqx5Z9WNIDcjQh4wnFurhlzqrwF4gjelY+wxdffpsKUVaP+fermWbqHvv1aPPk4l3xEonXZ5J5uNkPTPufILzpx2cTxWg08o6PhvgjTrombs+9rGxahU8cfUSwTVuPCcPtOy70kcaowFfrU2kWzQk88NM5d/TVZdkOmGhLqVWSvRgaLXFkGYwRWatT7divlXX2evYwdYib++RUUhxDGZwJjdFCbGDNjrMyBbJOrCkndxLSATd6gN76dWuWsVV49K4YB0Mw5uFJFt6J0TnbkJC5Zsl9i6vik7m3anuIPOeAI54/wtlCvMeIpt2eQCPMy7xXu2hXNUR4ofM4yaVjKz69b5JIZ1o3vBxPQxAqIYggqPsTaLJM4vLpZlncnViBkfO/La5V9sJNQy3IyLSlEKry3giYfo8wbHT3PLn1xG7HW2DJ7hRn19yzTkCCNfaSzvq8YlSQvjNlPCO566ykYYG6SzG/NnbDqJAqydhpFuNC7ZB5dPuAOoDANCGs4gtfYKia+ZVxKYn25Y52vdi34L5TO83BUrsQWgytb0J6a4jDe3PWLVFSP7XLiy4h8Tyv76+Hm4lHk="
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,23 +8,15 @@ platform: x64
 build_script:
 - cmd: >-
 
-    curl -fsSL -o k.h https://github.com/KxSystems/kdb/raw/master/c/c/k.h 
+    call build\build.bat
 
-    curl -fsSL -o q.lib https://github.com/KxSystems/kdb/raw/master/w64/q.lib
-
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-
-    mkdir w64 
-
-    cl /LD /DKXVER=3 /Fep.dll /O2 py.c q.lib
-
-    move p.dll w64 
 after_build:
 - cmd: >-
 
-    if "%APPVEYOR_REPO_TAG%"=="true" ( 7z a embedPy_windows-%APPVEYOR_REPO_TAG_NAME%.zip p.q p.k test.q tests w64/p.dll LICENSE README.md && appveyor PushArtifact embedPy_windows-%APPVEYOR_REPO_TAG_NAME%.zip )
+    call build\package.bat
+
+    call build\anaconda_upload.bat
 
-    if "%APPVEYOR_REPO_TAG%"=="false" ( 7z a embedPy_windows-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_VERSION%.zip p.q p.k test.q tests w64/p.dll LICENSE README.md && appveyor PushArtifact embedPy_windows-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_VERSION%.zip )
 deploy:
  release: $(appveyor_repo_tag_name)
  provider: GitHub
diff --git a/build/anaconda_upload.bat b/build/anaconda_upload.bat
@@ -0,0 +1,5 @@
+if "%APPVEYOR_REPO_TAG%"=="true" (
+ for /F "tokens=*" %%P in (packagenames.txt) do anaconda -t %CONDATOKEN% upload -l dev %%P || goto :error
+)
+:error
+exit /b %errorLevel%
diff --git a/build/anaconda_upload.sh b/build/anaconda_upload.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+conda install -q -y anaconda-client
+for pack in $(cat packagenames.txt)
+do
+ anaconda -t $CONDATOKEN upload -l dev $pack
+done
+
diff --git a/build/build.bat b/build/build.bat
@@ -0,0 +1,27 @@
+:: Standalone build
+curl -fsSL -o k.h https://github.com/KxSystems/kdb/raw/master/c/c/k.h     || goto :error
+curl -fsSL -o q.lib https://github.com/KxSystems/kdb/raw/master/w64/q.lib || goto :error
+::keep original PATH, PATH may get too long otherwise
+set OP=%PATH%
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+mkdir w64
+cl /LD /DKXVER=3 /Fep.dll /O2 py.c q.lib                                  || goto :error
+move p.dll w64
+set PATH=%OP%
+
+:: Conda build
+set PATH=C:\Miniconda3-x64;C:\Miniconda3-x64\Scripts;%PATH%
+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
+:: set up kdb+ if available
+if defined QLIC_KC ( echo|set /P=%QLIC_KC% > kc.lic.enc & certutil -decode kc.lic.enc kc.lic & set QLIC=%CD%)
+if "%APPVEYOR_REPO_TAG%"=="true" ( set EMBEDPY_VERSION=%APPVEYOR_REPO_TAG_NAME% )
+conda build --output conda-recipe > packagenames.txt                      || goto :error
+conda build -c kx conda-recipe                                            || goto :error
+set PATH=%OP%;C:\Miniconda3-x64;C:\Miniconda3-x64\Scripts
+exit /b 0
+
+:error
+exit /b %errorLevel%
diff --git a/build/package.bat b/build/package.bat
@@ -0,0 +1,11 @@
+set ZIPNAME=
+if "%APPVEYOR_REPO_TAG%"=="true" (
+ set ZIPNAME=embedPy_windows-%APPVEYOR_REPO_TAG_NAME%.zip
+) else (
+ set ZIPNAME=embedPy_windows-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_BUILD_VERSION%.zip
+)
+7z a %ZIPNAME% p.q p.k test.q tests w64/p.dll LICENSE README.md || goto :error
+appveyor PushArtifact %ZIPNAME%                                 || goto :error
+exit /b 0
+:error
+exit /b %errorLevel%
diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat
@@ -0,0 +1,13 @@
+set QHOME=%PREFIX%\q
+mkdir %QHOME%
+move p.q %QHOME% || goto :error
+move p.k %QHOME% || goto :error
+
+set QBIN=%QHOME%\w64
+mkdir QBIN
+cl /LD /DKXVER=3 /Fep.dll /O2 py.c q.lib || goto :error
+move p.dll %QBIN% || goto :error
+exit 0
+:error
+exit %errorlevel%
+
diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+export QHOME=$PREFIX/q
+if [ $(uname) == Linux ];
+then
+	QLIBDIR=l64
+else
+	QLIBDIR=m64
+fi
+make p.so
+mkdir -p $QHOME
+mkdir -p $QHOME/$QLIBDIR
+mv p.q p.k $QHOME
+mv $QLIBDIR/p.so $QHOME/$QLIBDIR
diff --git a/conda-recipe/conda_build_config.yaml b/conda-recipe/conda_build_config.yaml
@@ -0,0 +1,4 @@
+python:
+  - 3.5
+  - 3.6
+  - 3.7
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -0,0 +1,31 @@
+package:
+  name: embedpy
+  version: {{ environ.get('EMBEDPY_VERSION', 'noversion') }}
+
+source:
+  path: ..
+
+build:
+  detect_binary_files_with_prefix: False
+  script_env:
+    QLIC
+
+requirements:
+  build:
+    - m2w64-make                     [win]
+    - {{ compiler('c') }}
+  host:
+    - python
+    - kdb
+  run:
+    - python
+    - kdb
+test:
+  source_files:
+    - test.q
+    - tests/
+    - conda-recipe/prep_requirements.q
+
+about:
+  home: https://github.com/KxSystems/embedPy
+  summary: allows the kdb+ interpreter to manipulate Python objects
diff --git a/conda-recipe/prep_requirements.q b/conda-recipe/prep_requirements.q
@@ -0,0 +1,6 @@
+/ exclude packages from tests/requirements.txt based on python major minor version
+\l p.q
+pexclude:select py37:enlist"tensorflow*" from (0#`)!()
+pver:`$"py",raze string .p.import[`sys;`:version_info][;`]each`:major`:minor
+`:tests/requirements_filtered.txt 0:u where not any(u:read0`:tests/requirements.txt)like/:pexclude pver
+\\
diff --git a/conda-recipe/run_test.bat b/conda-recipe/run_test.bat
@@ -0,0 +1,14 @@
+if not defined QLIC (
+ goto :nokdb
+)
+call q conda-recipe/prep_requirements.q -q
+conda install -y -q --file tests\requirements_filtered.txt
+call q test.q -s 4 -q || goto :error
+exit /b 0
+
+:error
+exit /b %errorLevel%
+
+:nokdb
+echo no kdb
+exit /b 0
diff --git a/conda-recipe/run_test.sh b/conda-recipe/run_test.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ -e ${QLIC}/kc.lic ]
+then
+  q conda-recipe/prep_requirements.q -q
+  conda install -y -q --file tests/requirements_filtered.txt
+  q test.q -s 4 -q;
+else
+  echo No kdb+, no tests;
+fi
diff --git a/makefile b/makefile
@@ -7,6 +7,7 @@ LDFLAGS=-bundle -undefined dynamic_lookup
 QLIBDIR=m64
 endif
 p.so: $(QLIBDIR)/p.so
+	cp $(QLIBDIR)/p.so .
 $(QLIBDIR)/p.so: py.c py.h k.h
 	mkdir -p $(QLIBDIR)
 	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
diff --git a/p.q b/p.q
@@ -1,7 +1,7 @@
 \d .p
 if[not .P.loaded:-1h=type@[`.p@;`numpy;`];
  sc:{"'",x,"'.join([__import__('sysconfig').get_config_var(v)for v in",ssr[.j.j y;"\"";"'"],"])"};pr:{"print(",x,");"};
- c:"-c \"",pr[$[.z.o like"w*";sc["/python";`BINDIR`VERSION],"+'.dll'";sc["/";`LIBDIR`INSTSONAME]]],pr[$[.z.o like"m*";sc["/";`PYTHONFRAMEWORKPREFIX`INSTSONAME];.z.o like"l*";sc["/";`LIBPL`LDLIBRARY];"''"]],pr["__import__('sys').prefix"],"\"2>",$[.z.o like"w*";"nul";"/dev/null"];
+ c:"-c \"",pr[$[.z.o like"w*";sc["/python";`BINDIR`VERSION],"+'.dll'";sc["/";`LIBDIR`INSTSONAME]]],pr[$[.z.o like"m*";sc["/";`PYTHONFRAMEWORKPREFIX`INSTSONAME];.z.o like"l*";sc["/";`LIBPL`LDLIBRARY];"''"]],pr["__import__('sys').prefix"],"\"2>",$[.z.o like"w*";"nul <nul";"/dev/null"];
  `L`M`H set'@[system"python3 ",;c;{system"python ",c}];if[count M;if[k~key k:`$":",M;L::M]];
  .p:(`:./p 2:(`init;2))[L;H]]
 loaded:.P.loaded
diff --git a/py.c b/py.c
@@ -45,9 +45,11 @@ Z K3(call){P a,k,p;I g;P(!pq(x)||!pq(z)&&z->t!=XD,ktrr())g=g1();a=pq(y)?p1(pg(y)
 Z K1(setconv){P(xt<100||xt>111,ktrr())r0(cf);cf=r1(x);R 0;}Z K1(getconv){R r1(cf);}Z K1(isp){R kb(pq(x));}
 
 ZV*t;EXP K2(init){ZI i=0;I f,g;S l,h;K n,v;P a,b;P(i,0)l=zs(x),h=zs(y);f=pyl(l);free(l);P(!f,krr("libpython"))
- Py_SetPythonHome(Py_DecodeLocale(h,0));free(h);Py_InitializeEx(0);if(PyEval_ThreadsInitialized())t0(PyGILState_GetThisThreadState());PyEval_InitThreads();
+ Py_SetPythonHome(Py_DecodeLocale(h,0));free(h);P(pyi(),krr("pyinit"));if(PyEval_ThreadsInitialized()&&!PyGILState_Check())t0(PyGILState_GetThisThreadState());PyEval_InitThreads();
  M=PyModule_GetDict(PyImport_AddModule("__main__"));cf=k(0,"::",0);n=ktn(KS,0);v=ktn(0,0);
  if(a=PyImport_ImportModule("numpy.core.multiarray")){N=PyCapsule_GetPointer(b=PyObject_GetAttrString(a,"_ARRAY_API"),0);if(!N||!pyn(N))N=0;p0(b);p0(a);}PyErr_Clear();
 #define F(f,i) js(&n,ss(#f));jk(&v,dl(f,i));
  F(eval,1)F(e,1)F(py2q,1)F(q2py,1)F(get,1)F(set,2)F(import,1)F(getattr,2)F(call,3)F(isp,1)F(setconv,1)F(getconv,1)js(&n,ss("numpy"));jk(&v,kb(!!N));
  t=t1();i=1;R xD(n,v);}
+// a kludge for python modules which try to resolve main e.g. scipy.optimize
+int main(){}
diff --git a/py.h b/py.h
@@ -32,6 +32,7 @@ typedef struct _p _p,*P;struct _p{L r;P t;L n;union{P*p;P v[1];};};typedef struc
  X(P,PyErr_SetString,(P,S))\
  X(I,PyGILState_Ensure,())\
  X(V,PyGILState_Release,(I))\
+ X(I,PyGILState_Check,())\
  X(V,PyEval_InitThreads,())\
  X(I,PyEval_ThreadsInitialized,())\
  X(V*,PyGILState_GetThisThreadState,())\
@@ -115,3 +116,15 @@ ZI pyn(V**v){
 #define X(r,n,a,i) U(n=(T##n(*)a)v[i])
  NF
  R 1;}
+ZI pyi(){
+#if _WIN32
+ I ifd,nfd;HANDLE h;
+ P(INVALID_HANDLE_VALUE==(h=CreateFile("nul",GENERIC_READ,0,NULL,OPEN_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL)),-1);P(-1==(nfd=_open_osfhandle((intptr_t)h,0)),(CloseHandle(h),-1));
+ P(-1==(ifd=dup(fileno(stdin))),(_close(nfd),-1));P(-1==dup2(nfd,fileno(stdin)),(_close(nfd),_close(ifd),-1));
+ Py_InitializeEx(0);
+ dup2(ifd,fileno(stdin));_close(nfd);_close(ifd);
+#else
+ Py_InitializeEx(0);
+#endif
+ R 0;
+}
diff --git a/test.q b/test.q
@@ -1,13 +1,16 @@
 \l p.q
 \d .t
-n:ne:nf:0
+n:ne:nf:ns: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)]}
+ge:{if[not P;n+:1;ns+:1;:(::)];v:.Q.trp[x;y;{(`..err;x,"\n",.Q.sbt 1#y)}];n+:1;if[not(1b~v)|(::)~v;pt[v](y;file)]}
+P:1;N:0;MM:0#`
+requiremod:{if[0~first u:@[.p.import;x;{(0;x)}];P::0;-2"WARN: can't import: ",string[x],", remainder of ",file," skipped, error was:\n\n\t",u[1],"\n";MM,:x]}
 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]
+{N+:1;P::1;file::x;system"l ",x}each $[count .z.x;.z.x;"tests/",/:string u@:where(u:til`:tests)like"*.t"];
+msg:{", "sv{":"sv string(x;y)}'[key x;value x]}`failed`errored`skipped`total!nf,ne,ns,n;
+if[(ne+nf);-2 msg;exit 1]
+if[ns;-2"These modules required for tests couldn't be imported:\n\t",("\n\t"sv string distinct MM),"\n\ntry running\n\tpip install -r tests/requirements.txt\n\nor with conda\n\tconda install --file tests/requirements.txt\n";-2 msg];
 \\
diff --git a/tests/basic.t b/tests/basic.t
@@ -4,6 +4,7 @@
 x:(0;1h;"str";`sym)
 r:(0;1; "str";"sym")
 r~.p.eval["lambda x:x";<]x
+.t.requiremod`numpy
 p)import numpy as np
 p)a=np.arange(6,dtype=np.int64).reshape(2,3)
 (2 3#til 6)~.p.py2q .p.pyget`a
diff --git a/tests/bs4.t b/tests/bs4.t
@@ -1,3 +1,4 @@
+.t.requiremod`bs4
 bs:.p.import[`bs4]`:BeautifulSoup
 bsobj:bs[.Q.hg`:http://code.kx.com/q/ref/adverbs/;"html.parser"]
 m_find_all:bsobj[`:find_all;*]
diff --git a/tests/curvefit.t b/tests/curvefit.t
@@ -1,2 +1,3 @@
+.t.requiremod`scipy.optimize
 cf:.p.import[`scipy.optimize;`:curve_fit;<]
 (enlist 2f;enlist enlist 3.4660897158452992e-32)~cf[{x xexp y};0 1 2 3 4;0 1 4 9 16f;1f]
diff --git a/tests/fortran.t b/tests/fortran.t
@@ -1,3 +1,4 @@
+.t.requiremod`numpy
 p)import numpy as np
 p)a=np.arange(6).reshape(2,3)
 p)b=np.asfortranarray(a)
diff --git a/tests/matplotlib.t b/tests/matplotlib.t
@@ -1,7 +1,9 @@
 / 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"]]
+requiremod`matplotlib
 p)import matplotlib as mpl
 p)mpl.use('Agg')
+requiremod`matplotlib.pyplot
 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
diff --git a/tests/memory.t b/tests/memory.t
@@ -1,4 +1,6 @@
-R:@[{.p.e x;1b};"import resource";0b]
+.t.requiremod`resource
+R:@[{.p.import x;1b};`resource;0b]
+if[R;.p.e"import resource"];
 pmem:{$[.z.o~`m64;0;$[R;.p.qeval"resource.getrusage(resource.RUSAGE_SELF).ru_maxrss";0]]}
 a:til 100;
 .p.set[`bbb]a;
diff --git a/tests/pandas.t b/tests/pandas.t
@@ -1,3 +1,4 @@
+requiremod`pandas
 tab2df:{
   r:.p.import[`pandas;`:DataFrame.from_dict;flip 0!x][@;cols x];
   $[count k:keys x;r[`:set_index]k;r]}
diff --git a/tests/syntax.t b/tests/syntax.t
@@ -1,5 +1,6 @@
 // Numpy
 
+.t.requiremod`numpy
 np:.p.import`numpy
 t:"f"$til@
 
diff --git a/tests/tensorflow.t b/tests/tensorflow.t
@@ -1,3 +1,4 @@
+.t.requiremod`tensorflow
 / tensorflow tests
 setenv[`TF_CPP_MIN_LOG_LEVEL]1#"2"
 p)import tensorflow as tf
diff --git a/tests/time.t b/tests/time.t
@@ -1,4 +1,5 @@
 T:10#t:.z.p;f:.p.py2q .p.q2py@
+.t.requiremod`numpy 
 ("j"$x)~f x:"p"$t
 ("j"$x)~f x:"m"$t
 ("j"$x)~f x:"d"$t

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +python:
 +  - 3.5
 +  - 3.6
 +  - 3.7