Merge remote-tracking branch 'origin/jgadling/db-import-v2b' into jga…

…dling/schema-sync

.github/workflows/apiv2-test.yml

@@ -16,6 +16,18 @@ jobs:
     name: "Run tests"
     steps:
       - uses: actions/checkout@v3
+      - name: Install AWS CLI v2
+        shell: bash
+        run: |
+          set -ue
+          set -o pipefail
+          URL="https://awscli.amazonaws.com/awscli-exe-linux-aarch64.zip"
+          curl $URL -o /tmp/awscliv2.zip -v
+          unzip -q /tmp/awscliv2.zip -d /tmp
+          rm /tmp/awscliv2.zip
+          sudo /tmp/aws/install --update
+          rm -rf /tmp/aws/
+
       # Set up a local test env and run tests
       - name: Run tests
         run: |

Makefile

@@ -30,7 +30,7 @@ api-init:
 apiv2-init:
 	docker compose --profile apiv2 up -d
 	docker compose exec db sh -c 'echo create database cryoetv2 | psql postgres://postgres:[email protected]:5432/cryoet' || true
-	$(MAKE) -C apiv2 seed-moto
+	cd ./test_infra/; ./seed_moto.sh
 	$(MAKE) -C apiv2 alembic-upgrade-head
 
 .PHONY: clean

apiv2/schema/schema.yaml

@@ -2205,6 +2205,8 @@ classes:
         multivalued: true
         inverse: AnnotationFile.tomogram_voxel_spacing
         range: AnnotationFile
+        annotations:
+          cascade_delete: true
       run:
         name: run
         from_schema: cdp-dataset-config