Merge branch 'master' into NarrowingTypeLen

Author: hatal175

.github/workflows/mypy_primer.yml

@@ -13,6 +13,8 @@ jobs:
   mypy_primer:
     name: Run
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     strategy:
       matrix:
         shard-index: [0, 1, 2]
@@ -48,10 +50,20 @@ jobs:
             --num-shards 3 --shard-index ${{ matrix.shard-index }} \
             --debug \
             --output concise \
-            | tee diff.txt
+            | tee diff_${{ matrix.shard-index }}.txt
           ) || [ $? -eq 1 ]
       - name: Upload mypy_primer diff
         uses: actions/upload-artifact@v2
         with:
-          name: mypy_primer_diff_${{ matrix.shard-index }}
-          path: diff.txt
+          name: mypy_primer_diffs
+          path: diff_${{ matrix.shard-index }}.txt
+      - if: ${{ matrix.shard-index }} == 0
+        name: Save PR number
+        run: |
+          echo ${{ github.event.pull_request.number }} | tee pr_number.txt
+      - if: ${{ matrix.shard-index }} == 0
+        name: Upload PR number
+        uses: actions/upload-artifact@v2
+        with:
+          name: mypy_primer_diffs
+          path: pr_number.txt

.github/workflows/mypy_primer_comment.yml

@@ -1,104 +1,99 @@
 name: Comment with mypy_primer diff
 
 on:
-  # pull_request_target gives us access to a write token which we need to post a comment
-  # The presence of a write token means that we can't run any untrusted code (i.e. malicious PRs),
-  # which is why this its own workflow. Github Actions doesn't make it easy for workflows to talk to
-  # each other, so the approach here is to poll for workflow runs, find the mypy_primer run for our
-  # commit, wait till it's completed, and download and post the diff.
-  pull_request_target:
-    paths-ignore:
-    - 'docs/**'
-    - '**/*.rst'
-    - '**/*.md'
-    - 'mypyc/**'
+  workflow_run:
+    workflows:
+      - Run mypy_primer
+    types:
+      - completed
+
+permissions:
+  contents: read
+  pull-requests: write
 
 jobs:
-  mypy_primer:
-    name: Comment
+  comment:
+    name: Comment PR from mypy_primer
     runs-on: ubuntu-latest
     steps:
-      - name: Install dependencies
-        run: npm install adm-zip
-      - name: Post comment
+      - name: Download diffs
         uses: actions/github-script@v3
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const AdmZip = require(`${process.env.GITHUB_WORKSPACE}/node_modules/adm-zip`)
+            const fs = require('fs');
+            const artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{ github.event.workflow_run.id }},
+            });
+            const [matchArtifact] = artifacts.data.artifacts.filter((artifact) =>
+              artifact.name == "mypy_primer_diffs");
 
-            // Because of pull_request_target, context.sha is the PR base branch
-            // So we need to ask Github for the SHA of the PR's head commit
-            const pull_request = await github.pulls.get({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.issue.number,
-            })
-            const pr_commit_sha = pull_request.data.head.sha
-            console.log("Looking for mypy_primer run for commit:", pr_commit_sha)
+            const download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: "zip",
+            });
+            fs.writeFileSync("diff.zip", Buffer.from(download.data));
 
-            // Find the mypy_primer run for our commit and wait till it's completed
-            // We wait up to an hour before timing out
-            async function check_mypy_primer() {
-              // We're only looking at the first page, so in theory if we open enough PRs around
-              // the same time, this will fail to find the run.
-              const response = await github.actions.listWorkflowRuns({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                workflow_id: "mypy_primer.yml",
-              })
-              if (response) {
-                return response.data.workflow_runs.find(run => run.head_sha == pr_commit_sha)
-              }
-              return undefined
-            }
+      - run: unzip diff.zip
 
-            const end_time = Number(new Date()) + 60 * 60 * 1000
-            let primer_run = await check_mypy_primer()
-            while (!primer_run || primer_run.status != "completed") {
-              if (Number(new Date()) > end_time) {
-                throw Error("Timed out waiting for mypy_primer")
-              }
-              console.log("Waiting for mypy_primer to complete...")
-              await new Promise(r => setTimeout(r, 10000))
-              primer_run = await check_mypy_primer()
-            }
-            console.log("Found mypy_primer run!")
-            console.log(primer_run)
+      # Based on https://github.com/kanga333/comment-hider
+      - name: Hide old comments
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const fs = require('fs')
 
-            // Download artifact(s) from the run
-            const artifacts = await github.actions.listWorkflowRunArtifacts({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                run_id: primer_run.id,
+            const response = await github.issues.listComments({
+              issue_number: fs.readFileSync("pr_number.txt", { encoding: "utf8" }),
+              owner: context.repo.owner,
+              repo: context.repo.repo,
             })
-            const filtered_artifacts = artifacts.data.artifacts.filter(
-              a => a.name.startsWith("mypy_primer_diff")
-            )
-            console.log("Artifacts from mypy_primer:")
-            console.log(filtered_artifacts)
+            const botCommentIds = response.data
+              .filter(comment => comment.user.login === 'github-actions[bot]')
+              .map(comment => comment.node_id)
 
-            async function get_artifact_data(artifact) {
-              const zip = await github.actions.downloadArtifact({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  artifact_id: artifact.id,
-                  archive_format: "zip",
-              })
-              const adm = new AdmZip(Buffer.from(zip.data))
-              return adm.readAsText(adm.getEntry("diff.txt"))
+            for (const id of botCommentIds) {
+              const resp = await github.graphql(`
+                mutation {
+                  minimizeComment(input: {classifier: OUTDATED, subjectId: "${id}"}) {
+                    minimizedComment {
+                      isMinimized
+                    }
+                  }
+                }
+              `)
+              if (resp.errors) {
+                throw new Error(resp.errors)
+              }
             }
 
-            const all_data = await Promise.all(filtered_artifacts.map(get_artifact_data))
-            const data = all_data.join("\n")
+      - name: Post comment
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const fs = require('fs')
+            // Keep in sync with shards produced by mypy_primer workflow
+            const data = (
+              ['diff_0.txt', 'diff_1.txt', 'diff_2.txt']
+              .map(fileName => fs.readFileSync(fileName, { encoding: 'utf8' }))
+              .join('')
+              .substr(0, 30000)  // About 300 lines
+            )
 
             console.log("Diff from mypy_primer:")
             console.log(data)
+
             if (data.trim()) {
+              const body = 'Diff from [mypy_primer](https://github.com/hauntsaninja/mypy_primer), showing the effect of this PR on open source code:\n```diff\n' + data + '```'
               await github.issues.createComment({
-                issue_number: context.issue.number,
+                issue_number: fs.readFileSync("pr_number.txt", { encoding: "utf8" }),
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                body: 'Diff from [mypy_primer](https://github.com/hauntsaninja/mypy_primer), showing the effect of this PR on open source code:\n```diff\n' + data + '```'
+                body
               })
             }

.github/workflows/test.yml

@@ -40,7 +40,7 @@ jobs:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.arch }}
     - name: install tox
-      run: pip install --upgrade 'setuptools!=50' 'virtualenv<20' tox==3.20.1
+      run: pip install --upgrade 'setuptools!=50' 'virtualenv<16.7.11' tox==3.20.1
     - name: setup tox environment
       run: tox -e ${{ matrix.toxenv }} --notest
     - name: test

.travis.yml

@@ -85,7 +85,7 @@ jobs:
 install:
 # pip 21.0 no longer works on Python 3.5
 - pip install -U pip==20.3.4 setuptools
-- pip install -U 'virtualenv<20'
+- pip install -U 'virtualenv<16.7.11'
 - pip install -U tox==3.20.1
 - python2 -m pip install --user -U typing
 - tox --notest

LICENSE

@@ -4,7 +4,7 @@ Mypy (and mypyc) are licensed under the terms of the MIT license, reproduced bel
 
 The MIT License
 
-Copyright (c) 2015-2019 Jukka Lehtosalo and contributors
+Copyright (c) 2015-2021 Jukka Lehtosalo and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

MANIFEST.in

@@ -3,6 +3,7 @@
 
 # stubs
 prune mypy/typeshed
+include mypy/typeshed/LICENSE
 include mypy/typeshed/stdlib/VERSIONS
 recursive-include mypy/typeshed *.pyi
 

build-requirements.txt

@@ -1,4 +1,2 @@
 -r mypy-requirements.txt
 types-typed-ast>=1.4.0,<1.5.0
-types-toml>=0.0
-types-enum34>=0.0; python_version == '3.5'

docs/source/class_basics.rst

@@ -127,12 +127,6 @@ particular attribute should not be set on instances:
   a.x = 1  # Error: Cannot assign to class variable "x" via instance
   print(a.x)  # OK -- can be read through an instance
 
-.. note::
-
-   If you need to support Python 3 versions 3.5.2 or earlier, you have
-   to import ``ClassVar`` from ``typing_extensions`` instead (available on
-   PyPI). If you use Python 2.7, you can import it from ``typing``.
-
 It's not necessary to annotate all class variables using
 :py:data:`~typing.ClassVar`. An attribute without the :py:data:`~typing.ClassVar` annotation can
 still be used as a class variable. However, mypy won't prevent it from

docs/source/command_line.rst

@@ -58,12 +58,20 @@ for full details, see :ref:`running-mypy`.
     For instance, to avoid discovering any files named `setup.py` you could
     pass ``--exclude '/setup\.py$'``. Similarly, you can ignore discovering
     directories with a given name by e.g. ``--exclude /build/`` or
-    those matching a subpath with ``--exclude /project/vendor/``.
+    those matching a subpath with ``--exclude /project/vendor/``. To ignore
+    multiple files / directories / paths, you can combine expressions with
+    ``|``, e.g ``--exclude '/setup\.py$|/build/'``.
 
-    Note that this flag only affects recursive discovery, that is, when mypy is
-    discovering files within a directory tree or submodules of a package to
-    check. If you pass a file or module explicitly it will still be checked. For
-    instance, ``mypy --exclude '/setup.py$' but_still_check/setup.py``.
+    Note that this flag only affects recursive directory tree discovery, that
+    is, when mypy is discovering files within a directory tree or submodules of
+    a package to check. If you pass a file or module explicitly it will still be
+    checked. For instance, ``mypy --exclude '/setup.py$'
+    but_still_check/setup.py``.
+
+    In particular, ``--exclude`` does not affect mypy's :ref:`import following
+    <follow-imports>`. You can use a per-module :confval:`follow_imports` config
+    option to additionally avoid mypy from following imports and checking code
+    you do not wish to be checked.
 
     Note that mypy will never recursively discover files and directories named
     "site-packages", "node_modules" or "__pycache__", or those whose name starts
@@ -687,6 +695,14 @@ in error messages.
 
     Show absolute paths to files.
 
+.. option:: --soft-error-limit N
+
+    This flag will adjust the limit after which mypy will (sometimes)
+    disable reporting most additional errors. The limit only applies
+    if it seems likely that most of the remaining errors will not be
+    useful or they may be overly noisy. If ``N`` is negative, there is
+    no limit. The default limit is 200.
+
 
 .. _incremental:
 
@@ -876,8 +892,11 @@ Miscellaneous
 
     This flag causes mypy to install known missing stub packages for
     third-party libraries using pip.  It will display the pip command
-    line to run, and expects a confirmation before installing
-    anything.
+    that will be run, and expects a confirmation before installing
+    anything. For security reasons, these stubs are limited to only a
+    small subset of manually selected packages that have been
+    verified by the typeshed team. These packages include only stub
+    files and no executable code.
 
     If you use this option without providing any files or modules to
     type check, mypy will install stub packages suggested during the
@@ -889,8 +908,22 @@ Miscellaneous
     .. note::
 
         This is new in mypy 0.900. Previous mypy versions included a
-        selection of third-party package stubs, instead of having them
-        installed separately.
+        selection of third-party package stubs, instead of having
+        them installed separately.
+
+.. option:: --non-interactive
+
+   When used together with :option:`--install-types <mypy
+   --install-types>`, this causes mypy to install all suggested stub
+   packages using pip without asking for confirmation, and then
+   continues to perform type checking using the installed stubs, if
+   some files or modules are provided to type check.
+
+   This is implemented as up to two mypy runs internally. The first run
+   is used to find missing stub packages, and output is shown from
+   this run only if no missing stub packages were found. If missing
+   stub packages were found, they are installed and then another run
+   is performed.
 
 .. option:: --junit-xml JUNIT_XML
 

docs/source/common_issues.rst

@@ -14,7 +14,7 @@ Can't install mypy using pip
 
 If installation fails, you've probably hit one of these issues:
 
-* Mypy needs Python 3.5 or later to run.
+* Mypy needs Python 3.6 or later to run.
 * You may have to run pip like this:
   ``python3 -m pip install mypy``.
 
@@ -428,8 +428,8 @@ More specifically, mypy will understand the use of :py:data:`sys.version_info` a
    import sys
 
    # Distinguishing between different versions of Python:
-   if sys.version_info >= (3, 5):
-       # Python 3.5+ specific definitions and imports
+   if sys.version_info >= (3, 8):
+       # Python 3.8+ specific definitions and imports
    elif sys.version_info[0] >= 3:
        # Python 3 specific definitions and imports
    else: