Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ docs/build/
.mypy_cache/
.incremental_checker_cache.json
.cache
.runtest_log.json
dmypy.json
.dmypy.json

Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -j12; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5.1' ]]; then python3 -m mypy --config-file mypy_self_check.ini -p mypy; fi
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mypy/test/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions mypy/test/testselfcheck.py

This file was deleted.

Loading