Skip to content

Commit

Permalink
Merge branch 'staging' of github.com:georgia-tech-db/eva into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
gaurav274 committed Sep 6, 2023
2 parents fd1f93b + 0d8385d commit 58a7be7
Show file tree
Hide file tree
Showing 274 changed files with 9,673 additions and 4,226 deletions.
79 changes: 75 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ workflows:
- master
- staging
################################
### THIRD PARTY: Staging, Master
################################
################################
- MySQL:
name: Third Party Test - MySQL | v3.10 | Linux
filters:
branches:
only:
- master
- staging
################################
### NOTEBOOKS: Staging, Master
################################
################################
Expand Down Expand Up @@ -242,15 +253,15 @@ jobs:
resource_class: large
docker:
# https://circleci.com/docs/circleci-images#language-image-variants
- image: "cimg/python:<< parameters.v >>"
- image: "cimg/python:<< parameters.v >>-node"
steps:

- checkout

# Restore pip wheel
- restore_cache:
keys:
- v1-pip-wheel_cache-python<< parameters.v >>-{{ checksum "docs/requirements.txt" }}
- v1-pip-wheel_cache-python<< parameters.v >>-{{ checksum "docs/requirements.txt" }}-{{ checksum "package-lock.json" }}

- run:
name: Install EvaDB Doc dependencies
Expand All @@ -259,6 +270,7 @@ jobs:
source test_evadb_doc/bin/activate
pip install --upgrade pip
pip install -r docs/requirements.txt
npm install markdown-link-check
- run:
name: Test doc build and link validation
Expand All @@ -268,9 +280,62 @@ jobs:
bash script/test/test.sh -m "<< parameters.mode >>"
- save_cache:
key: v1-pip-wheel_cache-python<< parameters.v >>-{{ checksum "docs/requirements.txt" }}
key: v1-pip-wheel_cache-python<< parameters.v >>-{{ checksum "docs/requirements.txt" }}-{{ checksum "package-lock.json" }}
paths:
- test_evadb_doc
- node_modules

MySQL:
parameters:
v:
type: string
default: "3.10"
resource_class: large
docker:
- image: "cimg/python:<< parameters.v >>"
- image: "cimg/mysql:8.0"
environment:
MYSQL_USER: eva
MYSQL_PASSWORD: password
MYSQL_DATABASE: evadb

steps:

- checkout

# Restore pip wheel
- restore_cache:
keys:
- v1-pip-wheel_cache-python<< parameters.v >>-rayDISABLED-{{ checksum "setup.py" }}

- restore_cache:
keys:
- v1-model_cache-{{ checksum "setup.py" }}

- run:
name: Install dockerize
command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
environment:
DOCKERIZE_VERSION: v0.6.1

- run:
name: Wait for DB to run
command : dockerize -wait tcp://localhost:3306 -timeout 1m

- run:
name: Install EvaDB package from GitHub repo with all dependencies
command: |
"python<< parameters.v >>" -m venv test_evadb
pip install --upgrade pip
source test_evadb/bin/activate
pip install ".[dev]"
pip install -r evadb/third_party/databases/mysql/requirements.txt
- run:
name: Run integration tests
command: |
source test_evadb/bin/activate
PYTHONPATH="." python -m pytest test/third_party_tests/test_native_executor.py -k test_should_run_query_in_mysql
Postgres:
parameters:
Expand All @@ -290,6 +355,11 @@ jobs:

- checkout

# Restore pip wheel
- restore_cache:
keys:
- v1-pip-wheel_cache-python<< parameters.v >>-rayDISABLED-{{ checksum "setup.py" }}

- restore_cache:
keys:
- v1-model_cache-{{ checksum "setup.py" }}
Expand All @@ -311,6 +381,7 @@ jobs:
pip install --upgrade pip
source test_evadb/bin/activate
pip install ".[dev]"
pip install -r evadb/third_party/databases/postgres/requirements.txt
- run:
name: Run integration tests
Expand Down Expand Up @@ -364,7 +435,7 @@ jobs:
source test_evadb/bin/activate
pip install --upgrade pip
pip debug --verbose
pip install ".[dev,ludwig,qdrant]"
pip install ".[dev,ludwig,qdrant,forecasting]"
source test_evadb/bin/activate
bash script/test/test.sh -m "<< parameters.mode >>"
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,13 @@ dep.txt
*eva_data/
*evadb_data/

# models
# models, but not apply to codebase
models/
!evadb/models
!evadb/catalog/models
!test/unit_tests/models
!test/unit_tests/catalog/models


# test files
test.py
Expand Down
Loading

0 comments on commit 58a7be7

Please sign in to comment.