Merge pull request #1587 from henrykironde/macos

Test on MacOS
weecology · Apr 14, 2021 · a304ac3 · a304ac3
2 parents 82819fb + 6e3bd73
commit a304ac3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -15,8 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-
+        python-version: [3.7, 3.8] #  3.9] removed to reduce testing time
+        os:
+          - "ubuntu-latest"
+          - "macos-latest"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,9 @@ services:
       MYSQL_PASSWORD: Password12!
       MYSQL_ROOT_PASSWORD: Password12!
       MYSQL_DATABASE: testdb_retriever
-
+    restart: on-failure
+    healthcheck:
+      test: "exit 0"
   pgdb_retriever:
     image: kartoza/postgis:latest
     volumes:
@@ -26,8 +28,11 @@ services:
       - POSTGRES_PASS=Password12!
       - ALLOW_IP_RANGE=0.0.0.0/0
       - POSTGRES_MULTIPLE_EXTENSIONS=postgis,hstore,postgis_topology,postgis_raster,pgrouting
+    ports:
+      - 25432:5432
     restart: on-failure
-
+    healthcheck:
+      test: "exit 0"
   python_retriever:
     container_name: ret_container
     image: ret_image
@@ -47,7 +52,9 @@ services:
     restart: on-failure
     build: .
     depends_on:
-      - mysqldb_retriever
-      - pgdb_retriever
+      mysqldb_retriever:
+        condition: service_healthy
+      pgdb_retriever:
+        condition: service_healthy
     ports:
       - 5001:80