Merge remote-tracking branch 'upstream/master' into cleanup-reverseop

Author: elazarg

.gitignore

@@ -13,6 +13,7 @@ docs/build/
 .incremental_checker_cache.json
 .cache
 .runtest_log.json
+dmypy.json
 
 # Packages
 *.egg
@@ -23,7 +24,7 @@ docs/build/
 *.swp
 
 # Operating Systems
-.DS_store
+.DS_Store
 
 # Coverage Files
 htmlcov

CONTRIBUTING.md

@@ -47,6 +47,17 @@ other people with respect and more generally to follow the guidelines
 articulated in the [Python Community Code of
 Conduct](https://www.python.org/psf/codeofconduct/).
 
+First Time Contributors
+-----------------------
+
+Mypy appreciates your contribution! If you are interested in helping improve
+mypy, there are several ways to get started:
+
+* Contributing to [typeshed](https://github.com/python/typeshed/issues) is a great way to
+become familiar with Python's type syntax.
+* Work on [documentation issues](https://github.com/python/mypy/labels/documentation).
+* Ask on [the chat](https://gitter.im/python/typing) or on
+[the issue tracker](https://github.com/python/mypy/issues) about good beginner issues.
 
 Submitting Changes
 ------------------
@@ -98,6 +109,9 @@ which consist mainly of a reference to
 [PEP 8](https://www.python.org/dev/peps/pep-0008/) -- for the code you
 put in the pull request.
 
+Also, do not squash your commits after you have submitted a pull request, as this
+erases context during review. We will squash commits when the pull request is merged.
+
 You may also find other pages in the
 [Mypy developer guide](https://github.com/python/mypy/wiki/Developer-Guides)
 helpful in developing your change.

CREDITS

@@ -11,6 +11,8 @@ Mypy team:
 
   Jukka Lehtosalo <[email protected]>
   Guido van Rossum <[email protected]>
+  Ivan Levkivskyi
+  Michael J. Sullivan
 
 Past Dropbox core team members:
 
@@ -23,7 +25,6 @@ Past Dropbox core team members:
 
 Non-Dropbox core team members:
 
-  Ivan Levkivskyi
   Ethan Smith
   Jelle Zijlstra
 

ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+Note: if you are reporting a wrong signature of a function or a class in
+the standard library, then the typeshed tracker is better suited
+for this report: https://github.com/python/typeshed/issues
+
+Please provide more information to help us understand the issue:
+
+* Are you reporting a bug, or opening a feature request?
+* Please insert below the code you are checking with mypy,
+  or a mock-up repro if the source is private. We would appreciate
+  if you try to simplify your case to a minimal repro.
+* What is the actual behavior/output?
+* What is the behavior/output you expect?
+* What are the versions of mypy and Python you are using?
+  Do you see the same issue after installing mypy from Git master?
+* What are the mypy flags you are using? (For example --strict-optional)
+* If mypy crashed with a traceback, please paste
+  the full traceback below.
+
+(You can freely edit this text, please remove all the lines
+you believe are unnecessary.)

README.md

@@ -14,7 +14,7 @@ sure you've found a bug please search our issue trackers for a
 duplicate before filing a new issue:
 
 - [mypy tracker](https://github.com/python/mypy/issues)
-  for mypy isues
+  for mypy issues
 - [typeshed tracker](https://github.com/python/typeshed/issues)
   for issues with specific modules
 - [typing tracker](https://github.com/python/typing/issues)

docs/source/builtin_types.rst

@@ -13,6 +13,8 @@ Type                Description
 ``bytes``           8-bit string
 ``object``          an arbitrary object (``object`` is the common base class)
 ``List[str]``       list of ``str`` objects
+``Tuple[int, int]`` tuple of two ``int`` objects (``Tuple[()]`` is the empty tuple)
+``Tuple[int, ...]`` tuple of an arbitrary number of ``int`` objects
 ``Dict[str, int]``  dictionary from ``str`` keys to ``int`` values
 ``Iterable[int]``   iterable object containing ints
 ``Sequence[bool]``  sequence of booleans

docs/source/cheat_sheet.rst

@@ -33,6 +33,9 @@ Built-in types
    x = [1] # type: List[int]
    x = set([6, 7]) # type: Set[int]
 
+   # Empty Tuple types are a bit special
+   x = ()  # type: Tuple[()]
+
    # For mappings, we need the types of both keys and values.
    x = dict(field=2.0) # type: Dict[str, float]
 

docs/source/cheat_sheet_py3.rst

@@ -34,6 +34,9 @@ Built-in types
    x = [1]  # type: List[int]
    x = {6, 7}  # type: Set[int]
 
+   # Empty Tuple types are a bit special
+   x = ()  # type: Tuple[()]
+
    # For mappings, we need the types of both keys and values.
    x = {'field': 2.0}  # type: Dict[str, float]