Merge remote-tracking branch 'upstream/master' into enum-only-meta

Author: elazarg

CONTRIBUTING.md

@@ -80,11 +80,7 @@ For every pull request, we aim to promptly either merge it or say why
 it's not yet ready; if you go a few days without a reply, please feel
 free to ping the thread by adding a new comment.
 
-At present the core developers are (alphabetically):
-* David Fisher (@ddfisher)
-* Jukka Lehtosalo (@JukkaL)
-* Greg Price (@gnprice)
-* Guido van Rossum (@gvanrossum)
+For a list of mypy core developers, see the file [CREDITS](CREDITS).
 
 
 Preparing Changes
@@ -109,6 +105,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

@@ -7,10 +7,17 @@ https://github.com/python/mypy/commits/master
 For lists of contributors per mypy release (including typeshed) see
 the release blog posts at https://mypy-lang.blogspot.com/.
 
-Mypy team:
+Dropbox core team:
 
   Jukka Lehtosalo <[email protected]>
   Guido van Rossum <[email protected]>
+  Ivan Levkivskyi <[email protected]>
+  Michael J. Sullivan <[email protected]>
+
+Non-Dropbox core team members:
+
+  Ethan Smith
+  Jelle Zijlstra
 
 Past Dropbox core team members:
 
@@ -21,12 +28,6 @@ Past Dropbox core team members:
   Michael Lee
   Reid Barton
 
-Non-Dropbox core team members:
-
-  Ivan Levkivskyi
-  Ethan Smith
-  Jelle Zijlstra
-
 Additional thanks to:
 
   Alex Allain

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/config_file.rst

@@ -74,9 +74,6 @@ The following global flags may only be set in the global section
 - ``warn_redundant_casts`` (Boolean, default False) warns about
   casting an expression to its inferred type.
 
-- ``warn_unused_ignores`` (Boolean, default False) warns about
-  unneeded ``# type: ignore`` comments.
-
 - ``warn_unused_configs`` (Boolean, default False) warns about
   per-module sections in the config file that didn't match any
   files processed in the current run.
@@ -203,6 +200,9 @@ overridden by the pattern sections matching the module name.
   returning a value with type ``Any`` from a function declared with a
   non- ``Any`` return type.
 
+- ``warn_unused_ignores`` (Boolean, default False) warns about
+  unneeded ``# type: ignore`` comments.
+
 - ``strict_boolean`` (Boolean, default False) makes using non-boolean
   expressions in conditions an error.
 

docs/source/faq.rst

@@ -167,16 +167,6 @@ features will be supported in a restricted form (for example, runtime
 modification is only supported for classes or methods registered as
 dynamic or 'patchable').
 
-How is mypy different from PyPy?
-********************************
-
-*This answer relates to PyPy as a Python implementation. See also the answer related to RPython below.*
-
-Mypy and PyPy are orthogonal. Mypy does static type checking, i.e. it
-is basically a linter, but static typing has no runtime effect,
-whereas the PyPy is an Python implementation. You can use PyPy to run
-mypy programs.
-
 How is mypy different from Cython?
 **********************************
 

docs/source/generics.rst

@@ -307,7 +307,7 @@ Variance of generic types
 
 There are three main kinds of generic types with respect to subtype
 relations between them: invariant, covariant, and contravariant.
-Assuming that we have a pair of types types ``A`` and ``B`` and ``B`` is
+Assuming that we have a pair of types ``A`` and ``B``, and ``B`` is
 a subtype of ``A``, these are defined as follows:
 
 * A generic class ``MyCovGen[T, ...]`` is called covariant in type variable