Skip to content

Commit 25a46f4

Browse files
author
Lukasz Langa
committed
Switch to Python 3.6 for flake8 runs, re-enable E999 checks
1 parent 937a3ca commit 25a46f4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.flake8

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
# Nice-to-haves ignored for now
1313
# 152 E128 continuation line under-indented for visual indent
1414
# 43 E127 continuation line over-indented for visual indent
15-
# 6 E999 invalid syntax - FIXME: re-enable after flake8 is running from Python 3.6
1615

1716
[flake8]
18-
ignore = F401, F811, E127, E128, E301, E302, E305, E501, E701, E704, E999, B303
17+
ignore = F401, F811, E127, E128, E301, E302, E305, E501, E701, E704, B303
1918
# We are checking with Python 3 but many of the stubs are Python 2 stubs.
2019
# A nice future improvement would be to provide separate .flake8
2120
# configurations for Python 2 and Python 3 files.

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: python
33

44
matrix:
55
include:
6-
- python: "3.5"
6+
- python: "3.6-dev"
77
env: TEST_CMD="flake8"
88
- python: "3.5"
99
env: TEST_CMD="./tests/mypy_test.py"
@@ -12,7 +12,8 @@ matrix:
1212

1313
install:
1414
# pytype needs py-2.7, mypy needs py-3.2+. Additional logic in runtests.py
15-
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install -U git+git://github.com/python/mypy git+git://github.com/dropbox/typed_ast flake8==3.2.1 flake8-bugbear>=16.12.2 flake8-pyi>=16.12.1; fi
15+
- if [[ $TRAVIS_PYTHON_VERSION == '3.6-dev' ]]; then pip install -U flake8==3.2.1 flake8-bugbear>=16.12.2 flake8-pyi>=16.12.2; fi
16+
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install -U git+git://github.com/python/mypy git+git://github.com/dropbox/typed_ast; fi
1617
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install -U git+git://github.com/google/pytype; fi
1718

1819
script:

requirements-tests-py3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ mypy-lang>=0.4.6
22
typed-ast>=0.6.1
33
flake8==3.2.1
44
flake8-bugbear>=16.12.2
5-
flake8-pyi>=16.12.1
5+
flake8-pyi>=16.12.2

0 commit comments

Comments
 (0)