Resolving conflicts with dev branch.

populationgenomics · Sep 18, 2023 · 1103cb0 · 1103cb0
1 parent c93661a
commit 1103cb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/etl/load/main.py b/etl/load/main.py
@@ -10,7 +10,7 @@
 import functions_framework
 import google.cloud.bigquery as bq
 
-from google.cloud import pubsub_v1
+from google.cloud import pubsub_v1  # type: ignore
 
 import pkg_resources
 

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -9,6 +9,8 @@ pre-commit
 pylint
 testcontainers[mariadb]
 types-PyMySQL
+# some strawberry dependency
+strawberry-graphql[debug-server]==0.206.0
 # following required to unit test etl functions
 functions_framework
 google-cloud-bigquery