From c62ad3351c49215d06a0c5fac79b83607896654b Mon Sep 17 00:00:00 2001
From: Connie Lee <connie.lee0317@gmail.com>
Date: Tue, 3 Oct 2023 12:18:48 -0700
Subject: [PATCH] chore: Move wb_schema.gql into shared dir (#689)

---
 .graphqlrc                                 | 2 +-
 Dockerfile.test                            | 1 +
 MANIFEST.in                                | 4 ++--
 weave/tests/wb_schema.gql => wb_schema.gql | 0
 weave/conftest.py                          | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename weave/tests/wb_schema.gql => wb_schema.gql (100%)

diff --git a/.graphqlrc b/.graphqlrc
index 60fc77d7077..d8ad47177c0 100644
--- a/.graphqlrc
+++ b/.graphqlrc
@@ -1 +1 @@
-schema: "./weave/wb_schema.gql"
+schema: "./wb_schema.gql"
diff --git a/Dockerfile.test b/Dockerfile.test
index 08e9be7cf92..a3a41690684 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -18,6 +18,7 @@ FROM node:16 as js_builder
 RUN apt update && apt install -y gcc g++ make libcairo2-dev libjpeg-dev libgif-dev libpango1.0-dev
 
 COPY weave-js /root/weave-js
+COPY wb_schema.gql /root/wb_schema.gql
 WORKDIR /root/weave-js
 RUN --mount=type=cache,target=/usr/local/share/.cache \
     SHA1=$(find $JS_DIR -not -path "*/.vite-cache/*" -not -path "*/node_modules/*" -not -path "*/build/*" -type f -print0 | sort -z | xargs -0 sha1sum | sha1sum | cut -d " " -f1) && \
diff --git a/MANIFEST.in b/MANIFEST.in
index da2c1f0f5a8..07609379091 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include requirements.*
-include weave/wb_schema.gql
+include wb_schema.gql
 graft weave/frontend
 graft weave/language_features
 graft weave/ops_primitives
@@ -12,4 +12,4 @@ graft weave/monitoring
 graft weave/panels_py
 graft weave/core_types
 global-exclude */__pycache__/*
-global-exclude *.pyc
\ No newline at end of file
+global-exclude *.pyc
diff --git a/weave/tests/wb_schema.gql b/wb_schema.gql
similarity index 100%
rename from weave/tests/wb_schema.gql
rename to wb_schema.gql
diff --git a/weave/conftest.py b/weave/conftest.py
index 586f5b32b65..d6a2e171e66 100644
--- a/weave/conftest.py
+++ b/weave/conftest.py
@@ -120,7 +120,7 @@ def pre_post_each_test(test_artifact_dir, caplog):
     # Tests rely on full cache mode right now.
     os.environ["WEAVE_CACHE_MODE"] = "full"
     os.environ["WEAVE_GQL_SCHEMA_PATH"] = str(
-        pathlib.Path(__file__).parent / "tests/wb_schema.gql"
+        pathlib.Path(__file__).parent.parent / "wb_schema.gql"
     )
     try:
         shutil.rmtree(test_artifact_dir)