scikit-learn · amueller · Sep 24, 2018 · Aug 30, 2018 · Aug 30, 2018 · Aug 30, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,13 +41,12 @@ jobs:
       # Test examples run with minimal dependencies
       - MINICONDA_PATH: ~/miniconda
       - CONDA_ENV_NAME: testenv
-      - PYTHON_VERSION: 2
-      - NUMPY_VERSION: 1.8.2
-      # XXX: plot_gpc_xor.py fails with scipy 0.13.3
-      - SCIPY_VERSION: 0.14
-      - MATPLOTLIB_VERSION: 1.3
-      - SCIKIT_IMAGE_VERSION: 0.9.3
-      - PANDAS_VERSION: 0.13.1
+      - PYTHON_VERSION: "2"
+      - NUMPY_VERSION: "1.10"
+      - SCIPY_VERSION: "0.16"
+      - MATPLOTLIB_VERSION: "1.4"
+      - SCIKIT_IMAGE_VERSION: "0.11"
+      - PANDAS_VERSION: "0.17.1"
     steps:
       - checkout
       - run: ./build_tools/circle/checkout_merge_commit.sh
@@ -65,6 +64,21 @@ jobs:
           path: ~/log.txt
           destination: log.txt
 
+  pypy3:
+    docker:
+      - image: pypy:3-6.0.0
+    steps:
+      - restore_cache:
+          keys:
+            - pypy3-ccache-{{ .Branch }}
+            - pypy3-ccache
+      - checkout
+      - run: ./build_tools/circle/build_test_pypy.sh
+      - save_cache:
+          key: pypy3-ccache-{{ .Branch }}-{{ .BuildNum }}
+          paths:
+            - ~/.ccache
+            - ~/.cache/pip
 
   deploy:
     docker:
@@ -89,6 +103,21 @@ workflows:
     jobs:
       - python3
       - python2
+      - pypy3:
+          filters:
+            branches:
+              only:
+                - 0.20.X
       - deploy:
           requires:
             - python3
+  pypy:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      - pypy3
diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,7 @@ matrix:
            CYTHON_VERSION="*" PYAMG_VERSION="*" PILLOW_VERSION="*"
            JOBLIB_VERSION="*" COVERAGE=true
            CHECK_PYTEST_SOFT_DEPENDENCY="true" TEST_DOCSTRINGS="true"
-           SKLEARN_SITE_JOBLIB=1
+           SKLEARN_SITE_JOBLIB=1 CHECK_WARNINGS="true"
       if: type != cron
     # flake8 linting on diff wrt common ancestor with upstream/master
     - env: RUN_FLAKE8="true" SKIP_TESTS="true"
@@ -58,7 +58,7 @@ matrix:
     # installed from their CI wheels in a virtualenv with the Python
     # interpreter provided by travis.
     -  python: 3.6
-       env: DISTRIB="scipy-dev"
+       env: DISTRIB="scipy-dev" CHECK_WARNINGS="true"
        if: type = cron OR commit_message =~ /\[scipy-dev\]/
 
 install: source build_tools/travis/install.sh

diff --git a/AUTHORS.rst b/AUTHORS.rst
diff --git a/README.rst b/README.rst
@@ -56,8 +56,8 @@ scikit-learn requires:
 **Scikit-learn 0.20 is the last version to support Python2.7.**
 Scikit-learn 0.21 and later will require Python 3.5 or newer.
 
-For running the examples Matplotlib >= 1.3.1 is required. A few examples
-require scikit-image >= 0.9.3 and a few examples require pandas >= 0.13.1.
+For running the examples Matplotlib >= 1.4 is required. A few examples
+require scikit-image >= 0.11.3 and a few examples require pandas >= 0.17.1.
 
 scikit-learn also uses CBLAS, the C interface to the Basic Linear Algebra
 Subprograms library. scikit-learn comes with a reference implementation, but
@@ -120,7 +120,7 @@ Testing
 ~~~~~~~
 
 After installation, you can launch the test suite from outside the
-source directory (you will need to have the ``pytest`` package installed)::
+source directory (you will need to have ``pytest`` >= 3.3.0 installed)::
 
     pytest sklearn
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -20,6 +20,7 @@ environment:
     - PYTHON: "C:\\Python37-x64"
       PYTHON_VERSION: "3.7.0"
       PYTHON_ARCH: "64"
+      CHECK_WARNINGS: "true"
 
     - PYTHON: "C:\\Python27"
       PYTHON_VERSION: "2.7.8"
@@ -72,7 +73,13 @@ test_script:
   # installed library.
   - mkdir "../empty_folder"
   - cd "../empty_folder"
-  - pytest --showlocals --durations=20 --pyargs sklearn
+  - ps: >-
+        if (Test-Path variable:global:CHECK_WARNINGS) {
+            $env:PYTEST_ARGS = "-Werror::DeprecationWarning -Werror::FutureWarning"
+        } else {
+            $env:PYTEST_ARGS = ""
+        }
+  - "pytest --showlocals --durations=20 %PYTEST_ARGS% --pyargs sklearn"
   # Move back to the project folder
   - cd "../scikit-learn"
 

diff --git a/build_tools/Makefile b/build_tools/Makefile
@@ -0,0 +1,4 @@
+# Makefile for maintenance tools
+
+authors:
+	python generate_authors_table.py > ../doc/authors.rst
diff --git a/build_tools/circle/build_test_pypy.sh b/build_tools/circle/build_test_pypy.sh
@@ -18,13 +18,16 @@ source pypy-env/bin/activate
 python --version
 which python
 
