Skip to content

Commit 3936084

Browse files
committed
And apparently, I broken travis ... this should cure it
1 parent 1de8af9 commit 3936084

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Diff for: .travis.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@ install:
1212
- git fetch --tags
1313
- pip install coveralls
1414

15-
# for now we have to make sure there is a master branch - at some point we should just have it by default
16-
- git branch master 0.3
17-
1815
# generate some reflog as git-python tests need it (in 0.3)
1916
- git checkout 0.3
2017
- git reset --hard HEAD~1
2118
- git reset --hard HEAD~1
2219
- git reset --hard HEAD~1
2320
- git reset --hard origin/0.3
24-
- git checkout master
21+
- git checkout -b master
2522
- git reset --hard HEAD~1
2623
- git reset --hard HEAD~1
2724
- git reset --hard HEAD~1

Diff for: tox.ini

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ commands = {posargs}
1717

1818
[flake8]
1919
#show-source = True
20-
#E265 = it can't deal with my #{ section sections
21-
#F403 = from module import * in __init__
20+
# E265 = comment blocks like @{ section, which it can't handle
2221
ignore = E265
2322
max-line-length = 120
2423
exclude = .tox,.venv,build,dist,doc,git/ext/

0 commit comments

Comments
 (0)