arka204 · arka204 · Jun 8, 2020 · May 23, 2020 · May 23, 2020 · May 24, 2020
diff --git a/.codecov.yml b/.codecov.yml
@@ -12,11 +12,8 @@ coverage:
       default:
         # Be tolerant on slight code coverage diff on PRs to limit
         # noisy red coverage status on github PRs.
-        # Note The coverage stats are still uploaded
+        # Note: The coverage stats are still uploaded
         # to codecov so that PR reviewers can see uncovered lines
-        # in the github diff if they install the codecov browser
-        # extension:
-        # https://github.com/codecov/browser-extension
         target: auto
         threshold: 1%
 

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -8,6 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: thomasjpfan/labeler@v2.4.6
+      continue-on-error: true
       if: github.repository == 'scikit-learn/scikit-learn'
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/.gitignore b/.gitignore
@@ -77,157 +77,3 @@ _configtest.o.d
 sklearn/utils/_seq_dataset.pyx
 sklearn/utils/_seq_dataset.pxd
 sklearn/linear_model/_sag_fast.pyx
-
-# deprecated paths
-# TODO: Remove in 0.24
-# All of these files should have a match in _build_utils/deprecated_modules.py
-sklearn/utils/mocking.py
-
-sklearn/ensemble/bagging.py
-sklearn/ensemble/base.py
-sklearn/ensemble/forest.py
-sklearn/ensemble/gradient_boosting.py
-sklearn/ensemble/iforest.py
-sklearn/ensemble/stacking.py
-sklearn/ensemble/voting.py
-sklearn/ensemble/weight_boosting.py
-sklearn/tree/export.py
-sklearn/tree/tree.py
-
-sklearn/neural_network/rbm.py
-sklearn/neural_network/multilayer_perceptron.py
-
-sklearn/utils/weight_vector.py
-sklearn/utils/seq_dataset.py
-sklearn/utils/fast_dict.py
-sklearn/utils/testing.py
-
-sklearn/cluster/affinity_propagation_.py
-sklearn/cluster/bicluster.py
-sklearn/cluster/birch.py
-sklearn/cluster/dbscan_.py
-sklearn/cluster/hierarchical.py
-sklearn/cluster/k_means_.py
-sklearn/cluster/mean_shift_.py
-sklearn/cluster/optics_.py
-sklearn/cluster/spectral.py
-
-sklearn/mixture/base.py
-sklearn/mixture/gaussian_mixture.py
-sklearn/mixture/bayesian_mixture.py
-
-sklearn/covariance/elliptic_envelope.py
-sklearn/covariance/empirical_covariance_.py
-sklearn/covariance/graph_lasso_.py
-sklearn/covariance/robust_covariance.py
-sklearn/covariance/shrunk_covariance_.py
-
-sklearn/cross_decomposition/cca_.py
-sklearn/cross_decomposition/pls_.py
-
-sklearn/svm/base.py
-sklearn/svm/classes.py
-sklearn/svm/bounds.py
-sklearn/svm/libsvm.py
-sklearn/svm/libsvm_sparse.py
-sklearn/svm/liblinear.py
-
-sklearn/decomposition/base.py
-sklearn/decomposition/dict_learning.py
-sklearn/decomposition/cdnmf_fast.py
-sklearn/decomposition/factor_analysis.py
-sklearn/decomposition/fastica_.py
-sklearn/decomposition/incremental_pca.py
-sklearn/decomposition/kernel_pca.py
-sklearn/decomposition/nmf.py
-sklearn/decomposition/online_lda.py
-sklearn/decomposition/online_lda_fast.py
-sklearn/decomposition/pca.py
-sklearn/decomposition/sparse_pca.py
-sklearn/decomposition/truncated_svd.py
-
-sklearn/gaussian_process/gpr.py
-sklearn/gaussian_process/gpc.py
-
-sklearn/datasets/base.py
-sklearn/datasets/california_housing.py
-sklearn/datasets/covtype.py
-sklearn/datasets/kddcup99.py
-sklearn/datasets/lfw.py
-sklearn/datasets/olivetti_faces.py
-sklearn/datasets/openml.py
-sklearn/datasets/rcv1.py
-sklearn/datasets/samples_generator.py
-sklearn/datasets/species_distributions.py
-sklearn/datasets/svmlight_format.py
-sklearn/datasets/twenty_newsgroups.py
-
-sklearn/feature_extraction/dict_vectorizer.py
-sklearn/feature_extraction/hashing.py
-sklearn/feature_extraction/stop_words.py
-
-sklearn/linear_model/base.py
-sklearn/linear_model/bayes.py
-sklearn/linear_model/cd_fast.py
-sklearn/linear_model/coordinate_descent.py
-sklearn/linear_model/huber.py
-sklearn/linear_model/least_angle.py
-sklearn/linear_model/logistic.py
-sklearn/linear_model/omp.py
-sklearn/linear_model/passive_aggressive.py
-sklearn/linear_model/perceptron.py
-sklearn/linear_model/ransac.py
-sklearn/linear_model/ridge.py
-sklearn/linear_model/sag.py
-sklearn/linear_model/sag_fast.py
-sklearn/linear_model/sgd_fast.py
-sklearn/linear_model/stochastic_gradient.py
-sklearn/linear_model/theil_sen.py
-
-sklearn/metrics/cluster/bicluster.py
-sklearn/metrics/cluster/supervised.py
-sklearn/metrics/cluster/unsupervised.py
-sklearn/metrics/cluster/expected_mutual_info_fast.py
-
-sklearn/metrics/base.py
-sklearn/metrics/classification.py
-sklearn/metrics/regression.py
-sklearn/metrics/ranking.py
-sklearn/metrics/pairwise_fast.py
-sklearn/metrics/scorer.py
-
-sklearn/inspection/partial_dependence.py
-sklearn/inspection/permutation_importance.py
-
-sklearn/neighbors/ball_tree.py
-sklearn/neighbors/base.py
-sklearn/neighbors/classification.py
-sklearn/neighbors/dist_metrics.py
-sklearn/neighbors/graph.py
-sklearn/neighbors/kd_tree.py
-sklearn/neighbors/kde.py
-sklearn/neighbors/lof.py
-sklearn/neighbors/nca.py
-sklearn/neighbors/nearest_centroid.py
-sklearn/neighbors/quad_tree.py
-sklearn/neighbors/regression.py
-sklearn/neighbors/typedefs.py
-sklearn/neighbors/unsupervised.py
-
-sklearn/manifold/isomap.py
-sklearn/manifold/locally_linear.py
-sklearn/manifold/mds.py
-sklearn/manifold/spectral_embedding_.py
-sklearn/manifold/t_sne.py
-
-sklearn/semi_supervised/label_propagation.py
-
-sklearn/preprocessing/data.py
-sklearn/preprocessing/label.py
-
-sklearn/feature_selection/base.py
-sklearn/feature_selection/from_model.py
-sklearn/feature_selection/mutual_info.py
-sklearn/feature_selection/rfe.py
-sklearn/feature_selection/univariate_selection.py
-sklearn/feature_selection/variance_threshold.py
diff --git a/Makefile b/Makefile
@@ -18,8 +18,6 @@ clean-ctags:
 clean: clean-ctags
 	$(PYTHON) setup.py clean
 	rm -rf dist
