diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | tox.ini | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index c56b9d43..c1b71110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,16 +12,13 @@ install: - git fetch --tags - pip install coveralls - # for now we have to make sure there is a master branch - at some point we should just have it by default - - git branch master 0.3 - # generate some reflog as git-python tests need it (in 0.3) - git checkout 0.3 - git reset --hard HEAD~1 - git reset --hard HEAD~1 - git reset --hard HEAD~1 - git reset --hard origin/0.3 - - git checkout master + - git checkout -b master - git reset --hard HEAD~1 - git reset --hard HEAD~1 - git reset --hard HEAD~1 @@ -17,8 +17,7 @@ commands = {posargs} [flake8] #show-source = True -#E265 = it can't deal with my #{ section sections -#F403 = from module import * in __init__ +# E265 = comment blocks like @{ section, which it can't handle ignore = E265 max-line-length = 120 exclude = .tox,.venv,build,dist,doc,git/ext/ |