Merge remote-tracking branch 'origin/master' into paramspec

Author: Akuli

.editorconfig

@@ -1,11 +1,11 @@
 root = true
 
-[*.{py,c,cpp,h,rst,md,yml,json}]
+[*.{py,c,cpp,h,rst,md,yml,json,test}]
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 
-[*.{py,c,h,json}]
+[*.{py,c,h,json,test}]
 indent_size = 4
 
 [*.yml]

.github/workflows/docs.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
     - 'docs/**'
+    - 'mypyc/doc/**'
     - '**/*.rst'
     - '**/*.md'
     - CREDITS
@@ -21,9 +22,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.10'
       - name: Install tox
-        run: pip install --upgrade 'setuptools!=50' 'virtualenv<16.7.11' tox==3.20.1
+        run: pip install --upgrade 'setuptools!=50' 'virtualenv>=20.6.0' tox==3.24.5
       - name: Setup tox environment
         run: tox -e ${{ env.TOXENV }} --notest
       - name: Test

.github/workflows/mypy_primer.yml

@@ -8,6 +8,10 @@ on:
     - '**/*.rst'
     - '**/*.md'
     - 'mypyc/**'
+    - 'mypy/stubtest.py'
+    - 'mypy/stubgen.py'
+    - 'mypy/stubgenc.py'
+    - 'mypy/test/**'
 
 jobs:
   mypy_primer:

.github/workflows/mypy_primer_comment.yml

@@ -38,62 +38,44 @@ jobs:
             fs.writeFileSync("diff.zip", Buffer.from(download.data));
 
       - run: unzip diff.zip
-
-      # 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')
-
-            const response = await github.issues.listComments({
-              issue_number: fs.readFileSync("pr_number.txt", { encoding: "utf8" }),
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-            const botCommentIds = response.data
-              .filter(comment => comment.user.login === 'github-actions[bot]')
-              .map(comment => comment.node_id)
-
-            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)
-              }
-            }
+      - run: |
+          cat diff_*.txt | tee fulldiff.txt
 
       - name: Post comment
+        id: post-comment
         uses: actions/github-script@v3
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
+          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
-            )
+            let data = fs.readFileSync('fulldiff.txt', { encoding: 'utf8' })
+            // posting comment fails if too long, so truncate
+            if (data.length > 30000) {
+              data = data.substring(0, 30000) + `\n\n... (truncated ${data.length - 30000} chars) ...\n`
+            }
 
             console.log("Diff from mypy_primer:")
             console.log(data)
 
+            let body
             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: fs.readFileSync("pr_number.txt", { encoding: "utf8" }),
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body
-              })
+              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 + '```'
+            } else {
+              body = 'According to [mypy_primer](https://github.com/hauntsaninja/mypy_primer), this change has no effect on the checked open source code. 🤖🎉'
             }
+            const prNumber = parseInt(fs.readFileSync("pr_number.txt", { encoding: "utf8" }))
+            await github.issues.createComment({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body
+            })
+            return prNumber
+
+      - name: Hide old comments
+        # v0.3.0
+        uses: kanga333/comment-hider@bbdf5b562fbec24e6f60572d8f712017428b92e0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          leave_visible: 1
+          issue_number: ${{ steps.post-comment.outputs.result }}

.github/workflows/test.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     paths-ignore:
     - 'docs/**'
+    - 'mypyc/doc/**'
     - '**/*.rst'
     - '**/*.md'
     - .gitignore
@@ -75,11 +76,16 @@ jobs:
           toxenv: py36
           tox_extra_args: "-n 2 mypyc/test/test_run.py mypyc/test/test_external.py"
           debug_build: true
-        - name: Type check our own code
+        - name: Type check our own code (py37-ubuntu)
           python: '3.7'
           arch: x64
           os: ubuntu-latest
           toxenv: type
