Run with SpatiaLite in Circle CI - closes #4

Pull request #5

Author: simonw

.circleci/config.yml

@@ -6,14 +6,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - test-python-install:
-          version: "3.6"
-          requires:
-            - build
-      - test-python-install:
-          version: "3.7"
-          requires:
-            - build
       - deploy:
           requires:
             - build
@@ -25,44 +17,16 @@ workflows:
 jobs:
   build:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
     steps:
       - checkout
       - restore_cache:
           key: v1-dependency-cache-{{ checksum "setup.py" }}
       - run:
-          name: Installe mod_spatialite
+          name: Install mod_spatialite
           command: |
             sudo apt-get update
-            sudo apt-get install libsqlite3-mod-spatialite
-      - run:
-          name: install python dependencies
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install -e .
-      - save_cache:
-          key: v1-dependency-cache-{{ checksum "setup.py" }}
-          paths:
-            - "venv"
-      - run:
-          name: run tests
-          command: |
-            . venv/bin/activate
-            pip install -e .
-            pip install pytest
-            pytest
-  test-python-install:
-    parameters:
-      version:
-        type: string
-        default: latest
-    docker:
-      - image: circleci/python:3.6
-    steps:
-      - checkout
-      - restore_cache:
-          key: v1-dependency-cache-{{ checksum "setup.py" }}
+            sudo apt-get install -y libsqlite3-mod-spatialite
       - run:
           name: install python dependencies
           command: |

geojson_to_sqlite/utils.py

@@ -29,7 +29,7 @@ def import_features(
         lib = spatialite_mod or find_spatialite()
         if not lib:
             raise SpatiaLiteError("Could not find SpatiaLite module")
-        init_spatialite(db)
+        init_spatialite(db, lib)
         ensure_table_has_geometry(db, table)
         conversions = {"geometry": "GeomFromText(?, 4326)"}
 
@@ -58,9 +58,9 @@ def find_spatialite():
     return None
 
 
-def init_spatialite(db):
+def init_spatialite(db, lib):
     db.conn.enable_load_extension(True)
-    db.conn.load_extension("/usr/local/lib/mod_spatialite.dylib")
+    db.conn.load_extension(lib)
     # Initialize SpatiaLite if not yet initialized
     if "spatial_ref_sys_all" in db.table_names():
         return

tests/test_geojson_to_sqlite.py

@@ -46,7 +46,7 @@ def test_single_feature_spatialite(tmpdir):
     )
     assert 0 == result.exit_code, result.stdout
     db = sqlite_utils.Database(db_path)
-    utils.init_spatialite(db)
+    utils.init_spatialite(db, utils.find_spatialite())
     assert {"features", "spatial_ref_sys"}.issubset(db.table_names())
     rows = db.execute_returning_dicts(
         "select slug, AsGeoJSON(geometry) as geometry from features"