View generation fixes

.circleci/config.yml

@@ -38,7 +38,6 @@ jobs:
             venv/bin/pip install --upgrade -r requirements.txt
             rm -rf sql/
             venv/bin/python script/generate_sql
-            venv/bin/python script/generate_views
             echo "Inconsistencies between templates and generated SQL:"
             git ls-files --other --modified -x sql/*
             test `git ls-files --other --modified -x sql/* | wc -l` = 0

script/generate_and_publish_views

@@ -6,7 +6,7 @@ set -e
 ./script/generate_views 'moz-fx-data-shared-prod:*_stable.*'
 
 # All view definitions target moz-fx-data-shared-prod by default
-./script/publish_views templates/
+./script/publish_views sql/
 
 # We additionally make sure we have identical view definitions in moz-fx-data-derived-datasets
-./script/publish_views --target-project moz-fx-data-derived-datasets templates/
+./script/publish_views --target-project moz-fx-data-derived-datasets sql/

tests/conftest.py

@@ -7,7 +7,6 @@ expect_names = {f"expect.{ext}" for ext in ("yaml", "json", "ndjson")}
 def pytest_configure():
     """Generate SQL files before running tests."""
     exec(open("script/generate_sql").read())
-    exec(open("script/generate_views").read())
 
 
 def pytest_collect_file(parent, path):