From e05f413f7483d6df19fbe2647d8ea6c3de492fb9 Mon Sep 17 00:00:00 2001
From: Nicolas Hug <contact@nicolas-hug.com>
Date: Thu, 17 Oct 2019 15:18:21 -0400
Subject: [PATCH] Make files private in cross_decomposition

---
 .gitignore                                        | 3 +++
 sklearn/_build_utils/deprecated_modules.py        | 5 +++++
 sklearn/cross_decomposition/__init__.py           | 6 ++++--
 sklearn/cross_decomposition/{cca_.py => _cca_.py} | 2 +-
 sklearn/cross_decomposition/{pls_.py => _pls_.py} | 0
 sklearn/cross_decomposition/tests/test_pls.py     | 3 ++-
 sklearn/tests/test_import_deprecations.py         | 3 +++
 7 files changed, 18 insertions(+), 4 deletions(-)
 rename sklearn/cross_decomposition/{cca_.py => _cca_.py} (99%)
 rename sklearn/cross_decomposition/{pls_.py => _pls_.py} (100%)

diff --git a/.gitignore b/.gitignore
index ad35460f795f8..e14733db04555 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,6 @@ sklearn/cluster/spectral.py
 sklearn/mixture/base.py
 sklearn/mixture/gaussian_mixture.py
 sklearn/mixture/bayesian_mixture.py
+
+sklearn/cross_decomposition/cca_.py
+sklearn/cross_decomposition/pls_.py
diff --git a/sklearn/_build_utils/deprecated_modules.py b/sklearn/_build_utils/deprecated_modules.py
index 241fa41e76e1b..4900476eb1091 100644
--- a/sklearn/_build_utils/deprecated_modules.py
+++ b/sklearn/_build_utils/deprecated_modules.py
@@ -40,6 +40,11 @@
      'sklearn.mixture'),
     ('_bayesian_mixture', 'sklearn.mixture.bayesian_mixture',
      'sklearn.mixture'),
+
+    ('_cca_', 'sklearn.cross_decomposition.cca_',
+     'sklearn.cross_decomposition'),
+    ('_pls_', 'sklearn.cross_decomposition.pls_',
+     'sklearn.cross_decomposition'),
 }
 
 _FILE_CONTENT_TEMPLATE = """
diff --git a/sklearn/cross_decomposition/__init__.py b/sklearn/cross_decomposition/__init__.py
index 11e7ee1d0bef7..9cdf7fd5c2881 100644
--- a/sklearn/cross_decomposition/__init__.py
+++ b/sklearn/cross_decomposition/__init__.py
@@ -1,2 +1,4 @@
-from .pls_ import *  # noqa
-from .cca_ import *  # noqa
+from ._pls_ import PLSCanonical, PLSRegression, PLSSVD
+from ._cca_ import CCA
+
+__all__ = ['PLSCanonical', 'PLSRegression', 'PLSSVD', 'CCA']
diff --git a/sklearn/cross_decomposition/cca_.py b/sklearn/cross_decomposition/_cca_.py
similarity index 99%
rename from sklearn/cross_decomposition/cca_.py
rename to sklearn/cross_decomposition/_cca_.py
index 658ba1fa7e91f..b82eaa6713c45 100644
--- a/sklearn/cross_decomposition/cca_.py
+++ b/sklearn/cross_decomposition/_cca_.py
@@ -1,4 +1,4 @@
-from .pls_ import _PLS
+from ._pls_ import _PLS
 from ..base import _UnstableArchMixin
 
 __all__ = ['CCA']
diff --git a/sklearn/cross_decomposition/pls_.py b/sklearn/cross_decomposition/_pls_.py
similarity index 100%
rename from sklearn/cross_decomposition/pls_.py
rename to sklearn/cross_decomposition/_pls_.py
diff --git a/sklearn/cross_decomposition/tests/test_pls.py b/sklearn/cross_decomposition/tests/test_pls.py
index ecbe06df14bb3..a5993dea87c14 100644
--- a/sklearn/cross_decomposition/tests/test_pls.py
+++ b/sklearn/cross_decomposition/tests/test_pls.py
@@ -6,7 +6,8 @@
                                    assert_array_equal, assert_raise_message,
                                    assert_warns)
 from sklearn.datasets import load_linnerud
-from sklearn.cross_decomposition import pls_, CCA
+from sklearn.cross_decomposition import _pls_ as pls_
+from sklearn.cross_decomposition import CCA
 from sklearn.preprocessing import StandardScaler
 from sklearn.utils import check_random_state
 from sklearn.exceptions import ConvergenceWarning
diff --git a/sklearn/tests/test_import_deprecations.py b/sklearn/tests/test_import_deprecations.py
index 98cabd494e588..abf1234aae3f5 100644
--- a/sklearn/tests/test_import_deprecations.py
+++ b/sklearn/tests/test_import_deprecations.py
@@ -43,6 +43,9 @@
     ('sklearn.mixture.base', 'BaseMixture'),
     ('sklearn.mixture.bayesian_mixture', 'BayesianGaussianMixture'),
     ('sklearn.mixture.gaussian_mixture', 'GaussianMixture'),
+
+    ('sklearn.cross_decomposition.pls_', 'PLSSVD'),
+    ('sklearn.cross_decomposition.cca_', 'CCA'),
 ))
 def test_import_is_deprecated(deprecated_path, importee):
     # Make sure that "from deprecated_path import importee" is still possible