-pip install --extra-index https://antocuni.github.io/pypy-wheels/ubuntu numpy==1.14.4 Cython pytest
+pip install --extra-index https://antocuni.github.io/pypy-wheels/ubuntu numpy Cython pytest
 pip install "scipy>=1.1.0" sphinx numpydoc docutils
 
 ccache -M 512M
 export CCACHE_COMPRESS=1
 export PATH=/usr/lib/ccache:$PATH
+export LOKY_MAX_CPU_COUNT="2"
 
-pip install -e .
+pip install -vv -e . 
 
-make test
+python -m pytest sklearn/
+python -m pytest doc/sphinxext/
+python -m pytest $(find doc -name '*.rst' | sort)
diff --git a/build_tools/generate_authors_table.py b/build_tools/generate_authors_table.py
@@ -0,0 +1,117 @@
+"""
+This script generates an html table of contributors, with names and avatars.
+The list is generated from scikit-learn's teams on GitHub, plus a small number
+of hard-coded contributors.
+
+The table should be updated for each new inclusion in the teams.
+Generating the table requires admin rights.
+"""
+from __future__ import print_function
+
+import sys
+import requests
+import getpass
+
+try:
+    # With authentication: up to 5000 requests per hour.
+    print("user:", file=sys.stderr)
+    user = input()
+    passwd = getpass.getpass()
+    auth = (user, passwd)
+except IndexError:
+    # Without authentication: up to 60 requests per hour.
+    auth = None
+
+ROW_SIZE = 7
+LOGO_URL = 'https://avatars2.githubusercontent.com/u/365630?v=4'
+
+
+def group_iterable(iterable, size):
+    """Group iterable into lines"""
+    group = []
+    for element in iterable:
+        group.append(element)
+        if len(group) == size:
+            yield group
+            group = []
+    if len(group) != 0:
+        yield group
+
+
+def get_contributors():
+    """Get the list of contributor profiles. Require admin rights."""
+    # get members of scikit-learn teams on GitHub
+    members = []
+    for team in [11523, 33471]:
+        for page in [1, 2]:  # 30 per page
+            members.extend(requests.get(
+                "https://api.github.com/teams/%d/members?page=%d"
+                % (team, page), auth=auth).json())
+
+    # keep only the logins
+    logins = [c['login'] for c in members]
+    # add missing contributors with GitHub accounts
+    logins.extend(['dubourg', 'jarrodmillman', 'mbrucher', 'thouis'])
+    # add missing contributors without GitHub accounts
+    logins.extend(['Angel Soler Gollonet'])
+    # remove duplicate
+    logins = set(logins)
+    # remove CI
+    logins.remove('sklearn-ci')
+
+    # get profiles from GitHub
+    profiles = [get_profile(login) for login in logins]
+    # sort by last name
+    profiles = sorted(profiles, key=key)
+
+    return profiles
+
+
+def get_profile(login):
+    """Get the GitHub profile from login"""
+    profile = requests.get("https://api.github.com/users/%s" % login,
+                           auth=auth).json()
+    if 'name' not in profile:
+        # default profile if the login does not exist
+        return dict(name=login, avatar_url=LOGO_URL, html_url="")
+    else:
+        if profile["name"] is None:
+            profile["name"] = profile["login"]
+
+        # fix missing names
+        missing_names = {'bthirion': 'Bertrand Thirion',
+                         'dubourg': 'Vincent Dubourg',
+                         'Duchesnay': 'Edouard Duchesnay',
+                         'Lars': 'Lars Buitinck',
+                         'MechCoder': 'Manoj Kumar'}
+        if profile["name"] in missing_names:
+            profile["name"] = missing_names[profile["name"]]
+        return profile
+
+
+def key(profile):
+    """Get the last name in lower case"""
+    return profile["name"].split(' ')[-1].lower()
+
+
+contributors = get_contributors()
+
+print(".. raw :: html\n")
+print("    <!-- Generated by gen_authors.py -->")
+print("    <table>")
+print("    <col style='width:%d%%' span='%d'>"
+      % (int(100 / ROW_SIZE), ROW_SIZE))
+print("    <style>")
+print("      img.avatar {border-radius: 10px;}")
+print("      td {vertical-align: top;}")
+print("    </style>")
+for row in group_iterable(contributors, size=ROW_SIZE):
+    print("    <tr>")
+    for contributor in row:
+        print("    <td>")
+        print("    <a href='%s'><img src='%s' class='avatar' /></a> <br />"
+              % (contributor["html_url"], contributor["avatar_url"]))
+        print("    <p>%s</p>" % contributor["name"])
+        print("    </td>")
+    print("    </tr>")
+print("    </table>")
diff --git a/build_tools/travis/test_script.sh b/build_tools/travis/test_script.sh
@@ -38,6 +38,13 @@ run_tests() {
     if [[ "$COVERAGE" == "true" ]]; then
         TEST_CMD="$TEST_CMD --cov sklearn"
     fi
+
+    if [[ -n "$CHECK_WARNINGS" ]]; then
+        TEST_CMD="$TEST_CMD -Werror::DeprecationWarning -Werror::FutureWarning"
+    fi
+
+    set -x  # print executed commands to the terminal
+
     $TEST_CMD sklearn
 
     # Going back to git checkout folder needed to test documentation