Merge pull request #28 from xmnlab/master

Using mapd docker
deepfield · Apr 28, 2018 · a8b5c7d · a8b5c7d
2 parents a5f95b5 + 4874872
commit a8b5c7d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/ci/build.sh b/ci/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 docker-compose rm --force --stop
-docker-compose up -d --no-build postgres mysql clickhouse impala
+docker-compose up -d --no-build postgres mysql clickhouse impala mapd
 docker-compose run --rm waiter
 docker-compose build --pull ibis
 docker-compose run --rm ibis ci/load-data.sh
diff --git a/ci/datamgr.py b/ci/datamgr.py
@@ -189,7 +189,7 @@ def sqlite(database, schema, tables, data_directory, **params):
 
 
 @cli.command()
-@click.option('-h', '--host', default='34.207.244.142')
+@click.option('-h', '--host', default='localhost')
 @click.option('-P', '--port', default=9091, type=int)
 @click.option('-u', '--user', default='mapd')
 @click.option('-p', '--password', default='HyperInteractive')

diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -49,6 +49,18 @@ services:
       - 8123:8123
       - 9000:9000
 
+  mapd:
+    image: mapd/mapd-ce-cpu
+    ports:
+      - 9090:9090
+      - 9091:909
+      - 9092:9092
+    environment:
+      - MAPD_HOST=mapd
+      - MAPD_PORT=9091
+      - MAPD_DATABASE=mapd
+      - MAPD_USER=mapd
+
   waiter:
     image: jwilder/dockerize
     command: |
@@ -57,6 +69,7 @@ services:
                 -wait tcp://impala:21050
                 -wait tcp://impala:50070
                 -wait tcp://clickhouse:9000
+                -wait tcp://mapd:9091
                 -wait-retry-interval 5s
                 -timeout 5m
 
@@ -84,7 +97,7 @@ services:
       - IBIS_TEST_CLICKHOUSE_HOST=clickhouse
       - IBIS_TEST_CLICKHOUSE_PORT=9000
       - IBIS_TEST_CLICKHOUSE_DATABASE=ibis_testing
-      - IBIS_TEST_MAPD_HOST=34.207.244.142
+      - IBIS_TEST_MAPD_HOST=mapd
       - IBIS_TEST_MAPD_PORT=9091
       - IBIS_TEST_MAPD_DATABASE=mapd
       - IBIS_TEST_MAPD_USER=mapd

diff --git a/ci/load-data.sh b/ci/load-data.sh
@@ -6,6 +6,7 @@ declare -A argcommands=([sqlite]=sqlite
                         [parquet]="parquet -i"
                         [postgres]=postgres
                         [clickhouse]=clickhouse
+                        [mapd]=mapd
                         [mysql]=mysql
                         [impala]=impala)
 

diff --git a/ci/requirements-dev-3.6.yml b/ci/requirements-dev-3.6.yml
@@ -18,7 +18,7 @@ dependencies:
   - plumbum
   - psycopg2
   - pyarrow>=0.6.0
-  - pymapd
+  - pymapd>=0.3.2
   - pymysql
   - pytables
   - pytest

diff --git a/ibis/mapd/tests/conftest.py b/ibis/mapd/tests/conftest.py
@@ -3,7 +3,7 @@
 import pytest
 
 
-MAPD_HOST = os.environ.get('IBIS_TEST_MAPD_HOST', '34.207.244.142')
+MAPD_HOST = os.environ.get('IBIS_TEST_MAPD_HOST', 'localhost')
 MAPD_PORT = int(os.environ.get('IBIS_TEST_MAPD_PORT', 9091))
 MAPD_USER = os.environ.get('IBIS_TEST_MAPD_USER', 'mapd')
 MAPD_PASS = os.environ.get('IBIS_TEST_MAPD_PASSWORD', 'HyperInteractive')