+        - name: Type check our own code (py37-windows-64)
+          python: '3.7'
+          arch: x64
+          os: windows-latest
+          toxenv: type
         - name: Code style with flake8
           python: '3.7'
           arch: x64
@@ -102,7 +108,7 @@ jobs:
         ./misc/build-debug-python.sh $PYTHONVERSION $PYTHONDIR $VENV
         source $VENV/bin/activate
     - name: Install tox
-      run: pip install --upgrade 'setuptools!=50' 'virtualenv>=20.6.0' tox==3.20.1
+      run: pip install --upgrade 'setuptools!=50' 'virtualenv>=20.6.0' tox==3.24.5
     - name: Compiled with mypyc
       if: ${{ matrix.test_mypyc }}
       run: |

CONTRIBUTING.md

@@ -54,6 +54,12 @@ You can also use `tox` to run tests, for instance:
 tox -e py
 ```
 
+The easiest way to run a single test is:
+```
+pytest -n0 -k 'test_name'
+```
+There's more useful information on writing and running tests [here](test-data/unit/README.md)
+
 ## First time contributors
 
 If you're looking for things to help with, browse our [issue tracker](https://github.com/python/mypy/issues)!
@@ -63,21 +69,24 @@ In particular, look for:
 - [good second issues](https://github.com/python/mypy/labels/good-second-issue)
 - [documentation issues](https://github.com/python/mypy/labels/documentation)
 
-It's also extremely easy to get started contributing to our sister project
-[typeshed](https://github.com/python/typeshed/issues) that provides type stubs
-for libraries. This is a great way to become familiar with type syntax.
-
-If you need help getting started, don't hesitate to ask on
-[gitter](https://gitter.im/python/typing).
+You do not need to ask for permission to work on any of these issues.
+Just fix the issue yourself, [try to add a unit test](#running-tests) and
+[open a pull request](#submitting-changes).
 
 To get help fixing a specific issue, it's often best to comment on the issue
-itself. The more details you provide about what you've tried and where you've
-looked, the easier it will be for you to get help.
+itself. You're much more likely to get help if you provide details about what
+you've tried and where you've looked (maintainers tend to help those who help
+themselves). [gitter](https://gitter.im/python/typing) can also be a good place
+to ask for help.
 
 Interactive debuggers like `pdb` and `ipdb` are really useful for getting
 started with the mypy codebase. This is a
 [useful tutorial](https://realpython.com/python-debugging-pdb/).
 
+It's also extremely easy to get started contributing to our sister project
+[typeshed](https://github.com/python/typeshed/issues) that provides type stubs
+for libraries. This is a great way to become familiar with type syntax.
+
 ## Submitting changes
 
 Even more excellent than a good bug report is a fix for a bug, or the

CREDITS

@@ -11,15 +11,18 @@ Dropbox core team:
 
   Jukka Lehtosalo <[email protected]>
   Ivan Levkivskyi <[email protected]>
+  Jared Hance
 
 Non-Dropbox core team members:
 
   Ethan Smith
   Guido van Rossum <[email protected]>
-  Jelle Zijlstra
+  Jelle Zijlstra <[email protected]>
   Michael J. Sullivan <[email protected]>
   Shantanu Jain
-  Xuanda Yang
+  Xuanda Yang <[email protected]>
+  Jingchen Ye <[email protected]>
+  Nikita Sobolev <[email protected]>
 
 Past Dropbox core team members:
 

LICENSE

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

README.md

@@ -3,6 +3,8 @@
 Mypy: Static Typing for Python
 =======================================
 
+[![Stable Version](https://img.shields.io/pypi/v/mypy?color=blue)](https://pypi.org/project/mypy/)
+[![Downloads](https://img.shields.io/pypi/dm/mypy)](https://pypistats.org/packages/mypy)
 [![Build Status](https://api.travis-ci.com/python/mypy.svg?branch=master)](https://travis-ci.com/python/mypy)
 [![Documentation Status](https://readthedocs.org/projects/mypy/badge/?version=latest)](https://mypy.readthedocs.io/en/latest/?badge=latest)
 [![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -63,7 +65,7 @@ Here is a small example to whet your appetite:
 
 ```python
 number = input("What is your favourite number?")
