Merge branch 'master' of https://github.com/suryatejreddy/eva

Jenkinsfile

@@ -0,0 +1,41 @@
+pipeline {
+  agent {
+    dockerfile {
+      filename 'docker/eva_jenkins.Dockerfile'
+    }
+
+  }
+  stages {
+    stage('Setup and Build') {
+      parallel {
+        stage('Setup Virtual Environment') {
+          steps {
+            sh '''python3 -m venv env37
+. env37/bin/activate
+pip install --upgrade pip
+pip install scikit-build
+pip install cython
+pip install flake8==3.9.0 pytest==6.1.2 pytest-cov==2.11.1 mock==4.0.3 coveralls==3.0.1
+python setup.py install '''
+          }
+        }
+
+        stage('Generate Parser') {
+          steps {
+            sh 'sh script/antlr4/generate_parser.sh'
+          }
+        }
+
+      }
+    }
+
+    stage('Test') {
+      steps {
+        sh '''. env37/bin/activate
+sh script/test/test.sh
+coveralls'''
+      }
+    }
+
+  }
+}

eva/eva.yml

@@ -28,8 +28,7 @@ storage:
 pyspark:
   property: {'spark.logConf': 'true',
              'spark.driver.memory': '10g',
-             'spark.sql.execution.arrow.pyspark.enabled': 'true',
-             'spark.jars.ivy' : /tmp/.ivy'}
+             'spark.sql.execution.arrow.pyspark.enabled': 'true'}
   coalesce: 2
 
 

test/server/test_server.py

@@ -24,7 +24,7 @@
 from eva.server.server import start_server
 from eva.server.server import EvaServer
 
-from asyncio.exceptions import CancelledError
+from asyncio import CancelledError
 
 
 class ServerTests(unittest.TestCase):