From c0b1cd20ef7177d7b8bc89e0d7247a871db6f665 Mon Sep 17 00:00:00 2001
From: Corey Zumar <corey.zumar@databricks.com>
Date: Mon, 28 Oct 2019 22:57:59 -0700
Subject: [PATCH 1/2] Conditionally import sqlserver plugin, if present

---
 mlflow/__init__.py | 7 +++++++
 setup.py           | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/mlflow/__init__.py b/mlflow/__init__.py
index 5a43fb1ec5ae7..941b94269bfe9 100644
--- a/mlflow/__init__.py
+++ b/mlflow/__init__.py
@@ -41,6 +41,13 @@
 import mlflow.projects as projects  # noqa
 import mlflow.tracking as tracking  # noqa
 
+try:
+    import sqlplugin
+except ImportError:
+    pass
+except Exception as exc:
+    print("Error import sqlserver plugin: {}".format(exc))
+
 _configure_mlflow_loggers(root_module_name=__name__)
 
 ActiveRun = mlflow.tracking.fluent.ActiveRun
diff --git a/setup.py b/setup.py
index 9804e875bde51..7262a4e0231ea 100644
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,9 @@ def package_files(directory):
             'azure-storage',
             'google-cloud-storage',
         ],
+        'sqlserver':[
+            "sqlplugin",
+        ],
     },
     entry_points='''
         [console_scripts]

From 2273c76bf1b4459ebfcd707de68a76bd886cb893 Mon Sep 17 00:00:00 2001
From: Corey Zumar <corey.zumar@databricks.com>
Date: Tue, 29 Oct 2019 12:56:18 -0700
Subject: [PATCH 2/2] Use different import mechanism

---
 mlflow/__init__.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mlflow/__init__.py b/mlflow/__init__.py
index 941b94269bfe9..5a43fb1ec5ae7 100644
--- a/mlflow/__init__.py
+++ b/mlflow/__init__.py
@@ -41,13 +41,6 @@
 import mlflow.projects as projects  # noqa
 import mlflow.tracking as tracking  # noqa
 
-try:
-    import sqlplugin
-except ImportError:
-    pass
-except Exception as exc:
-    print("Error import sqlserver plugin: {}".format(exc))
-
 _configure_mlflow_loggers(root_module_name=__name__)
 
 ActiveRun = mlflow.tracking.fluent.ActiveRun