Skip to content

Commit aafab7a

Browse files
committed
make runtests.py a shorthand script; run selfcheck and lint from travis
1 parent 90757f9 commit aafab7a

File tree

11 files changed

+50
-771
lines changed

11 files changed

+50
-771
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ docs/build/
1212
.mypy_cache/
1313
.incremental_checker_cache.json
1414
.cache
15-
.runtest_log.json
1615
dmypy.json
1716
.dmypy.json
1817

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ install:
1616
- pip install .
1717

1818
script:
19-
- python runtests.py -j12 -x lint -x self-check
20-
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8; fi
21-
- if [[ $TRAVIS_PYTHON_VERSION == '3.5.1' ]]; then python runtests.py package; fi
19+
- pytest -n12
20+
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8 -j0; fi
21+
- if [[ $TRAVIS_PYTHON_VERSION == '3.5.1' ]]; then python3 -m mypy --config-file mypy_self_check.ini -p mypy; fi

MANIFEST.in

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ recursive-include scripts *
22
recursive-include test-data *
33
recursive-include extensions *
44
recursive-include docs *
5-
include runtests.py
6-
include waiter.py
75
include mypy_self_check.ini
86
include LICENSE

appveyor.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@ install:
2020
build: off
2121

2222
test_script:
23-
# Ignore lint and mypy self check (both run in Travis)
24-
- "%PYTHON%\\python.exe runtests.py -x lint -x self-check -x pytest"
25-
- "%PYTHON%\\python.exe runtests.py pytest -p -k -p \"not (PythonEvaluationSuite and python2)\""
23+
# lint and mypy self check run in Travis
24+
- "%PYTHON%\\python.exe -m pytest -k \"not (PythonEvaluationSuite and python2)\""
2625

2726
skip_commits:
2827
files:
2928
- docs/**/*
3029
- '**/*.rst'
3130
- '**/*.md'
3231
- .gitignore
33-
- .runtest_log.json
3432
- .travis.yml
3533
- CREDITS
3634
- LICENSE

mypy/test/data.py

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

mypy/test/testselfcheck.py

-12
This file was deleted.

0 commit comments

Comments
 (0)