diff --git a/tools/lib/provision.py b/tools/lib/provision.py index a6770147ba..151d9d98fd 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -42,7 +42,6 @@ LOG_DIR_PATH = os.path.join(VAR_DIR_PATH, 'log') UPLOAD_DIR_PATH = os.path.join(VAR_DIR_PATH, 'uploads') TEST_UPLOAD_DIR_PATH = os.path.join(VAR_DIR_PATH, 'test_uploads') COVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'coverage') -LINECOVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'linecoverage-report') NODE_TEST_COVERAGE_DIR_PATH = os.path.join(VAR_DIR_PATH, 'node-coverage') is_travis = 'TRAVIS' in os.environ @@ -281,8 +280,6 @@ def main(options): run(["mkdir", "-p", TEST_UPLOAD_DIR_PATH]) # create coverage directory`var/coverage` run(["mkdir", "-p", COVERAGE_DIR_PATH]) - # create linecoverage directory`var/linecoverage-report` - run(["mkdir", "-p", LINECOVERAGE_DIR_PATH]) # create linecoverage directory`var/node-coverage` run(["mkdir", "-p", NODE_TEST_COVERAGE_DIR_PATH]) diff --git a/tools/run-mypy b/tools/run-mypy index 737c5d4cab..2e9445fcb3 100755 --- a/tools/run-mypy +++ b/tools/run-mypy @@ -35,8 +35,6 @@ parser.add_argument('-a', '--all', action='store_true', help="check all files, bypassing the default exclude list") parser.add_argument('--force', action="store_true", help="run tests despite possible provisioning problems") -parser.add_argument('--linecoverage-report', action='store_true', - help="emit a coverage report under var/") args = parser.parse_args() if not args.force: @@ -77,9 +75,6 @@ if not python_files and not pyi_files: sys.exit(0) extra_args = [] -if args.linecoverage_report: - extra_args.append("--linecoverage-report") - extra_args.append("var/linecoverage-report") if args.quick: extra_args.append("--quick") @@ -89,12 +84,4 @@ if args.daemon: else: rc = subprocess.call([mypy_command] + mypy_args) -if args.linecoverage_report: - # Move the coverage report to where codecov will look for it. - try: - os.rename('var/linecoverage-report/coverage.txt', 'var/.coverage') - except OSError: - # maybe mypy crashed; exit with its error code - pass - sys.exit(rc) diff --git a/tools/travis/backend b/tools/travis/backend index 6cd0eeaca0..ab2ffb5245 100755 --- a/tools/travis/backend +++ b/tools/travis/backend @@ -13,7 +13,7 @@ set -x # We run mypy after the backend tests so we get output from the # backend tests, which tend to uncover more serious problems, first. ./tools/run-mypy --version -./tools/run-mypy --linecoverage-report +./tools/run-mypy ./tools/test-migrations ./tools/optimize-svg