Merge pull request #31 from xmnlab/master

Changed circleci and appveyor confs.

.circleci/config.yml

@@ -22,7 +22,7 @@ test: &test
           fi
     - run:
         name: Start Databases
-        command: docker-compose up -d --no-build mysql postgres impala clickhouse
+        command: docker-compose up -d --no-build mysql postgres impala clickhouse mapd
     - run:
         name: Show Running Containers
         command: docker ps
@@ -108,7 +108,7 @@ docs: &docs
           - "8d:b0:36:4d:f6:75:f2:5f:00:01:a1:53:63:52:f0:e2"
     - run:
         name: Start Databases
-        command: docker-compose up -d --no-build mysql postgres impala clickhouse
+        command: docker-compose up -d --no-build mysql postgres impala clickhouse mapd
     - run:
         name: Show Running Containers
         command: docker ps

appveyor.yml

@@ -27,6 +27,12 @@ environment:
   IBIS_TEST_MYSQL_PASSWORD: "Password12!"
   IBIS_TEST_MYSQL_DATABASE: "ibis_testing"
 
+  IBIS_TEST_MAPD_HOST: "localhost"
+  IBIS_TEST_MAPD_PORT: "9091"
+  IBIS_TEST_MAPD_USER: "mapd"
+  IBIS_TEST_MAPD_PASSWORD: "mapd"
+  IBIS_TEST_MAPD_DATABASE: "ibis_testing"
+
   IBIS_TEST_SQLITE_DATABASE: "%USERPROFILE%\\ibis_testing.db"
 
   CONDA: "C:\\Miniconda36-x64\\Scripts\\conda"
@@ -49,9 +55,9 @@ test_script:
   - "%CONDA% config --set always_yes true"
   - "%CONDA% create --name \"ibis_%PYTHON_VERSION%\" python=%PYTHON_VERSION% --channel conda-forge"
   - "%ACTIVATE% \"ibis_%PYTHON_VERSION%\""
-  - "%CONDA% install --channel conda-forge pytables numpy sqlalchemy psycopg2 graphviz click mock plumbum flake8 pytest"
+  - "%CONDA% install --channel conda-forge pytables numpy sqlalchemy psycopg2 pymapd graphviz click mock plumbum flake8 pytest"
   - "%CONDA% list"
-  - "pip install -e .\"[sqlite, postgres, mysql, visualization, pandas, csv, hdf5]\""
+  - "pip install -e .\"[sqlite, postgres, mysql, visualization, pandas, csv, hdf5, mapd]\""
 
   - "flake8"
 
@@ -60,4 +66,5 @@ test_script:
   - "python ci\\datamgr.py mysql"
   - "python ci\\datamgr.py sqlite"
   - "python ci\\datamgr.py postgres"
+  - "python ci\\datamgr.py mapd"
   - "pytest --tb=short -m \"not backend and not clickhouse and not impala and not hdfs and not bigquery\" -rs ibis"

ci/datamgr.py

@@ -293,9 +293,11 @@ def mapd(schema, tables, data_directory, **params):
     click.echo('Initializing MapD...')
     if params['database'] != 'mapd':
         conn = pymapd.connect(
-            host=params['host'], user=params['user'],
+            host=params['host'],
+            user=params['user'],
             password=params['password'],
-            port=params['port'], dbname='mapd'
+            port=params['port'],
+            dbname='mapd'
         )
         try:
             conn.execute('CREATE DATABASE {}'.format(params['database']))

ibis/mapd/tests/conftest.py

@@ -16,6 +16,20 @@ def con():
 
     :return:
     """
+    if MAPD_DB != 'mapd':
+        import pymapd
+        conn = pymapd.connect(
+            host=MAPD_HOST,
+            user=MAPD_USER,
+            password=MAPD_PASS,
+            port=MAPD_PORT, dbname='mapd'
+        )
+        try:
+            conn.execute('CREATE DATABASE {}'.format(MAPD_DB))
+        except Exception as e:
+            print(e)
+        conn.close()
+
     return ibis.mapd.connect(
         host=MAPD_HOST,
         port=MAPD_PORT,