-	# TODO: Remove in when all modules are removed.
-	$(PYTHON) sklearn/_build_utils/deprecated_modules.py
 
 in: inplace # just a shortcut
 inplace:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,35 +13,29 @@ jobs:
   pool:
     vmImage: ubuntu-18.04
   steps:
-    - bash: echo "##vso[task.prependpath]$CONDA/bin"
-      displayName: Add conda to PATH
-    - bash: sudo chown -R $USER $CONDA
-      displayName: Take ownership of conda installation
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '3.8'
     - bash: |
-        set -ex
-        conda create --name flake8_env --yes python=3.8
-        source activate flake8_env
         pip install flake8 mypy==0.770
-      displayName: Install flake8
+      displayName: Install linters
     - bash: |
         set -ex
         if [[ $BUILD_SOURCEVERSIONMESSAGE =~ \[lint\ skip\] ]]; then
           # skip linting
-          echo "Skipping linting"
+          echo "Skipping flake8 linting"
           exit 0
         else
-          source activate flake8_env
           ./build_tools/circle/linting.sh
         fi
       displayName: Run linting
     - bash: |
         set -ex
         if [[ $BUILD_SOURCEVERSIONMESSAGE =~ \[lint\ skip\] ]]; then
           # skip linting
-          echo "Skipping linting"
+          echo "Skipping mypy linting"
           exit 0
         else
