From bcfe5fce048ae913183e4daacb96df0acb2aef65 Mon Sep 17 00:00:00 2001
From: Dylan Hercher <dhercher@google.com>
Date: Tue, 21 Jul 2020 22:40:55 +0000
Subject: [PATCH 1/3] move ibis addons back to thrid party now that it works

---
 README.md                                                 | 2 +-
 setup.py                                                  | 1 -
 tests/unit/test_ibis_operations.py                        | 2 +-
 {ibis_addon => third_party/ibis/ibis_addon}/__init__.py   | 0
 {ibis_addon => third_party/ibis/ibis_addon}/operations.py | 0
 5 files changed, 2 insertions(+), 3 deletions(-)
 rename {ibis_addon => third_party/ibis/ibis_addon}/__init__.py (100%)
 rename {ibis_addon => third_party/ibis/ibis_addon}/operations.py (100%)

diff --git a/README.md b/README.md
index 530be1cb3..23703e4d3 100644
--- a/README.md
+++ b/README.md
@@ -211,7 +211,7 @@ If you want to add an Ibis Data Source which exists, but was not yet supported i
     - Import the extened Client for the given source (ie. from ibis.sql.mysql.client import MySQLClient).
     - Add the "<RefName>": Client to the global CLIENT_LOOKUP dictionary.
 
-2. In ibis_addon/operations.py
+2. In third_partty/ibis/ibis_addon/operations.py
     - Add the RawSQL operator to the data source registry (for custom filter support).
 
 3. You are done, you can reference the data source via the config.
diff --git a/setup.py b/setup.py
index 14a88b592..c7b2c30f9 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,6 @@
     "data_validation",
     "data_validation.query_builder",
     "data_validation.result_handlers",
-    "ibis_addon",
 ]
 packages += [
     "third_party.ibis.{}".format(path)
diff --git a/tests/unit/test_ibis_operations.py b/tests/unit/test_ibis_operations.py
index b7bbf3fb7..850361dc2 100644
--- a/tests/unit/test_ibis_operations.py
+++ b/tests/unit/test_ibis_operations.py
@@ -16,7 +16,7 @@
 import pytest
 import ibis.pandas
 
-from ibis_addon import operations
+from third_party.ibis.ibis_addon import operations
 
 
 TABLE_DF = pandas.DataFrame([{"column": "value"}])
diff --git a/ibis_addon/__init__.py b/third_party/ibis/ibis_addon/__init__.py
similarity index 100%
rename from ibis_addon/__init__.py
rename to third_party/ibis/ibis_addon/__init__.py
diff --git a/ibis_addon/operations.py b/third_party/ibis/ibis_addon/operations.py
similarity index 100%
rename from ibis_addon/operations.py
rename to third_party/ibis/ibis_addon/operations.py

From faa9b28c849ffd7fabf2ade2471a048e44ff4470 Mon Sep 17 00:00:00 2001
From: Dylan Hercher <dhercher@google.com>
Date: Tue, 21 Jul 2020 22:41:20 +0000
Subject: [PATCH 2/3] fix import

---
 data_validation/query_builder/query_builder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data_validation/query_builder/query_builder.py b/data_validation/query_builder/query_builder.py
index 522b69911..7db990db4 100644
--- a/data_validation/query_builder/query_builder.py
+++ b/data_validation/query_builder/query_builder.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import ibis
-from ibis_addon import operations
+from third_party.ibis.ibis_addon import operations
 
 
 class AggregateField(object):

From b59ebf3ead8883fa164cce8342bf67190863409a Mon Sep 17 00:00:00 2001
From: Dylan Hercher <dhercher@google.com>
Date: Tue, 21 Jul 2020 22:47:32 +0000
Subject: [PATCH 3/3] fix import

---
 tests/unit/test_ibis_operations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/test_ibis_operations.py b/tests/unit/test_ibis_operations.py
index 850361dc2..c07ccc1ee 100644
--- a/tests/unit/test_ibis_operations.py
+++ b/tests/unit/test_ibis_operations.py
@@ -26,7 +26,7 @@
 
 @pytest.fixture
 def module_under_test():
-    from ibis_addon import operations
+    from third_party.ibis.ibis_addon import operations
 
     return operations