Sqlalchemy Task (flyteorg#445)

Signed-off-by: Max Hoffman <[email protected]>
dolthub · Apr 29, 2021 · 9e6be80 · 9e6be80
1 parent 30bfe47
commit 9e6be80
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 0 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -86,7 +86,14 @@ toml==0.10.2
     #   coverage
     #   pytest
 typed-ast==1.4.3
+<<<<<<< HEAD
     # via mypy
+=======
+    # via
+    #   -c requirements.txt
+    #   black
+    #   mypy
+>>>>>>> Sqlalchemy Task (#445)
 typing-extensions==3.7.4.3
     # via
     #   -c requirements.txt

diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -16,7 +16,11 @@ appnope==0.1.2
     # via
     #   ipykernel
     #   ipython
+<<<<<<< HEAD
 astroid==2.5.6
+=======
+astroid==2.5.3
+>>>>>>> Sqlalchemy Task (#445)
     # via sphinx-autoapi
 async-generator==1.10
     # via nbclient
@@ -39,9 +43,15 @@ black==21.4b2
     # via papermill
 bleach==3.3.0
     # via nbconvert
+<<<<<<< HEAD
 boto3==1.17.60
     # via sagemaker-training
 botocore==1.20.60
+=======
+boto3==1.17.55
+    # via sagemaker-training
+botocore==1.20.55
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   boto3
     #   s3transfer
@@ -88,7 +98,11 @@ entrypoints==0.3
     # via
     #   nbconvert
     #   papermill
+<<<<<<< HEAD
 flyteidl==0.18.39
+=======
+flyteidl==0.18.37
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 furo==2021.4.11b34
     # via -r doc-requirements.in
@@ -283,9 +297,15 @@ 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
+=======
+s3transfer==0.4.1
+    # via boto3
+sagemaker-training==3.9.1
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 scantree==0.0.1
     # via dirhash
@@ -314,7 +334,11 @@ sortedcontainers==2.3.0
     # via flytekit
 soupsieve==2.2.1
     # via beautifulsoup4
+<<<<<<< HEAD
 sphinx-autoapi==1.8.1
+=======
+sphinx-autoapi==1.8.0
+>>>>>>> Sqlalchemy Task (#445)
     # via -r doc-requirements.in
 sphinx-code-include==1.1.1
     # via -r doc-requirements.in
@@ -379,6 +403,11 @@ traitlets==5.0.5
     #   nbclient
     #   nbconvert
     #   nbformat
+<<<<<<< HEAD
+=======
+typed-ast==1.4.3
+    # via black
+>>>>>>> Sqlalchemy Task (#445)
 typing-extensions==3.7.4.3
     # via typing-inspect
 typing-inspect==0.6.0

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

diff --git a/requirements-spark2.txt b/requirements-spark2.txt
@@ -28,9 +28,15 @@ black==21.4b2
     # via papermill
 bleach==3.3.0
     # via nbconvert
+<<<<<<< HEAD
 boto3==1.17.60
     # via sagemaker-training
 botocore==1.20.60
+=======
+boto3==1.17.55
+    # via sagemaker-training
+botocore==1.20.55
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   boto3
     #   s3transfer
@@ -53,7 +59,11 @@ croniter==1.0.12
     # via flytekit
 cryptography==3.4.7
     # via paramiko
+<<<<<<< HEAD
 dataclasses-json==0.5.3
+=======
+dataclasses-json==0.5.2
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 decorator==5.0.7
     # via
@@ -71,7 +81,11 @@ entrypoints==0.3
     # via
     #   nbconvert
     #   papermill
+<<<<<<< HEAD
 flyteidl==0.18.39
+=======
+flyteidl==0.18.37
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 gevent==21.1.2
     # via sagemaker-training
@@ -235,15 +249,25 @@ requests==2.25.1
     #   flytekit
     #   papermill
     #   responses
+<<<<<<< HEAD
 responses==0.13.3
+=======
+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
+=======
+s3transfer==0.4.1
+    # via boto3
+sagemaker-training==3.9.1
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 scantree==0.0.1
     # via dirhash
@@ -296,6 +320,11 @@ traitlets==5.0.5
     #   nbclient
     #   nbconvert
     #   nbformat
+<<<<<<< HEAD
+=======
+typed-ast==1.4.3
+    # via black
+>>>>>>> Sqlalchemy Task (#445)
 typing-extensions==3.7.4.3
     # via typing-inspect
 typing-inspect==0.6.0

diff --git a/requirements.txt b/requirements.txt
@@ -28,9 +28,15 @@ black==21.4b2
     # via papermill
 bleach==3.3.0
     # via nbconvert
+<<<<<<< HEAD
 boto3==1.17.60
     # via sagemaker-training
 botocore==1.20.60
+=======
+boto3==1.17.55
+    # via sagemaker-training
+botocore==1.20.55
+>>>>>>> Sqlalchemy Task (#445)
     # via
     #   boto3
     #   s3transfer
@@ -71,7 +77,11 @@ entrypoints==0.3
     # via
     #   nbconvert
     #   papermill
+<<<<<<< HEAD
 flyteidl==0.18.39
+=======
+flyteidl==0.18.37
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 gevent==21.1.2
     # via sagemaker-training
@@ -241,9 +251,15 @@ 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
+=======
+s3transfer==0.4.1
+    # via boto3
+sagemaker-training==3.9.1
+>>>>>>> Sqlalchemy Task (#445)
     # via flytekit
 scantree==0.0.1
     # via dirhash
@@ -296,6 +312,11 @@ traitlets==5.0.5
     #   nbclient
     #   nbconvert
     #   nbformat
+<<<<<<< HEAD
+=======
+typed-ast==1.4.3
+    # via black
+>>>>>>> Sqlalchemy Task (#445)
 typing-extensions==3.7.4.3
     # via typing-inspect
 typing-inspect==0.6.0