fix: updates to restore build (#635)

* checkpoint * checkpoint
georgia-tech-db · Apr 4, 2023 · 3f302bd · 3f302bd
1 parent ead4c13
commit 3f302bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -184,3 +184,4 @@ tutorials/*.py
 eva.txt
 prof/
 output.txt
+MagicMock/
diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@ def read(path, encoding="utf-8"):
 minimal_requirement = [
     "numpy>=1.19.5,<=1.23.5",
     "opencv-python>=4.5.4.60,<4.6.0.66",  # bug in easyocr
-    "pandas>=1.1.5",
+    "pandas>=1.1.5,<2.0.0", # major changes in 2.0.0
     "Pillow>=8.4.0",
     "sqlalchemy>=1.4.0,<2.0.0", # major changes in 2.0.0
     "sqlalchemy-utils>=0.36.6",

diff --git a/test/integration_tests/test_reuse.py b/test/integration_tests/test_reuse.py
@@ -15,6 +15,7 @@
 import os
 import unittest
 from pathlib import Path
+from test.markers import windows_skip_marker
 from test.util import get_logical_query_plan, load_udfs_for_testing
 
 from eva.catalog.catalog_manager import CatalogManager
@@ -115,6 +116,7 @@ def test_reuse_does_not_work_when_expression_in_where_clause(self):
 
         self.assertFalse(yolo_expr.has_cache())
 
+    @windows_skip_marker
     def test_reuse_after_server_shutdown(self):
         select_query = """SELECT id, label FROM DETRAC JOIN
             LATERAL YoloV5(data) AS Obj(label, bbox, conf) WHERE id < 10;"""
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,3 +184,4 @@ tutorials/*.py @@
     eva.txt
     prof/
     output.txt
+    MagicMock/