summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-04 16:17:44 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-04 16:17:44 +0100
commit3936084cdd336ce7db7d693950e345eeceab93a5 (patch)
tree527a60cb3047ff78577bc2d65b2b513ff0f97fcf
parent1de8af907dbced4fde64ee2c7f57527fc43ad1cc (diff)
downloadgitpython-3936084cdd336ce7db7d693950e345eeceab93a5.tar.gz
And apparently, I broken travis ... this should cure it
-rw-r--r--.travis.yml5
-rw-r--r--tox.ini3
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
diff --git a/tox.ini b/tox.ini
index b50d77fa..6c562a1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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/