Merge branch 'eva-source'

alexxx-db · Oct 30, 2023 · 7b741bc · 7b741bc
2 parents 22e7834 + 922824b
commit 7b741bc
Show file tree

Hide file tree

Showing 123 changed files with 23,285 additions and 238 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -488,19 +488,37 @@ jobs:
               pip debug --verbose
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+<<<<<<< HEAD
+>>>>>>> eva-source
               pip install ".[dev,ludwig,qdrant,forecasting]"
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
+<<<<<<< HEAD
+=======
+>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
+>>>>>>> eva-source
               pip install ".[dev,ludwig,qdrant,forecasting,pinecone,chromadb]"
 =======
               pip install ".[dev,ludwig,qdrant,forecasting]"
 >>>>>>> 2dacff69 (feat: sync master staging (#1050))
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> eva-master
+=======
+>>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
+=======
+=======
+<<<<<<< HEAD
 >>>>>>> eva-master
 =======
 >>>>>>> 5d9d82f0 (feat: sync master staging (#1050))
+>>>>>>> 9fe75f29 (feat: sync master staging (#1050))
+>>>>>>> eva-source
               source test_evadb/bin/activate
               bash script/test/test.sh -m "<< parameters.mode >>"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,28 +16,69 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
+=======
+=======
+>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
+=======
+=======
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> 2170a7a9 (Bump v0.3.4+ dev)
+=======
+>>>>>>> ff795625 ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> 22e78346 (Bump v0.3.4+ dev)
+>>>>>>> eva-source
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> eva-master
 =======
 >>>>>>> 567ab492 (Bump Version to v0.3.8+dev (#1241))
+<<<<<<< HEAD
 =======
 >>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
 =======
+<<<<<<< HEAD
+>>>>>>> dbfef8c7 (Bump Version to v0.3.8+dev (#1241))
+=======
+=======
+>>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
+<<<<<<< HEAD
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> eva-source
+=======
 =======
 >>>>>>> 7c76583a ([RELEASE]: v0.3.3 (#984))
 =======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 >>>>>>> 7cac771f (Bump v0.3.4+ dev)
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 2170a7a9 (Bump v0.3.4+ dev)
+=======
+>>>>>>> eva-source
 =======
 =======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 =======
 =======
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 >>>>>>> 8da6decc (Bump v0.3.4+ dev)
+<<<<<<< HEAD
+=======
+>>>>>>> 22e78346 (Bump v0.3.4+ dev)
+>>>>>>> eva-source
 ##  [0.3.7] - 2023-09-30
 
 * PR #1239: release 0.3.7 
@@ -77,21 +118,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 >>>>>>> eva-master
 =======
 >>>>>>> 567ab492 (Bump Version to v0.3.8+dev (#1241))
 =======
+>>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
+<<<<<<< HEAD
+>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
+=======
+>>>>>>> eva-master
+=======
+>>>>>>> 567ab492 (Bump Version to v0.3.8+dev (#1241))
+<<<<<<< HEAD
+>>>>>>> dbfef8c7 (Bump Version to v0.3.8+dev (#1241))
+=======
+>>>>>>> eva-source
+=======
 =======
 >>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
 >>>>>>> 7c76583a ([RELEASE]: v0.3.3 (#984))
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> ff795625 ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> eva-source
 =======
 =======
 >>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
 =======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 >>>>>>> 8da6decc (Bump v0.3.4+ dev)
+<<<<<<< HEAD
+=======
+>>>>>>> 22e78346 (Bump v0.3.4+ dev)
+>>>>>>> eva-source
 ##  [0.3.6] - 2023-09-21
 
 * PR #1181: releass: bump a version further to skip cached wheel 
@@ -181,8 +247,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 =======
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
 >>>>>>> 7cac771f (Bump v0.3.4+ dev)
 =======
+<<<<<<< HEAD
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
+=======
+>>>>>>> 7cac771f (Bump v0.3.4+ dev)
+>>>>>>> 2170a7a9 (Bump v0.3.4+ dev)
+>>>>>>> eva-source
+=======
 >>>>>>> 7c76583a ([RELEASE]: v0.3.3 (#984))
 =======
 =======
@@ -195,14 +273,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
+>>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
+=======
+=======
+>>>>>>> 2170a7a9 (Bump v0.3.4+ dev)
+=======
+>>>>>>> ff795625 ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> 22e78346 (Bump v0.3.4+ dev)
+>>>>>>> eva-source
 >>>>>>> eva-master
 =======
 =======
 >>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 >>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
+<<<<<<< HEAD
 =======
 >>>>>>> 7cac771f (Bump v0.3.4+ dev)
 =======
+<<<<<<< HEAD
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+=======
+=======
+>>>>>>> 7cac771f (Bump v0.3.4+ dev)
+<<<<<<< HEAD
+>>>>>>> 2170a7a9 (Bump v0.3.4+ dev)
+=======
+>>>>>>> eva-source
+=======
 =======
 >>>>>>> 8da6decc (Bump v0.3.4+ dev)
 =======
@@ -211,10 +318,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 >>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
 <<<<<<< HEAD
 >>>>>>> 7c76583a ([RELEASE]: v0.3.3 (#984))
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> ff795625 ([RELEASE]: v0.3.3 (#984))
+=======
+>>>>>>> eva-source
 =======
 =======
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 >>>>>>> 8da6decc (Bump v0.3.4+ dev)
+<<<<<<< HEAD
+=======
+>>>>>>> 22e78346 (Bump v0.3.4+ dev)
+>>>>>>> eva-source
 ##  [0.3.3] - 2023-08-29
 
 * PR #983: doc: fix nav bar