Skip to content

Commit

Permalink
added tissue support and pep8ified
Browse files Browse the repository at this point in the history
  • Loading branch information
wolph committed Sep 25, 2013
1 parent 2fc3dce commit 2cb5833
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ python:
# command to install dependencies
install:
- pip install . --use-mirrors
- pip install coveralls --use-mirrors
- pip install nose coverage tissue coveralls --use-mirrors
# command to run tests
script:
- nosetests --with-coverage
Expand Down
1 change: 0 additions & 1 deletion progressbar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,3 @@ def finish(self):
if self.redirect_stdout:
self._stdout.write(sys.stdout.getvalue())
sys.stdout = self._stdout

5 changes: 0 additions & 5 deletions progressbar/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ class AnimatedMarker(Widget):
it were rotating.
'''


def __init__(self, markers='|/-\\'):
self.markers = markers
self.curmark = -1
Expand All @@ -170,7 +169,6 @@ class Counter(Widget):

'Displays the current count'


def __init__(self, format='%d'):
self.format = format

Expand Down Expand Up @@ -200,7 +198,6 @@ class FormatLabel(Timer):
'value': ('currval', None)
}


def __init__(self, format):
self.format = format

Expand All @@ -224,7 +221,6 @@ class SimpleProgress(Widget):

'Returns progress as a count of the total (e.g.: "5 of 47")'


def __init__(self, sep=' of '):
self.sep = sep

Expand All @@ -236,7 +232,6 @@ class Bar(WidgetHFill):

'A progress bar which stretches to fill the line.'


def __init__(self, marker='#', left='|', right='|', fill=' ',
fill_left=True):
'''Creates a customizable progress bar.
Expand Down
11 changes: 9 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,22 @@ description-file = README.rst

[nosetests]
verbosity=3
detailed-errors=1
debug=nose.loader

with-doctest=1

with-coverage=1
cover-package=progressbar
cover-branches=1
cover-min-percentage=100
detailed-errors=1
debug=nose.loader

#pdb=1
pdb-failures=1

with-tissue=1
tissue-ignore=W391
tissue-package=progressbar

[build_sphinx]
source-dir = docs/
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ envlist = py26, py27, py33, pypy
deps =
nose
coverage
tissue

commands =
nosetests
Expand Down

0 comments on commit 2cb5833

Please sign in to comment.