remove runtests.py; run selfcheck and lint from travis

Author: elazarg

.gitignore

@@ -12,7 +12,6 @@ docs/build/
 .mypy_cache/
 .incremental_checker_cache.json
 .cache
-.runtest_log.json
 dmypy.json
 .dmypy.json
 

.travis.yml

@@ -16,6 +16,6 @@ install:
   - pip install .
 
 script:
-  - python runtests.py -j12 -x lint -x self-check
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.5.1' ]]; then python runtests.py package; fi
+  - pytest -n12
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8 -j0; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.5.1' ]]; then python3 -m mypy --config-file mypy_self_check.ini -p mypy; fi

MANIFEST.in

@@ -2,7 +2,5 @@ recursive-include scripts *
 recursive-include test-data *
 recursive-include extensions *
 recursive-include docs *
-include runtests.py
-include waiter.py
 include mypy_self_check.ini
 include LICENSE

appveyor.yml

@@ -20,17 +20,15 @@ install:
 build: off
 
 test_script:
-    # Ignore lint and mypy self check (both run in Travis)
-    - "%PYTHON%\\python.exe runtests.py -x lint -x self-check -x pytest"
-    - "%PYTHON%\\python.exe runtests.py pytest -p -k -p \"not (PythonEvaluationSuite and python2)\""
+    # lint and mypy self check run in Travis
+    - "%PYTHON%\\python.exe -m pytest -k \"not (PythonEvaluationSuite and python2)\""
 
 skip_commits:
   files:
     - docs/**/*
     - '**/*.rst'
     - '**/*.md'
     - .gitignore
-    - .runtest_log.json
     - .travis.yml
     - CREDITS
     - LICENSE

mypy/test/data.py