-print("Well, my favourite number is: ", number + 1)  # error: Unsupported operand types for + ("str" and "int")
+print("It is", number + 1)  # error: Unsupported operand types for + ("str" and "int")
 ```
 
 See [the documentation](https://mypy.readthedocs.io/en/stable/introduction.html) for more examples.
@@ -114,7 +116,7 @@ Mypy can be integrated into popular IDEs:
 * Sublime Text: [SublimeLinter-contrib-mypy](https://github.com/fredcallaway/SublimeLinter-contrib-mypy)
 * Atom: [linter-mypy](https://atom.io/packages/linter-mypy)
 * PyCharm: [mypy plugin](https://github.com/dropbox/mypy-PyCharm-plugin) (PyCharm integrates
-  [its own implementation of PEP 484](https://www.jetbrains.com/help/pycharm/type-hinting-in-product.html))
+  [its own implementation](https://www.jetbrains.com/help/pycharm/type-hinting-in-product.html) of [PEP 484](https://peps.python.org/pep-0484/))
 * VS Code: provides [basic integration](https://code.visualstudio.com/docs/python/linting#_mypy) with mypy.
 * pre-commit: use [pre-commit mirrors-mypy](https://github.com/pre-commit/mirrors-mypy).
 

docs/requirements-docs.txt

@@ -1,2 +1,2 @@
 sphinx>=4.2.0,<5.0.0
-sphinx-rtd-theme>=1.0.0,<2.0.0
+furo>=2022.3.4

docs/source/builtin_types.rst

@@ -53,6 +53,7 @@ Type                   Description
 ``Iterable[int]``      iterable object containing ints
 ``Sequence[bool]``     sequence of booleans (read-only)
 ``Mapping[str, int]``  mapping from ``str`` keys to ``int`` values (read-only)
+``type[C]``            type object of ``C`` (``C`` is a class/type variable/union of types)
 ====================== ===============================
 
 The type ``dict`` is a *generic* class, signified by type arguments within
@@ -82,6 +83,7 @@ Type                   Description
 ``Iterable[int]``      iterable object containing ints
 ``Sequence[bool]``     sequence of booleans (read-only)
 ``Mapping[str, int]``  mapping from ``str`` keys to ``int`` values (read-only)
+``Type[C]``            type object of ``C`` (``C`` is a class/type variable/union of types)
 ====================== ===============================
 
 ``List`` is an alias for the built-in type ``list`` that supports

docs/source/cheat_sheet_py3.rst

@@ -296,7 +296,7 @@ Miscellaneous
 
    import sys
    import re
-   from typing import Match, AnyStr, IO
+   from typing import Match, IO
 
    # "typing.Match" describes regex matches from the re module
    x: Match[str] = re.match(r'[0-9]+', "15")

docs/source/common_issues.rst

@@ -607,7 +607,7 @@ method signature.  E.g.:
 
 The third line elicits an error because mypy sees the argument type
 ``bytes`` as a reference to the method by that name.  Other than
-renaming the method, a work-around is to use an alias:
+renaming the method, a workaround is to use an alias:
 
 .. code-block:: python
 

docs/source/conf.py

@@ -48,8 +48,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Mypy'
-copyright = u'2016, Jukka Lehtosalo'
+project = u'mypy'
+copyright = u'2012-2022 Jukka Lehtosalo and mypy contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -103,13 +103,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-try:
-    import sphinx_rtd_theme
-except:
-    html_theme = 'default'
-else:
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+html_theme = "furo"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -128,7 +122,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = "http://mypy-lang.org/static/mypy_light.svg"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -187,7 +181,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Mypydoc'
+htmlhelp_basename = 'mypydoc'
 
 
 # -- Options for LaTeX output ---------------------------------------------