Merge branch 'master' into pass-literals-as-kwargs

Author: 97littleleaf11

.editorconfig

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

.gitattributes

@@ -0,0 +1,2 @@
+# We vendor typeshed from https://github.com/python/typeshed
+mypy/typeshed/** linguist-vendored

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - about: "Please check the linked documentation page before filing new issues."
+    name: "Common issues and solutions"
+    url: "https://mypy.readthedocs.io/en/stable/common_issues.html"
+  - about: "Please ask and answer any questions on the mypy Gitter."
+    name: "Questions or Chat"
+    url: "https://gitter.im/python/typing"

.github/ISSUE_TEMPLATE/question.md

@@ -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/docs.yml

@@ -8,6 +8,10 @@ on:
     - '**/*.rst'
     - '**/*.md'
     - 'mypyc/**'
+    - 'mypy/stubtest.py'
+    - 'mypy/stubgen.py'
+    - 'mypy/stubgenc.py'
+    - 'mypy/test/**'
 
 jobs:
   mypy_primer:
@@ -26,7 +30,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install -U pip
@@ -37,16 +41,19 @@ jobs:
           cd mypy_to_test
           echo "new commit"
           git rev-list --format=%s --max-count=1 $GITHUB_SHA
-          git checkout -b upstream_master origin/master
+
+          MERGE_BASE=$(git merge-base $GITHUB_SHA origin/master)
+          git checkout -b base_commit $MERGE_BASE
           echo "base commit"
-          git rev-list --format=%s --max-count=1 upstream_master
+          git rev-list --format=%s --max-count=1 base_commit
+
           echo ''
           cd ..
           # fail action if exit code isn't zero or one
           (
             mypy_primer \
             --repo mypy_to_test \
-            --new $GITHUB_SHA --old upstream_master \
+            --new $GITHUB_SHA --old base_commit \
             --num-shards 3 --shard-index ${{ matrix.shard-index }} \
             --debug \
             --output concise \

.github/workflows/mypy_primer.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/mypy_primer_comment.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: |
@@ -113,24 +119,20 @@ jobs:
     - name: Test
       run: tox -e ${{ matrix.toxenv }} --skip-pkg-install -- ${{ matrix.tox_extra_args }}
 
-# TODO: uncomment this when 3.11-dev is available
-#  python-nightly:
-#    runs-on: ubuntu-latest
-#    name: Test suite with Python nightly
-#    steps:
-#    - uses: actions/checkout@v2
-#    - uses: actions/setup-python@v2
-#      with:
-#        python-version: '3.11-dev'
-#    - name: Install tox
-#      run: |
-#        pip install -U pip==21.2.3 setuptools
-#        pip install --upgrade 'setuptools!=50' virtualenv==20.4.7 tox==3.20.1
-#    - name: Setup tox environment
-#      run: tox -e py --notest
-#    - name: Test
-#      run: tox -e py --skip-pkg-install -- "-n 2"
-#      continue-on-error: true
-#    - name: Mark as a success
-#      run: exit 0
-
+  python-nightly:
+    runs-on: ubuntu-latest
+    name: Test suite with Python nightly
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.11-dev'
+    - name: Install tox
+      run: pip install --upgrade 'setuptools!=50' 'virtualenv>=20.6.0' tox==3.24.5
+    - name: Setup tox environment
+      run: tox -e py --notest
+    - name: Test
+      run: tox -e py --skip-pkg-install -- "-n 2"
+      continue-on-error: true
+    - name: Mark as a success
+      run: exit 0

.github/workflows/test.yml

@@ -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

CONTRIBUTING.md

@@ -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:
 

CREDITS

@@ -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"),
@@ -26,8 +27,8 @@ DEALINGS IN THE SOFTWARE.
 
 = = = = =
 
-Portions of mypy and mypyc are licensed under different licenses.  The
-files under stdlib-samples as well as the files
+Portions of mypy and mypyc are licensed under different licenses.
+The files
 mypyc/lib-rt/pythonsupport.h, mypyc/lib-rt/getargs.c and
 mypyc/lib-rt/getargsfast.c are licensed under the PSF 2 License, reproduced
 below.

LICENSE

@@ -41,7 +41,7 @@ include runtests.py
 include pytest.ini
 
 include LICENSE mypyc/README.md
-exclude .gitmodules CONTRIBUTING.md CREDITS ROADMAP.md tox.ini action.yml
+exclude .gitmodules CONTRIBUTING.md CREDITS ROADMAP.md tox.ini action.yml .editorconfig
 
 global-exclude *.py[cod]
 global-exclude .DS_Store