clean up legacy code

apperception-db · Aug 7, 2023 · 96b48ac · 96b48ac
1 parent c827e98
commit 96b48ac
Show file tree

Hide file tree

Showing 20 changed files with 241 additions and 3,263 deletions.
diff --git a/.github/workflows/clean-up-and-format.yml b/.github/workflows/clean-up-and-format.yml
@@ -29,7 +29,7 @@ jobs:
         run: ./scripts/commit-and-push.sh "[CI] cleanup python notebooks"
 
   format:
-    name: Format and Lint
+    name: Format
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -60,7 +60,3 @@ jobs:
 
       - name: Commit formatted changes
         run: ./scripts/commit-and-push.sh "[CI] format"
-
-      - name: Analyze the code with flake8
-        if: always()
-        run: python -m flake8 spatialyze --statistics
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,25 @@
+name: Lint
+on:
+  push:
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_PAT || github.token }}
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install Dependencies
+        run: |
+          pip install --upgrade pip
+          pip install flake8
+      
+      - name: Analyze the code with flake8
+        run: python -m flake8 spatialyze --statistics
diff --git a/.github/workflows/test-in-parallel.yml b/.github/workflows/test-in-parallel.yml
@@ -0,0 +1,209 @@
+name: Test in Parallel
+on:
+  push:
+
+jobs:
+  test-video-processor:
+    name: Test Video Processor
+    runs-on: ubuntu-latest
+    services:
+      mobilitydb:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25440:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_PAT || github.token }}
+          submodules: recursive
+
+      - name: Setup Micromamba
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-file: environment.yml
+          init-shell: none
+          cache-downloads: false
+
+      - name: Check Python Versions
+        shell: micromamba-shell {0}
+        run: |
+          python --version
+          python3 --version
+          which python
+          which python3
+          which pip
+          which pip3
+          which poetry
+
+      - name: Install Dependencies
+        shell: micromamba-shell {0}
+        run: poetry install --no-interaction --without dev --with test
+
+      - name: Install lap (Hack)
+        shell: micromamba-shell {0}
+        run: |
+          pip install --upgrade pip
+          pip install lap
+      
+      - name: Check Installed Packages
+        shell: micromamba-shell {0}
+        run: pip list
+
+      - name: Extend MobilityDB with User-Defined functions
+        shell: micromamba-shell {0}
+        run: |
+          pushd scripts/pg-extender
+          python ../generate_pg_extender.py
+          cat install.sql
+          psql -h localhost -p 25440 -d mobilitydb -U docker -c "SET client_min_messages TO WARNING;" -c "\i install.sql;"
+          popd
+        env:
+          PGPASSWORD: docker
+
+      - name: Ingest data
+        shell: micromamba-shell {0}
+        run: |
+          python ./scripts/ingest_road.py
+        env:
+          AP_PORT: 25440
+
+      - name: Unit Test
+        shell: micromamba-shell {0}
+        run: pytest tests/video_processor
+        env:
+          AP_PORT: 25440
+
+  test-engine-and-interface:
+    name: Test Engine and Interface
+    runs-on: ubuntu-latest
+    services:
+      mobilitydb:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25440:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mobilitydb-road-1:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25441:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mobilitydb-road-2:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25442:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mobilitydb-reset:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25443:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mobilitydb-import:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25444:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      mobilitydb-sql:
+        image: mobilitydb/mobilitydb:14-3.2-1
+        ports:
+          - 25445:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_PAT || github.token }}
+
+      - name: Setup Micromamba
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-file: environment.yml
+          init-shell: none
+          cache-downloads: false
+
+      - name: Check Python Versions
+        shell: micromamba-shell {0}
+        run: |
+          python --version
+          python3 --version
+          which python
+          which python3
+          which pip
+          which pip3
+          which poetry
+
+      - name: Install Dependencies
+        shell: micromamba-shell {0}
+        run: poetry install --no-interaction --without dev,cv --with test
+
+      - name: Check Installed Packages
+        shell: micromamba-shell {0}
+        run: pip list
+
+      - name: Extend MobilityDB with User-Defined functions
+        shell: micromamba-shell {0}
+        run: |
+          pushd scripts/pg-extender
+          python ../generate_pg_extender.py
+          cat install.sql
+          psql -h localhost -p 25440 -d mobilitydb -U docker -c "SET client_min_messages TO WARNING;" -c "\i install.sql;"
+          psql -h localhost -p 25441 -d mobilitydb -U docker -c "SET client_min_messages TO WARNING;" -c "\i install.sql;"
+          psql -h localhost -p 25442 -d mobilitydb -U docker -c "SET client_min_messages TO WARNING;" -c "\i install.sql;"
+          psql -h localhost -p 25443 -d mobilitydb -U docker -c "SET client_min_messages TO WARNING;" -c "\i install.sql;"
+          psql -h localhost -p 25444 -d mobilitydb -U docker -c "SET client_min_messages TO WARNING;" -c "\i install.sql;"
+          popd
+        env:
+          PGPASSWORD: docker
+
+      - name: Ingest data
+        shell: micromamba-shell {0}
+        run: |
+          python ./scripts/ingest_road.py
+          python ./scripts/import_tables.py
+          jupyter nbconvert --execute --to notebook ./scripts/optimized-scenic/add_attributes.ipynb
+        env:
+          AP_PORT: 25440
+
+      - name: Generate Image data
+        shell: micromamba-shell {0}
+        run: python scripts/fake-images.py
+
+      - name: Unit Test
+        shell: micromamba-shell {0}
+        run: pytest --cov=spatialyze --cov-report=xml tests/engine tests/interface
+        env:
+          AP_PORT: 25440
+          AP_PORT_ROAD_1: 25441
+          AP_PORT_ROAD_2: 25442
+          AP_PORT_RESET: 25443
+          AP_PORT_IMPORT: 25444
+          AP_PORT_SQL: 25445
diff --git a/.github/workflows/test-video-processor.yml b/.github/workflows/test-video-processor.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -87,7 +87,7 @@ jobs:
 
       - name: Install Dependencies
         shell: micromamba-shell {0}
