Move per-file strict Optional checking to mypy's main config file

mypy_self_check.ini

@@ -2,7 +2,57 @@
 disallow_untyped_defs = True
 disallow_subclassing_any = True
 warn_no_return = True
+strict_optional = True
 
 ; historical exceptions
 [mypy-mypy.test.testextensions]
 disallow_untyped_defs = False
+
+; non-strict Optional modules
+[mypy-mypy.build]
+strict_optional = False
+
+[mypy-mypy.checker]
+strict_optional = False
+
+[mypy-mypy.checkexpr]
+strict_optional = False
+
+[mypy-mypy.fastparse]
+strict_optional = False
+
+[mypy-mypy.fastparse2]
+strict_optional = False
+
+[mypy-mypy.main]
+strict_optional = False
+
+[mypy-mypy.myunit]
+strict_optional = False
+
+[mypy-mypy.semanal]
+strict_optional = False
+
+[mypy-mypy.server.astdiff]
+strict_optional = False
+
+[mypy-mypy.server.astmerge]
+strict_optional = False
+
+[mypy-mypy.server.aststrip]
+strict_optional = False
+
+[mypy-mypy.server.update]
+strict_optional = False
+
+[mypy-mypy.test.testinfer]
+strict_optional = False
+
+[mypy-mypy.test.testmerge]
+strict_optional = False
+
+[mypy-mypy.test.testtypes]
+strict_optional = False
+
+[mypy-mypy.waiter]
+strict_optional = False

runtests.py

@@ -170,9 +170,7 @@ def add_basic(driver: Driver) -> None:
 
 
 def add_selftypecheck(driver: Driver) -> None:
-    driver.add_mypy_package('package mypy nonstrict optional', 'mypy', '--config-file',
-                            'mypy_self_check.ini')
-    driver.add_mypy_package('package mypy', 'mypy', '--config-file', 'mypy_strict_optional.ini')
+    driver.add_mypy_package('package mypy', 'mypy', '--config-file', 'mypy_self_check.ini')
 
 
 def find_files(base: str, prefix: str = '', suffix: str = '') -> List[str]: