ENH Suppress FutureWarning from sklearn.externals.joblib; Bump versio…

…n to 1.13.1 (#375)

* ENH suppress FutureWarning from sklearn.externals.joblib

* ENH handle run_joblib_func.py as well

* MAINT bump version to 1.13.1

* COMPAT python 2.7 can't stand non-ASCII characters

CHANGELOG.md

@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 ### Changed
 
+## 1.13.1 - 2020-03-06
+### Added
+- Suppressed FutureWarning from sklearn.externals.joblib. (#375)
+
 ## 1.13.0 - 2020-03-05
 ### Added
 - Add `civis jobs follow-log` and `civis jobs follow-run-log` CLI commands. (#359)

civis/_version.py

@@ -1 +1 @@
-__version__ = "1.13.0"
+__version__ = "1.13.1"

civis/parallel.py

@@ -32,8 +32,15 @@
         # models, you may need to re-serialize those models with
         # scikit-learn 0.21+."
         warnings.simplefilter('ignore', DeprecationWarning)
+        # sklearn 0.22 has switched from DeprecationWarning to FutureWarning
+        warnings.simplefilter('ignore', FutureWarning)
         from sklearn.externals.joblib import (
             register_parallel_backend as _sklearn_reg_para_backend)
+
+        # NO_SKLEARN_BACKEND would be a better name here since it'll be true
+        # for future scikit-learn versions that won't include the joblib
+        # module as well as when scikit-learn isn't installed, but changing
+        # the name would technically be a breaking change.
         NO_SKLEARN = False
 except ImportError:
     NO_SKLEARN = True

civis/run_joblib_func.py

@@ -14,6 +14,7 @@
 import os
 import pickle
 import sys
+import warnings
 
 import civis
 import cloudpickle
@@ -22,9 +23,24 @@
 from joblib import parallel_backend as _joblib_para_backend
 
 try:
-    from sklearn.externals.joblib import (
-        parallel_backend as _sklearn_para_backend)
-    NO_SKLEARN = False
+    with warnings.catch_warnings():
+        # Ignore the warning: "DeprecationWarning: sklearn.externals.joblib is
+        # deprecated in 0.21 and will be removed in 0.23. Please import this
+        # functionality directly from joblib, which can be installed with:
+        # pip install joblib. If this warning is raised when loading pickled
+        # models, you may need to re-serialize those models with
+        # scikit-learn 0.21+."
+        warnings.simplefilter('ignore', DeprecationWarning)
+        # sklearn 0.22 has switched from DeprecationWarning to FutureWarning
+        warnings.simplefilter('ignore', FutureWarning)
+        from sklearn.externals.joblib import (
+            parallel_backend as _sklearn_para_backend)
+
+        # NO_SKLEARN_BACKEND would be a better name here since it'll be true
+        # for future scikit-learn versions that won't include the joblib
+        # module as well as when scikit-learn isn't installed, but changing
+        # the name would technically be a breaking change.
+        NO_SKLEARN = False
 except ImportError:
     NO_SKLEARN = True