v2 cutover

cumulus_library_covid/covid_symptom/counts.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from cumulus_library.schema.counts import CountsBuilder
+from cumulus_library.statistics.counts import CountsBuilder
 
 
 class CovidCountsBuilder(CountsBuilder):
@@ -98,21 +98,17 @@ def count_symptom(self, duration="week"):
         ]
         return self.count_encounter(view_name, from_table, cols)
 
-    def prepare_queries(self, cursor=None, schema=None):
+    def prepare_queries(self, cursor=None, schema=None, **kwargs):
         self.queries = [
             self.count_dx("month"),
             self.count_dx("week"),
-            self.count_pcr("month"),
-            self.count_pcr("week"),
+            #self.count_pcr("month"),
+            #self.count_pcr("week"),
             self.count_study_period("month"),
             self.count_study_period("week"),
             self.count_symptom("week"),
             self.count_symptom("month"),
             self.count_prevalence_ed("month"),
             self.count_prevalence_ed("week"),
         ]
-
-
-if __name__ == "__main__":
-    builder = CovidCountsBuilder()
-    builder.write_counts(f"{Path(__file__).resolve().parent}/counts.sql")
+        self.write_queries(path=Path(__file__).resolve().parent/ "counts.sql")