8000 add typing.ContextManager on all supported Python versions by JelleZijlstra · Pull Request #422 · python/typing · GitHub
[go: up one dir, main page]
Skip to content

add typing.ContextManager on all supported Python versions #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 6, 2017
Merged

add typing.ContextManager on all supported Python versions #422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bf8cb7e
add typing.ContextManager on all supported Python versions
JelleZijlstra May 3, 2017
56ea785
fix lint
JelleZijlstra May 3, 2017
b606b06
address Guido's comments
JelleZijlstra May 4, 2017
12fc0f7
add a separate .flake8 config to disable E129
JelleZijlstra May 4, 2017
db8a2ed
also disable B303
JelleZijlstra May 4, 2017
0cd2f3e
use my flake8 config
JelleZijlstra May 4, 2017
2cf2255
move to a single flake8 config
JelleZijlstra May 4, 2017
0adea53
Revert "move to a single flake8 config"
JelleZijlstra May 6, 2017
3613a1c
Revert "use my flake8 config"
JelleZijlstra May 6, 2017
6b34f3c
Revert "also disable B303"
JelleZijlstra May 6, 2017
2223676
Revert "add a separate .flake8 config to disable E129"
JelleZijlstra May 6, 2017
cae5065
much simpler solution (thanks Guido)
JelleZijlstra May 6, 2017
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
Prev Previous commit
Next Next commit
move to a single flake8 config
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed May 4, 2017
commit 2cf22557054ec8b6ff35f4b2207f11372b57d5ac
20 changes: 16 additions & 4 deletions .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
[flake8]
# fake builtins for python2/*
builtins = basestring, unicode
max-line-length = 90
ignore =
# the code is sometimes better off without this
E129
# irrelevant to us
B303
# code may look better without this
E129,
# temporary ignores until we sort it out
E306,
E701,
E704,
F811,
# irrelevant plugins
B3,
DW12
exclude =
# This config is NOT for the main module.
setup.py
python2/typing.py,
src/typing.py
25 changes: 0 additions & 25 deletions .flake8-tests
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ install:

script:
- export PYTHONPATH=`python -c "import sys; print('python2' if sys.version.startswith('2') else 'src')"`; py.test $PYTHONPATH
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8 --config=.flake8; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8 --config=.flake8-tests src/test_typing.py python2/test_typing.py; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then flake8; fi
0