-          source activate flake8_env
           mypy sklearn/ --ignore-missing-imports
         fi
       displayName: Run mypy

diff --git a/build_tools/generate_authors_table.py b/build_tools/generate_authors_table.py
@@ -15,8 +15,8 @@
 
 print("user:", file=sys.stderr)
 user = input()
-passwd = getpass.getpass("Password or access token:\n")
-auth = (user, passwd)
+token = getpass.getpass("access token:\n")
+auth = (user, token)
 
 LOGO_URL = 'https://avatars2.githubusercontent.com/u/365630?v=4'
 REPO_FOLDER = Path(path.abspath(__file__)).parent.parent
@@ -38,13 +38,15 @@ def get(url):
 
 def get_contributors():
     """Get the list of contributor profiles. Require admin rights."""
-    # get members of scikit-learn core-dev on GitHub
+    # get core devs and triage team
     core_devs = []
-    team = 11523
-    for page in [1, 2]:  # 30 per page
-        reply = get("https://api.github.com/teams/%d/members?page=%d" %
-                    (team, page))
-        core_devs.extend(reply.json())
+    triage_team = []
+    for team_id, lst in zip((11523, 3593183), (core_devs, triage_team)):
+        for page in [1, 2]:  # 30 per page
+            reply = get(
+                f"https://api.github.com/teams/{team_id}/members?page={page}"
+            )
+            lst.extend(reply.json())
 
     # get members of scikit-learn on GitHub
     members = []
@@ -55,32 +57,31 @@ def get_contributors():
         members.extend(reply.json())
 
     # keep only the logins
-    core_devs = [c['login'] for c in core_devs]
-    members = [c['login'] for c in members]
+    core_devs = set(c['login'] for c in core_devs)
+    triage_team = set(c['login'] for c in triage_team)
+    members = set(c['login'] for c in members)
 
     # add missing contributors with GitHub accounts
-    members.extend(['dubourg', 'mbrucher', 'thouis', 'jarrodmillman'])
+    members |= {'dubourg', 'mbrucher', 'thouis', 'jarrodmillman'}
     # add missing contributors without GitHub accounts
-    members.extend(['Angel Soler Gollonet'])
+    members |= {'Angel Soler Gollonet'}
     # remove CI bots
-    members.remove('sklearn-ci')
-    members.remove('sklearn-lgtm')
-    members.remove('sklearn-wheels')
+    members -= {'sklearn-ci', 'sklearn-lgtm', 'sklearn-wheels'}
+    triage_team -= core_devs  # remove ogrisel from triage_team
 
-    # remove duplicate, and get the difference of the two sets
-    core_devs = set(core_devs)
-    members = set(members)
-    emeritus = members.difference(core_devs)
+    emeritus = members - core_devs - triage_team
 
     # get profiles from GitHub
     core_devs = [get_profile(login) for login in core_devs]
     emeritus = [get_profile(login) for login in emeritus]
+    triage_team = [get_profile(login) for login in triage_team]
 
     # sort by last name
     core_devs = sorted(core_devs, key=key)
     emeritus = sorted(emeritus, key=key)
