Set flags for tests needing 3.6

python · emmatyping · Dec 14, 2017 · Dec 15, 2017 · Dec 16, 2017 · Dec 17, 2017
commit 1bd9f6604a1ca04ccd8519a4cabfdc76f0572c63
diff --git a/mypy/test/testcmdline.py b/mypy/test/testcmdline.py
@@ -47,6 +47,7 @@ def test_python_cmdline(testcase: DataDrivenTestCase) -> None:
             file.write('{}\n'.format(s))
     args = parse_args(testcase.input[0])
     args.append('--show-traceback')
+    args.append('--no-site-packages')
     # Type check the program.
     fixed = [python3_path,
              os.path.join(testcase.old_cwd, 'scripts', 'mypy')]

diff --git a/mypy/test/testdiff.py b/mypy/test/testdiff.py
@@ -53,6 +53,8 @@ def build(self, source: str) -> Tuple[List[str], Optional[Dict[str, MypyFile]]]:
         options.use_builtins_fixtures = True
         options.show_traceback = True
         options.cache_dir = os.devnull
+        options.python_version = (3, 6)
+        options.no_site_packages = True
         try:
             result = build.build(sources=[BuildSource('main', None, source)],
                                  options=options,

diff --git a/mypy/test/testmerge.py b/mypy/test/testmerge.py
@@ -102,6 +102,8 @@ def build(self, source: str) -> Tuple[List[str], Optional[BuildManager], Dict[st
         options.fine_grained_incremental = True
         options.use_builtins_fixtures = True
         options.show_traceback = True
+        options.python_version = (3, 6)
+        options.no_site_packages = True
         main_path = os.path.join(test_temp_dir, 'main')
         with open(main_path, 'w') as f:
             f.write(source)

diff --git a/mypy/test/testpythoneval.py b/mypy/test/testpythoneval.py
@@ -47,7 +47,7 @@ def test_python_evaluation(testcase: DataDrivenTestCase) -> None:
     version.
     """
     assert testcase.old_cwd is not None, "test was not properly set up"
-    mypy_cmdline = ['--show-traceback']
+    mypy_cmdline = ['--show-traceback', '--no-site-packages']
     py2 = testcase.name.lower().endswith('python2')
     if py2:
         mypy_cmdline.append('--py2')
@@ -59,6 +59,7 @@ def test_python_evaluation(testcase: DataDrivenTestCase) -> None:
             return
     else:
         interpreter = python3_path
+        mypy_cmdline.append('--python-version=3.6')
 
     # Write the program to a file.
     program = '_' + testcase.name + '.py'

diff --git a/mypy/test/testsemanal.py b/mypy/test/testsemanal.py
@@ -38,6 +38,8 @@ def get_semanal_options() -> Options:
     options.use_builtins_fixtures = True
     options.semantic_analysis_only = True
     options.show_traceback = True
+    options.python_version = (3, 6)
+    options.no_site_packages = True
     return options
 
 

diff --git a/test-data/unit/cmdline.test b/test-data/unit/cmdline.test
@@ -581,7 +581,7 @@ m.py:6: error: Explicit "Any" is not allowed
 m.py:9: error: Explicit "Any" is not allowed
 
 [case testDisallowAnyExplicitVarDeclaration]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 
 [file mypy.ini]
 [[mypy]
@@ -601,7 +601,7 @@ m.py:3: error: Explicit "Any" is not allowed
 m.py:5: error: Explicit "Any" is not allowed
 
 [case testDisallowAnyExplicitGenericVarDeclaration]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 
 [file mypy.ini]
 [[mypy]
@@ -785,7 +785,7 @@ N = TypedDict('N', {'x': str, 'y': List})  # no error
 m.py:4: error: Explicit "Any" is not allowed
 
 [case testDisallowAnyGenericsTupleNoTypeParams]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 [file mypy.ini]
 [[mypy]
 [[mypy-m]
@@ -821,7 +821,7 @@ def g(s: List[Tuple[str, str]]) -> None: pass  # no error
 m.py:3: error: Missing type parameters for generic type
 
 [case testDisallowAnyGenericsTypeType]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 [file mypy.ini]
 [[mypy]
 [[mypy-m]
@@ -858,7 +858,7 @@ def g(l: L[str]) -> None: pass  # no error
 m.py:5: error: Missing type parameters for generic type
 
 [case testDisallowAnyGenericsGenericAlias]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 [file mypy.ini]
 [[mypy]
 [[mypy-m]
@@ -882,7 +882,7 @@ m.py:7: error: Missing type parameters for generic type
 m.py:11: error: Missing type parameters for generic type
 
 [case testDisallowAnyGenericsPlainList]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 [file mypy.ini]
 [[mypy]
 [[mypy-m]
@@ -906,7 +906,7 @@ m.py:8: error: Need type annotation for 'x'
 m.py:9: error: Missing type parameters for generic type
 
 [case testDisallowAnyGenericsCustomGenericClass]
-# cmd: mypy m.py
+# cmd: mypy --python-version=3.6 m.py
 [file mypy.ini]
 [[mypy]
 [[mypy-m]

diff --git a/test-data/unit/diff.test b/test-data/unit/diff.test
@@ -577,6 +577,7 @@ __main__.Point
 __main__.p
 
 [case testTypedDict2]
+# flags: --python-version 3.6 --no-site-packages
 from mypy_extensions import TypedDict
 class Point(TypedDict):
     x: int

diff --git a/test-data/unit/reports.test b/test-data/unit/reports.test
@@ -281,7 +281,7 @@ Total      0      16    100.00%
 
 
 [case testAnyExpressionsReportTypesOfAny]
-# cmd: mypy --any-exprs-report report n.py
+# cmd: mypy --no-site-packages --python-version=3.6 --any-exprs-report report n.py
 
 [file n.py]
 from typing import Any, List