@@ -33,7 +33,7 @@ def parse_test_cases(parent: 'DataSuiteCollector', suite: 'DataSuite',
     """Parse a single file from suite with test case descriptions.
 
     NB: this function and DataDrivenTestCase were shared between the
-    myunit and pytest codepaths -- if something looks redundant,
+    legacy myunit and pytest codepaths -- if something looks redundant,
     that's likely the reason.
     """
     base_path = suite.base_path

mypy/test/testselfcheck.py

@@ -1,317 +1,5 @@
 #!/usr/bin/env python3
-"""Mypy test runner."""
+from sys import exit
 
-from typing import List, Optional, Set, Iterable, Tuple
-
-import itertools
-import os
-from os.path import join, isdir
-import sys
-
-from waiter import Waiter, LazySubprocess
-from mypy.test.testsamples import find_files, file_to_module
-
-
-def get_versions() -> List[str]:
-    # generates list of python versions to use.
-    # For Python2, this is only [2.7].
-    # Otherwise, it is [3.x, ..., 3.1, 3.0], where x is the version
-    # of the running interpreter.
-    major = sys.version_info[0]
-    minor = sys.version_info[1]
-    if major == 2:
-        return ['2.7']
-    else:
-        return ['%d.%d' % (major, i) for i in range(minor, -1, -1)]
-
-
-class Driver:
-
-    def __init__(self, *, whitelist: List[str], blacklist: List[str],
-            lf: bool, ff: bool,
-            arglist: List[str], pyt_arglist: List[str],
-            verbosity: int, parallel_limit: int,
-            xfail: List[str], coverage: bool) -> None:
-        self.whitelist = whitelist
-        self.blacklist = blacklist
-        self.arglist = arglist
-        self.pyt_arglist = pyt_arglist
-        self.verbosity = verbosity
-        self.waiter = Waiter(verbosity=verbosity, limit=parallel_limit, xfail=xfail, lf=lf, ff=ff)
-        self.versions = get_versions()
-        self.cwd = os.getcwd()
-        self.env = dict(os.environ)
-        self.coverage = coverage
-
-    def prepend_path(self, name: str, paths: List[str]) -> None:
-        old_val = self.env.get(name)
-        paths = [p for p in paths if isdir(p)]
-        if not paths:
-            return
-        if old_val is not None:
-            new_val = os.pathsep.join(itertools.chain(paths, [old_val]))
-        else:
-            new_val = os.pathsep.join(paths)
-        self.env[name] = new_val
-
-    def allow(self, name: str) -> bool:
-        if any(f in name for f in self.whitelist):
-            if not any(f in name for f in self.blacklist):
-                if self.verbosity >= 2:
-                    print('SELECT   #%d %s' % (len(self.waiter.queue), name))
-                return True
-        if self.verbosity >= 3:
-            print('OMIT     %s' % name)
-        return False
-
-    def add_mypy_cmd(self, name: str, mypy_args: List[str], cwd: Optional[str] = None) -> None:
-        full_name = 'check %s' % name
-        if not self.allow(full_name):
-            return
-        args = [sys.executable, '-m', 'mypy'] + mypy_args
-        args.append('--show-traceback')
-        args.append('--no-site-packages')
-        self.waiter.add(LazySubprocess(full_name, args, cwd=cwd, env=self.env))
-
-    def add_mypy_modules(self, name: str, modules: Iterable[str], cwd: Optional[str] = None,
-                         extra_args: Optional[List[str]] = None) -> None:
-        args = extra_args or []
-        args.extend(list(itertools.chain(*(['-m', mod] for mod in modules))))
-        self.add_mypy_cmd(name, args, cwd=cwd)
-
-    def add_pytest(self, files: List[Tuple[str, str]], coverage: bool = True) -> None:
-        pytest_files = [name for kind, name in files
-                        if self.allow('pytest {} {}'.format(kind, name))]
-        if not pytest_files:
-            return
-        pytest_args = pytest_files + self.arglist + self.pyt_arglist
-        if coverage and self.coverage:
-            args = [sys.executable, '-m', 'pytest', '--cov=mypy'] + pytest_args
-        else:
-            args = [sys.executable, '-m', 'pytest'] + pytest_args
-
-        self.waiter.add(LazySubprocess('pytest', args, env=self.env,
-                                       passthrough=self.verbosity),
-                        sequential=True)
-
-    def add_flake8(self, cwd: Optional[str] = None) -> None:
-        name = 'lint'
-        if not self.allow(name):
-            return
-        largs = ['flake8', '-j0']
-        env = self.env
-        self.waiter.add(LazySubprocess(name, largs, cwd=cwd, env=env))
-
-    def list_tasks(self) -> None:
-        for id, task in enumerate(self.waiter.queue):
-            print('{id}:{task}'.format(id=id, task=task.name))
-
-
-def test_path(*names: str) -> List[str]:
-    return [os.path.join('mypy', 'test', '{}.py'.format(name))
-            for name in names]
-
-
-PYTEST_FILES = test_path(
-    'testcheck',
-    'testextensions',
-    'testdeps',
-    'testdiff',
-    'testfinegrained',
-    'testfinegrainedcache',
-    'testmerge',
-    'testtransform',
-    'testtypegen',
-    'testparse',
-    'testsemanal',
-    'testerrorstream',
-    # non-data-driven:
-    'testgraph',
-    'testinfer',
-    'testmoduleinfo',
-    'teststubgen',
-    'testargs',
-    'testreports',
-    'testsolve',
-    'testsubtypes',
-    'testtypes',
-)
-
-SLOW_FILES = test_path(
-    'testpep561',
-    'testpythoneval',
-    'testcmdline',
-    'teststubgen',
-    'testsamples',
-)
-
-SELFCHECK_FILES = test_path(
-    'testselfcheck',
-)
-
-
-def add_pytest(driver: Driver) -> None:
-    for f in find_files('mypy', prefix='test', suffix='.py'):
-        assert f in PYTEST_FILES + SLOW_FILES + SELFCHECK_FILES, f
-    driver.add_pytest([('unit-test', name) for name in PYTEST_FILES] +
-                      [('integration', name) for name in SLOW_FILES] +
-                      [('self-check', name) for name in SELFCHECK_FILES])
-
-
-def usage(status: int) -> None:
-    print('Usage: %s [-h | -v | -q | --lf | --ff | [-x] FILTER | -a ARG | -p ARG]'
-          '... [-- FILTER ...]'
-          % sys.argv[0])
-    print()
-    print('Run mypy tests. If given no arguments, run all tests.')
-    print()
-    print('Examples:')
-    print('  %s unit-test  (run unit tests only)' % sys.argv[0])
-    print('  %s testcheck  (run type checking unit tests only)' % sys.argv[0])
-    print('  %s "pytest unit-test" -a -k -a Tuple' % sys.argv[0])
-    print('       (run all pytest unit tests with "Tuple" in test name)')
-    print()
-    print('You can also run pytest directly without using %s:' % sys.argv[0])
-    print('  pytest mypy/test/testcheck.py -k Tuple')
-    print()
-    print('Options:')
-    print('  -h, --help             show this help')
-    print('  -v, --verbose          increase driver verbosity')
-    print('  --lf                   rerun only the tests that failed at the last run')
-    print('  --ff                   run all tests but run the last failures first')
-    print('  -q, --quiet            decrease driver verbosity')
-    print('  -jN                    run N tasks at once (default: one per CPU)')
-    print('  -p, --pytest_arg ARG   pass an argument to pytest tasks')
-    print('                         (-v: verbose; glob pattern: filter by test name)')
-    print('  -l, --list             list included tasks (after filtering) and exit')
-    print('  FILTER                 include tasks matching FILTER')
-    print('  -x, --exclude FILTER   exclude tasks matching FILTER')
-    print('  -c, --coverage         calculate code coverage while running tests')
-    print('  --                     treat all remaining arguments as positional')
-    sys.exit(status)
-
-
-def sanity() -> None:
-    paths = os.getenv('PYTHONPATH')
-    if paths is None:
-        return
-    failed = False
-    for p in paths.split(os.pathsep):
-        if not os.path.isabs(p):
-            print('Relative PYTHONPATH entry %r' % p)
-            failed = True
-    if failed:
-        print('Please use absolute so that chdir() tests can work.')
-        print('Cowardly refusing to continue.')
-        sys.exit(1)
-
-
-def main() -> None:
-    import time
-    t0 = time.perf_counter()
-    sanity()
-
-    verbosity = 0
-    parallel_limit = 0
-    whitelist = []  # type: List[str]
-    blacklist = []  # type: List[str]
-    arglist = []  # type: List[str]
-    pyt_arglist = []  # type: List[str]
-    lf = False
-    ff = False
-    list_only = False
-    coverage = False
-
-    allow_opts = True
-    curlist = whitelist
-    for a in sys.argv[1:]:
-        if not (curlist is arglist or curlist is pyt_arglist) and allow_opts and a.startswith('-'):
-            if curlist is not whitelist:
-                break
-            if a == '--':
-                allow_opts = False
-            elif a == '-v' or a == '--verbose':
-                verbosity += 1
-            elif a == '-q' or a == '--quiet':
-                verbosity -= 1
-            elif a.startswith('-j'):
-                try:
-                    parallel_limit = int(a[2:])
-                except ValueError:
-                    usage(1)
-            elif a == '-x' or a == '--exclude':
-                curlist = blacklist
-            elif a == '-a' or a == '--argument':
-                curlist = arglist
-            elif a == '-p' or a == '--pytest_arg':
-                curlist = pyt_arglist
-            # will also pass this option to pytest
-            elif a == '--lf':
-                lf = True
-            # will also pass this option to pytest
-            elif a == '--ff':
-                ff = True
-            elif a == '-l' or a == '--list':
-                list_only = True
-            elif a == '-c' or a == '--coverage':
-                coverage = True
-            elif a == '-h' or a == '--help':
-                usage(0)
-            else:
-                usage(1)
-        else:
-            curlist.append(a)
-            curlist = whitelist
-    if curlist is blacklist:
-        sys.exit('-x must be followed by a filter')
-    if curlist is arglist:
-        sys.exit('-a must be followed by an argument')
-    if curlist is pyt_arglist:
-        sys.exit('-p must be followed by an argument')
-    if lf and ff:
-        sys.exit('use either --lf or --ff, not both')
-    # empty string is a substring of all names
-    if not whitelist:
-        whitelist.append('')
-    if lf:
-        pyt_arglist.append('--lf')
-    if ff:
-        pyt_arglist.append('--ff')
-    if verbosity >= 1:
-        pyt_arglist.extend(['-v'] * verbosity)
-    elif verbosity < 0:
-        pyt_arglist.extend(['-q'] * (-verbosity))
-    if parallel_limit:
-        if '-n' not in pyt_arglist:
-            pyt_arglist.append('-n{}'.format(parallel_limit))
-
-    driver = Driver(whitelist=whitelist, blacklist=blacklist, lf=lf, ff=ff,
-                    arglist=arglist, pyt_arglist=pyt_arglist, verbosity=verbosity,
-                    parallel_limit=parallel_limit, xfail=[], coverage=coverage)
-
-    driver.prepend_path('PATH', [join(driver.cwd, 'scripts')])
-    driver.prepend_path('MYPYPATH', [driver.cwd])
-    driver.prepend_path('PYTHONPATH', [driver.cwd])
-
-    driver.add_flake8()
-    add_pytest(driver)
-
-    if list_only:
-        driver.list_tasks()
-        return
-
-    exit_code = driver.waiter.run()
-    t1 = time.perf_counter()
-    print('total runtime:', t1 - t0, 'sec')
-
-    if verbosity >= 1:
-        times = driver.waiter.times2 if verbosity >= 2 else driver.waiter.times1
-        times_sortable = ((t, tp) for (tp, t) in times.items())
-        for total_time, test_type in sorted(times_sortable, reverse=True):
-            print('total time in %s: %f' % (test_type, total_time))
-
-    sys.exit(exit_code)
-
-
-if __name__ == '__main__':
-    main()
+print('runtests.py is no more. Use pytest && python3 -m mypy -p mypy')
+exit(1)

runtests.py

@@ -23,7 +23,7 @@ exclude =
   test-data/*,
   # typeshed has its own .pyi-specific configuration
   typeshed/*,
-  # during runtests.py flake8 might be started when there's still examples in the temp dir
+  # flake8 might be started when there's still examples in the temp dir
   tmp-test-dirs/*
   .tox
   .eggs