scikit-learn · jayasuryajsk · Oct 23, 2021 · Oct 23, 2021 · Oct 23, 2021 · Oct 23, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -53,13 +53,15 @@ jobs:
       - OMP_NUM_THREADS: 2
       - MKL_NUM_THREADS: 2
       - CONDA_ENV_NAME: testenv
-      - PYTHON_VERSION: 3
+      - PYTHON_VERSION: '3.9'
       - NUMPY_VERSION: 'latest'
       - SCIPY_VERSION: 'latest'
       - MATPLOTLIB_VERSION: 'latest'
       - CYTHON_VERSION: 'latest'
       - SCIKIT_IMAGE_VERSION: 'latest'
-      - SPHINX_VERSION: 'min'
+      # Bump the sphinx version from time to time. Avoid latest sphinx version
+      # that tends to break things slightly too often
+      - SPHINX_VERSION: 4.2.0
       - PANDAS_VERSION: 'latest'
       - SPHINX_GALLERY_VERSION: 'latest'
       - NUMPYDOC_VERSION: 'latest'
@@ -109,34 +111,17 @@ jobs:
           name: linting
           command: ./build_tools/circle/linting.sh
 
-  pypy3:
-    docker:
-      - image: condaforge/miniforge3
-    environment:
-      # Avoid the interactive dialog when installing tzdata
-      - DEBIAN_FRONTEND: noninteractive
-    steps:
-      - restore_cache:
-          keys:
-            - pypy3-ccache-{{ .Branch }}
-            - pypy3-ccache
-      - run: apt-get -yq update && apt-get -yq install git ssh
-      - checkout
-      - run: conda init bash && source ~/.bashrc
-      - run: ./build_tools/circle/build_test_pypy.sh
-      - save_cache:
-          key: pypy3-ccache-{{ .Branch }}-{{ .BuildNum }}
-          paths:
-            - ~/.ccache
-            - ~/.cache/pip
-
   linux-arm64:
     machine:
       image: ubuntu-2004:202101-01
     resource_class: arm.medium
     environment:
+      # Use the latest supported version of python
+      - PYTHON_VERSION: '3.9'
       - OMP_NUM_THREADS: 2
       - OPENBLAS_NUM_THREADS: 2
+      - NUMPY_VERSION: 'latest'
+      - SCIPY_VERSION: 'latest'
       - CYTHON_VERSION: 'latest'
       - JOBLIB_VERSION: 'latest'
       - THREADPOOLCTL_VERSION: 'latest'
@@ -147,18 +132,16 @@ jobs:
       - checkout
       - run: ./build_tools/circle/checkout_merge_commit.sh
       - restore_cache:
-          key: v1-datasets-{{ .Branch }}
+          key: linux-arm64-{{ .Branch }}
       - run: ./build_tools/circle/build_test_arm.sh
       - save_cache:
-          key: doc-ccache-{{ .Branch }}-{{ .BuildNum }}
+          key: linux-arm64-{{ .Branch }}
           paths:
-            - ~/.ccache
+            - ~/.cache/ccache
             - ~/.cache/pip
-      - save_cache:
-          key: v1-datasets-{{ .Branch }}
-          paths:
             - ~/scikit_learn_data
-
+            # The source build folder.
+            - ~/project/build
   deploy:
     docker:
       - image: circleci/python:3.7
@@ -187,24 +170,9 @@ workflows:
       - doc-min-dependencies:
           requires:
             - lint
-      - pypy3:
-          filters:
-            branches:
-              only:
-                - 0.20.X
       - deploy:
           requires:
             - doc
-  pypy:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - main
-    jobs:
-      - pypy3
   linux-arm64:
     jobs:
       - linux-arm64
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -16,3 +16,6 @@
 
 # PR 20412: Use experimental_string_processing=true in Black
 3ae7c7615343bbd36acece57825d8b0d70fd9da4
+
+# PR 20502: Runs Black on examples
+70a185ae59b4362633d18b0d0083abb1b6f7370c
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-/doc/whats_new.rst merge=union
+/doc/whats_new/v*.rst merge=union
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: Create a report to help us reproduce and correct the bug
-labels: ['Bug: triage']
+labels: ['Bug', 'Needs Triage']
 
 body:
 - type: markdown
@@ -19,7 +19,7 @@ body:
   attributes:
     label: Steps/Code to Reproduce
     description: |
-      Please add a minimal example that we can reproduce the error by running the code. Be as succinct as possible, do not depend on external data. In short, we are going to copy-paste your code and we expect to get the same result as you. Example:
+      Please add a minimal code example that can reproduce the error when running it. Be as succinct as possible, **do not depend on external data files**: instead you can generate synthetic data using `numpy.random`, [sklearn.datasets.make_regression](https://scikit-learn.org/stable/modules/generated/sklearn.datasets.make_regression.html), [sklearn.datasets.make_classification](https://scikit-learn.org/stable/modules/generated/sklearn.datasets.make_classification.html) or a few lines of Python code. Example:
 
       ```python
       from sklearn.feature_extraction.text import CountVectorizer
@@ -37,6 +37,10 @@ body:
       ```
 
       If the code is too long, feel free to put it in a public gist and link it in the issue: https://gist.github.com.
+
+      In short, **we are going to copy-paste your code** to run it and we expect to get the same result as you.
+
+      We acknowledge that crafting a minimal reproducible code example requires some effort on your side but it really helps the maintainers quickly reproduce the problem and analyze its cause without any ambiguity. Ambiguous bug reports tend to be slower to fix because they will require more effort and back and forth discussion between the maintainers and the reporter to pin-point the precise conditions necessary to reproduce the problem.
     placeholder: |
       ```
       Sample code to reproduce the problem
@@ -55,8 +59,21 @@ body:
 - type: textarea
   attributes:
     label: Actual Results
-    description: >
-      Please paste or describe the results you observe instead of the expected results. If you observe an error, please paste the error message including the **full** traceback of the exception.
+    description: |
+      Please paste or describe the results you observe instead of the expected results. If you observe an error, please paste the error message including the **full traceback** of the exception. For instance the code above raises the following exception:
+
+      ```python-traceback
+      ---------------------------------------------------------------------------
+      TypeError                                 Traceback (most recent call last)
+      <ipython-input-1-a674e682c281> in <module>
+            4 vectorizer = CountVectorizer(input=docs, analyzer='word')
+            5 lda_features = vectorizer.fit_transform(docs)
+      ----> 6 lda_model = LatentDirichletAllocation(
+            7     n_topics=10,
+            8     learning_method='online',
+
+      TypeError: __init__() got an unexpected keyword argument 'n_topics'
+      ```
     placeholder: >
       Please paste or specifically describe the actual output or traceback.
   validations:

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Discussions
     url: https://github.com/scikit-learn/scikit-learn/discussions/new

diff --git a/.github/ISSUE_TEMPLATE/doc_improvement.yml b/.github/ISSUE_TEMPLATE/doc_improvement.yml
@@ -1,6 +1,6 @@
 name: Documentation improvement
 description: Create a report to help us improve the documentation. Alternatively you can just open a pull request with the suggested change.
-labels: [Documentation]
+labels: [Documentation, 'Needs Triage']
 
 body:
 - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a new algorithm, enhancement to an existing algorithm, etc.
-labels: ['New Feature']
+labels: ['New Feature', 'Needs Triage']
 
 body:
 - type: markdown

diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/check-changelog.yml b/.github/workflows/check-changelog.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   check:
+    name: A reviewer will let you know if it is required or can be bypassed
     runs-on: ubuntu-latest
     if: ${{ contains(github.event.pull_request.labels.*.name, 'No Changelog Needed') == 0 }}
     steps:
@@ -18,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: '0'
-      - name: Check the changelog
+      - name: Check the changelog entry
         run: |
           set -xe
           changed_files=$(git diff --name-only origin/main)

diff --git a/.github/workflows/label-blank-issue.yml b/.github/workflows/label-blank-issue.yml
@@ -0,0 +1,14 @@
+name: Labels Blank issues
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  label-blank-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: andymckay/labeler@1.0.4
+        with:
+          add-labels: "Needs Triage"
+          ignore-if-labeled: true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/doc/whats_new.rst merge=union
		/doc/whats_new/v*.rst merge=union