-        run: poetry install --no-interaction --without dev,cv --with test
+        run: poetry install --no-interaction --without dev --with test
 
       - name: Check Installed Packages
         shell: micromamba-shell {0}
@@ -123,7 +123,7 @@ jobs:
 
       - name: Unit Test
         shell: micromamba-shell {0}
-        run: pytest --cov=spatialyze --cov-report=xml tests/engine tests/interface
+        run: pytest --cov=spatialyze --cov-report=xml tests
         env:
           AP_PORT: 25440
           AP_PORT_ROAD_1: 25441

diff --git a/README.md b/README.md
@@ -2,23 +2,19 @@
 <p align="center">
   <a href="https://github.com/apperception-db/spatialyze/actions/workflows/test.yml"><img
     alt="Github Actions Test Status"
-    src="https://img.shields.io/github/actions/workflow/status/apperception-db/spatialyze/test.yml?label=Test&style=flat-square"
-  ></a>
-  <a href="https://github.com/apperception-db/spatialyze/actions/workflows/test-video-processor.yml"><img
-    alt="Github Actions Test Video Processor Status"
-    src="https://img.shields.io/github/actions/workflow/status/apperception-db/spatialyze/test-video-processor.yml?label=Test%20Video%20Processor&style=flat-square"
+    src="https://img.shields.io/github/actions/workflow/status/apperception-db/spatialyze/test.yml?label=Test&style=for-the-badge"
   ></a>
   <a href="https://github.com/apperception-db/spatialyze/actions/workflows/check.yml"><img
     alt="Github Actions Type Check Status"
-    src="https://img.shields.io/github/actions/workflow/status/apperception-db/spatialyze/check.yml?label=Type%20Check&style=flat-square"
+    src="https://img.shields.io/github/actions/workflow/status/apperception-db/spatialyze/check.yml?label=Type%20Check&style=for-the-badge"
   ></a>
   <a href="https://github.com/psf/black"><img
     alt="Github Actions Type Check Status"
-    src="https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square"
+    src="https://img.shields.io/badge/code%20style-black-000000.svg?style=for-the-badge"
   ></a>
   <a href="https://codecov.io/gh/apperception-db/spatialyze"><img
     alt="Codecov Coverage Status"
-    src="https://img.shields.io/codecov/c/github/apperception-db/spatialyze.svg?style=flat-square"
+    src="https://img.shields.io/codecov/c/github/apperception-db/spatialyze.svg?style=for-the-badge"
   ></a>
 </p>