Merge pull request #56 from python/master

Sync Fork from Upstream Repo

Author: sthagen

.gitignore

@@ -6,6 +6,7 @@ __pycache__
 /env*/
 docs/build/
 docs/source/_build
+mypyc/doc/_build
 *.iml
 /out/
 .venv*/

.travis.yml

@@ -22,6 +22,7 @@ env:
   PYTHON_DEBUG_BUILD=0
 
 jobs:
+  fast_finish: true
   include:
   # Specifically request 3.5.1 because we need to be compatible with that.
   - name: "run test suite with python 3.5.1 (compiled with mypyc)"
@@ -43,6 +44,8 @@ jobs:
     python: 3.8
   - name: "run test suite with python 3.9"
     python: 3.9
+  - name: "run test suite with python nightly"
+    python: nightly
   - name: "run mypyc runtime tests with python 3.6 debug build"
     language: generic
     env:
@@ -80,6 +83,8 @@ jobs:
   #   env:
   #   - TOXENV=dev
   #   - EXTRA_ARGS=
+  allow_failures:
+  - python: nightly
 
 install:
 # pip 21.0 no longer works on Python 3.5

CONTRIBUTING.md

@@ -12,7 +12,7 @@ Getting started, building, and testing
 
 If you haven't already, take a look at the project's
 [README.md file](README.md)
-and the [Mypy documentation](http://mypy.readthedocs.io/en/latest/),
+and the [Mypy documentation](https://mypy.readthedocs.io/en/latest/),
 and try adding type annotations to your file and type-checking it with Mypy.
 
 

docs/source/cheat_sheet.rst

@@ -13,6 +13,12 @@ language represents various common types in Python 2.
    many of the examples have a dual purpose: show how to write the
    annotation, and show the inferred types.
 
+.. note::
+
+   To check Python 2 code with mypy, you'll need to install mypy with
+   ``pip install 'mypy[python2]'``.
+
+
 
 Built-in types
 **************

docs/source/command_line.rst

@@ -232,6 +232,11 @@ For more information on how to use these flags, see :ref:`version_and_platform_c
 
     Equivalent to running :option:`--python-version 2.7 <--python-version>`.
 
+    .. note::
+
+        To check Python 2 code with mypy, you'll need to install mypy with
+        ``pip install 'mypy[python2]'``.
+
 .. option:: --platform PLATFORM
 
     This flag will make mypy type check your code as if it were

docs/source/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to Mypy documentation!
+Welcome to mypy documentation!
 ==============================
 
 Mypy is a static type checker for Python 3 and Python 2.7.

docs/source/python2.rst

@@ -8,6 +8,9 @@ annotations are given in comments, since the function annotation
 syntax was introduced in Python 3. The comment-based syntax is
 specified in :pep:`484`.
 
+Mypy requires typed-ast in order to check Python 2 code. You can install it
+using ``pip install 'mypy[python2]'``.
+
 Run mypy in Python 2 mode by using the :option:`--py2 <mypy --py2>` option::
 
     $ mypy --py2 program.py

mypy/errors.py

@@ -405,9 +405,14 @@ def num_messages(self) -> int:
         return sum(len(x) for x in self.error_info_map.values())
 
     def is_errors(self) -> bool:
-        """Are there any generated errors?"""
+        """Are there any generated messages?"""
         return bool(self.error_info_map)
 
+    def is_real_errors(self) -> bool:
+        """Are there any generated errors (not just notes, for example)?"""
+        return any(info.severity == 'error'
+                   for infos in self.error_info_map.values() for info in infos)
+
     def is_blockers(self) -> bool:
         """Are the any errors that are blockers?"""
         return any(err for errs in self.error_info_map.values() for err in errs if err.blocker)
@@ -721,7 +726,8 @@ def report_internal_error(err: Exception,
     # Print "INTERNAL ERROR" message.
     print('{}error: INTERNAL ERROR --'.format(prefix),
           'Please try using mypy master on Github:\n'
-          'https://mypy.rtfd.io/en/latest/common_issues.html#using-a-development-mypy-build',
+          'https://mypy.readthedocs.io/en/stable/common_issues.html'
+          '#using-a-development-mypy-build',
           file=stderr)
     if options.show_traceback:
         print('Please report a bug at https://github.com/python/mypy/issues',

mypy/fastparse2.py

@@ -68,7 +68,8 @@
         from typed_ast import ast35  # type: ignore[attr-defined]  # noqa: F401
     except ImportError:
         print('The typed_ast package is not installed.\n'
-              'You can install it with `python3 -m pip install typed-ast`.',
+              'For Python 2 support, install mypy using `python3 -m pip install "mypy[python2]"`'
+              'Alternatively, you can install typed_ast with `python3 -m pip install typed-ast`.',
               file=sys.stderr)
     else:
         print('You need a more recent version of the typed_ast package.\n'

mypy/join.py

@@ -310,8 +310,9 @@ def visit_literal_type(self, t: LiteralType) -> ProperType:
         if isinstance(self.s, LiteralType):
             if t == self.s:
                 return t
-            else:
-                return join_types(self.s.fallback, t.fallback)
+            if self.s.fallback.type.is_enum and t.fallback.type.is_enum:
+                return mypy.typeops.make_simplified_union([self.s, t])
+            return join_types(self.s.fallback, t.fallback)
         else:
             return join_types(self.s, t.fallback)