+    triage_team = sorted(triage_team, key=key)
 
-    return core_devs, emeritus
+    return core_devs, emeritus, triage_team
 
 
 def get_profile(login):
@@ -143,10 +144,13 @@ def generate_list(contributors):
 
 if __name__ == "__main__":
 
-    core_devs, emeritus = get_contributors()
+    core_devs, emeritus, triage_team = get_contributors()
 
     with open(REPO_FOLDER / "doc" / "authors.rst", "w+") as rst_file:
         rst_file.write(generate_table(core_devs))
 
     with open(REPO_FOLDER / "doc" / "authors_emeritus.rst", "w+") as rst_file:
         rst_file.write(generate_list(emeritus))
+
+    with open(REPO_FOLDER / "doc" / "triage_team.rst", "w+") as rst_file:
+        rst_file.write(generate_table(triage_team))
diff --git a/conftest.py b/conftest.py
@@ -13,10 +13,8 @@
 import pytest
 from _pytest.doctest import DoctestItem
 
-from sklearn import set_config
 from sklearn.utils import _IS_32BIT
 from sklearn.externals import _pilutil
-from sklearn._build_utils.deprecated_modules import _DEPRECATED_MODULES
 
 PYTEST_MIN_VERSION = '3.3.0'
 
@@ -97,10 +95,3 @@ def pytest_configure(config):
 def pytest_unconfigure(config):
     import sys
     del sys._is_pytest_session
-
-
-# TODO: Remove when modules are deprecated in 0.24
-# Configures pytest to ignore deprecated modules.
-collect_ignore_glob = [
-    os.path.join(*deprecated_path.split(".")) + ".py"
-    for _, deprecated_path, _, _ in _DEPRECATED_MODULES]
diff --git a/doc/about.rst b/doc/about.rst
@@ -38,6 +38,13 @@ in the FAQ.
 
    :ref:`How you can contribute to the project <contributing>`
 
+Triage Team
+-----------
+The following people are active contributors who also help with triaging
+issues, PRs, and general maintenance:
+
+.. include:: triage_team.rst
+
 Emeritus Core Developers
 ------------------------
 The following people have been active contributors in the past, but are no

diff --git a/doc/authors.rst b/doc/authors.rst
@@ -19,7 +19,7 @@
     </div>
     <div>
     <a href='https://github.com/thomasjpfan'><img src='https://avatars2.githubusercontent.com/u/5402633?v=4' class='avatar' /></a> <br />
-    <p>Thomas J Fan</p>
+    <p>Thomas J. Fan</p>
     </div>
     <div>
     <a href='https://github.com/agramfort'><img src='https://avatars2.githubusercontent.com/u/161052?v=4' class='avatar' /></a> <br />

diff --git a/doc/governance.rst b/doc/governance.rst
@@ -71,10 +71,11 @@ subject to a two-third majority of all cast votes as well as a simple majority
 approval of all the current TC members. TC members who do not actively engage
 with the TC duties are expected to resign.
 
-The initial Technical Committee of scikit-learn consists of :user:`Alexandre Gramfort <agramfort>`,
-:user:`Olivier Grisel <ogrisel>`, :user:`Andreas Müller <amueller>`, :user:`Joel Nothman <jnothman>`,
-:user:`Hanmin Qin <qinhanmin2014>`, :user:`Gaël Varoquaux <GaelVaroquaux>`, and
-:user:`Roman Yurchak <rth>`.
+The Technical Committee of scikit-learn consists of :user:`Alexandre
+Gramfort <agramfort>`, :user:`Olivier Grisel <ogrisel>`, :user:`Adrin Jalali
+<adrinjalali>`, :user:`Andreas Müller <amueller>`, :user:`Joel Nothman
+<jnothman>`, :user:`Hanmin Qin <qinhanmin2014>`, :user:`Gaël Varoquaux
+<GaelVaroquaux>`, and :user:`Roman Yurchak <rth>`.
 
 Decision Making Process
 =======================