Skip to content
Closed
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
54 changes: 2 additions & 52 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,58 +14,8 @@ env:

jobs:
include:
# Specifically request 3.5.1 because we need to be compatible with that.
- name: "run test suite with python 3.5.1"
python: 3.5.1
dist: trusty
- name: "run test suite with python 3.6"
python: 3.6 # 3.6.3 pip 9.0.1
- name: "run test suite with python 3.7"
python: 3.7 # 3.7.0 pip 10.0.1
- name: "run test suite with python 3.5.1 (new semantic analyzer)"
python: 3.5.1
dist: trusty
env:
- TOXENV=py
- EXTRA_ARGS="-n 12"
- NEWSEMANAL=1
- name: "run test suite with python 3.7 (new semantic analyzer)"
python: 3.7
env:
- TOXENV=py
- EXTRA_ARGS="-n 12"
- NEWSEMANAL=1
- name: "run test suite with python 3.7 (compiled with mypyc)"
python: 3.7
env:
- TOXENV=py
- EXTRA_ARGS="-n 12"
- TEST_MYPYC=1
# - name: "run test suite with python 3.8-dev"
# python: 3.8-dev
- name: "type check our own code"
python: 3.7
env:
- TOXENV=type
- EXTRA_ARGS=
- name: "check code style with flake8"
python: 3.7
env:
- TOXENV=lint
- EXTRA_ARGS=
- name: "trigger a build of wheels"
python: 3.7
script: if [[ ($TRAVIS_BRANCH = "master" || $TRAVIS_BRANCH =~ release-*) && $TRAVIS_PULL_REQUEST = "false" ]]; then ./misc/trigger_wheel_build.sh; fi
- name: "check documentation build"
python: 3.7
env:
- TOXENV=docs
# Disabled because of some pip bug? See #6716
# - name: "check dev environment builds"
# python: 3.7
# env:
# - TOXENV=dev
# - EXTRA_ARGS=
- name: "run test suite with python 3.8-dev"
python: 3.8-dev

install:
- pip install -U pip setuptools
Expand Down
31 changes: 0 additions & 31 deletions appveyor.yml

This file was deleted.

3 changes: 3 additions & 0 deletions mypy/test/testcmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from mypy.test.data import fix_cobertura_filename
from mypy.test.data import DataDrivenTestCase, DataSuite
from mypy.test.helpers import assert_string_arrays_equal, normalize_error_messages
import pytest
import mypy.version

# Path to Python 3 interpreter
Expand Down Expand Up @@ -45,6 +46,8 @@ def test_python_cmdline(testcase: DataDrivenTestCase, step: int) -> None:
for s in testcase.input:
file.write('{}\n'.format(s))
args = parse_args(testcase.input[0])
if "--html-report" in args:
pytest.importorskip('lxml')
args.append('--show-traceback')
args.append('--no-site-packages')
# Type check the program.
Expand Down
7 changes: 6 additions & 1 deletion mypy/test/testreports.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
from mypy.test.helpers import Suite, assert_equal
from mypy.report import CoberturaPackage, get_line_rate

import lxml.etree as etree # type: ignore
try:
import lxml.etree as etree # type: ignore
except Exception as exc:
import pytest # type: ignore # no pytest in typeshed

pytestmark = pytest.mark.skip("no lxml: {}".format(exc))


class CoberturaReportSuite(Suite):
Expand Down
3 changes: 2 additions & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ attrs>=18.0
flake8>=3.7
flake8-bugbear; python_version >= '3.5'
flake8-pyi; python_version >= '3.6'
lxml>=4.2.4
# Temporarily disabled, until fixed for py38.
lxml>=4.2.4; python_version < '3.8'
mypy_extensions>=0.4.0,<0.5.0
psutil>=4.0
pytest>=4.4
Expand Down