Sqlalchemy Task (flyteorg#445)

Signed-off-by: Max Hoffman <[email protected]>
dolthub · Apr 29, 2021 · 5f60799 · 5f60799
1 parent 246cf70
commit 5f60799
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 0 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -220,6 +220,7 @@ pyparsing==2.4.7
     # via
     #   -c requirements.txt
     #   packaging
+<<<<<<< HEAD
 pyrsistent==0.17.3
     # via
     #   -c requirements.txt
@@ -254,6 +255,10 @@ pyyaml==5.4.1
     # via
     #   -c requirements.txt
     #   docker-compose
+=======
+pytest==6.2.3
+    # via -r dev-requirements.in
+>>>>>>> Sqlalchemy Task (#445)
 regex==2021.4.4
     # via
     #   -c requirements.txt
@@ -315,9 +320,12 @@ toml==0.10.2
     #   coverage
     #   pytest
 typed-ast==1.4.3
+<<<<<<< HEAD
     # via mypy
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   -c requirements.txt
     #   black

diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -16,13 +16,17 @@ appnope==0.1.2
     # via
     #   ipykernel
     #   ipython
+<<<<<<< HEAD
 astroid==2.5.6
 <<<<<<< HEAD
 =======
 astroid==2.5.3
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+astroid==2.5.3
+>>>>>>> Sqlalchemy Task (#445)
     # via sphinx-autoapi
 async-generator==1.10
     # via nbclient
@@ -45,6 +49,7 @@ black==21.4b2
     # via papermill
 bleach==3.3.0
     # via nbconvert
+<<<<<<< HEAD
 boto3==1.17.60
     # via sagemaker-training
 botocore==1.20.60
@@ -56,6 +61,11 @@ botocore==1.20.55
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+boto3==1.17.55
+    # via sagemaker-training
+botocore==1.20.55
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   boto3
     #   s3transfer
@@ -105,6 +115,7 @@ entrypoints==0.3
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 flyteidl==0.18.39
 =======
 flyteidl==0.18.37
@@ -115,6 +126,9 @@ flyteidl==0.18.38
 =======
 flyteidl==0.18.39
 >>>>>>> Fix merge
+=======
+flyteidl==0.18.37
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 furo==2021.4.11b34
     # via -r doc-requirements.in
@@ -133,11 +147,14 @@ idna==2.10
 imagesize==1.2.0
     # via sphinx
 importlib-metadata==4.0.1
+<<<<<<< HEAD
 <<<<<<< HEAD
     # via
     #   jsonschema
     #   keyring
 =======
+=======
+>>>>>>> Sqlalchemy Task (#445)
     # via keyring
 >>>>>>> Fix merge
 inotify_simple==1.2.1
@@ -315,6 +332,7 @@ retry==0.9.2
     # via flytekit
 retrying==1.3.3
     # via sagemaker-training
+<<<<<<< HEAD
 s3transfer==0.4.2
     # via boto3
 sagemaker-training==3.9.2
@@ -326,6 +344,11 @@ sagemaker-training==3.9.1
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+s3transfer==0.4.1
+    # via boto3
+sagemaker-training==3.9.1
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 scantree==0.0.1
     # via dirhash
@@ -354,13 +377,17 @@ sortedcontainers==2.3.0
     # via flytekit
 soupsieve==2.2.1
     # via beautifulsoup4
+<<<<<<< HEAD
 sphinx-autoapi==1.8.1
 <<<<<<< HEAD
 =======
 sphinx-autoapi==1.8.0
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+sphinx-autoapi==1.8.0
+>>>>>>> Sqlalchemy Task (#445)
     # via -r doc-requirements.in
 sphinx-code-include==1.1.1
     # via -r doc-requirements.in
@@ -427,9 +454,13 @@ traitlets==5.0.5
     #   nbformat
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 typed-ast==1.4.3
 <<<<<<< HEAD
+=======
+typed-ast==1.4.3
+>>>>>>> Sqlalchemy Task (#445)
     # via black
 >>>>>>> Sqlalchemy Task (#445)
 typing-extensions==3.7.4.3

diff --git a/plugins/setup.py b/plugins/setup.py
@@ -16,10 +16,13 @@
     "flytekitplugins-kftensorflow": "kftensorflow",
     "flytekitplugins-pandera": "pandera",
     "flytekitplugins-sqlalchemy": "sqlalchemy",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "flytekitplugins-dolt": "dolt",
 =======
 >>>>>>> Sqlalchemy Task (#445)
+=======
+>>>>>>> Sqlalchemy Task (#445)
 }
 
 

diff --git a/requirements-spark2.txt b/requirements-spark2.txt
@@ -28,6 +28,7 @@ black==21.4b2
     # via papermill
 bleach==3.3.0
     # via nbconvert
+<<<<<<< HEAD
 boto3==1.17.60
     # via sagemaker-training
 botocore==1.20.60
@@ -39,6 +40,11 @@ botocore==1.20.55
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+boto3==1.17.55
+    # via sagemaker-training
+botocore==1.20.55
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   boto3
     #   s3transfer
@@ -61,9 +67,12 @@ croniter==1.0.12
     # via flytekit
 cryptography==3.4.7
     # via paramiko
+<<<<<<< HEAD
 dataclasses-json==0.5.3
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> Sqlalchemy Task (#445)
 dataclasses-json==0.5.2
 >>>>>>> Sqlalchemy Task (#445)
 =======
@@ -88,6 +97,7 @@ entrypoints==0.3
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 flyteidl==0.18.39
 =======
 flyteidl==0.18.37
@@ -98,6 +108,9 @@ flyteidl==0.18.38
 =======
 flyteidl==0.18.39
 >>>>>>> Fix merge
+=======
+flyteidl==0.18.37
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 gevent==21.1.2
     # via sagemaker-training
@@ -110,11 +123,14 @@ hmsclient==0.1.1
 idna==2.10
     # via requests
 importlib-metadata==4.0.1
+<<<<<<< HEAD
 <<<<<<< HEAD
     # via
     #   jsonschema
     #   keyring
 =======
+=======
+>>>>>>> Sqlalchemy Task (#445)
     # via keyring
 >>>>>>> Fix merge
 inotify_simple==1.2.1
@@ -267,18 +283,23 @@ requests==2.25.1
     #   flytekit
     #   papermill
     #   responses
+<<<<<<< HEAD
 responses==0.13.3
 <<<<<<< HEAD
 =======
 responses==0.13.2
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+responses==0.13.2
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 retry==0.9.2
     # via flytekit
 retrying==1.3.3
     # via sagemaker-training
+<<<<<<< HEAD
 s3transfer==0.4.2
     # via boto3
 sagemaker-training==3.9.2
@@ -290,6 +311,11 @@ sagemaker-training==3.9.1
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+s3transfer==0.4.1
+    # via boto3
+sagemaker-training==3.9.1
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 scantree==0.0.1
     # via dirhash
@@ -344,7 +370,10 @@ traitlets==5.0.5
     #   nbformat
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> Sqlalchemy Task (#445)
 typed-ast==1.4.3
     # via black
 >>>>>>> Sqlalchemy Task (#445)

diff --git a/requirements.txt b/requirements.txt
@@ -28,6 +28,7 @@ black==21.4b2
     # via papermill
 bleach==3.3.0
     # via nbconvert
+<<<<<<< HEAD
 boto3==1.17.60
     # via sagemaker-training
 botocore==1.20.60
@@ -39,6 +40,11 @@ botocore==1.20.55
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+boto3==1.17.55
+    # via sagemaker-training
+botocore==1.20.55
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   boto3
     #   s3transfer
@@ -82,6 +88,7 @@ entrypoints==0.3
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 flyteidl==0.18.39
 =======
 flyteidl==0.18.37
@@ -92,6 +99,9 @@ flyteidl==0.18.38
 =======
 flyteidl==0.18.39
 >>>>>>> Fix merge
+=======
+flyteidl==0.18.37
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 gevent==21.1.2
     # via sagemaker-training
@@ -104,11 +114,14 @@ hmsclient==0.1.1
 idna==2.10
     # via requests
 importlib-metadata==4.0.1
+<<<<<<< HEAD
 <<<<<<< HEAD
     # via
     #   jsonschema
     #   keyring
 =======
+=======
+>>>>>>> Sqlalchemy Task (#445)
     # via keyring
 >>>>>>> Fix merge
 inotify_simple==1.2.1
@@ -267,6 +280,7 @@ retry==0.9.2
     # via flytekit
 retrying==1.3.3
     # via sagemaker-training
+<<<<<<< HEAD
 s3transfer==0.4.2
     # via boto3
 sagemaker-training==3.9.2
@@ -278,6 +292,11 @@ sagemaker-training==3.9.1
 >>>>>>> Sqlalchemy Task (#445)
 =======
 >>>>>>> Fix merge
+=======
+s3transfer==0.4.1
+    # via boto3
+sagemaker-training==3.9.1
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 scantree==0.0.1
     # via dirhash
@@ -332,7 +351,10 @@ traitlets==5.0.5
     #   nbformat
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> Sqlalchemy Task (#445)
 typed-ast==1.4.3
     # via black
 >>>>>>> Sqlalchemy Task (#445)