diff options
Diffstat (limited to 'pavement.py')
| -rw-r--r-- | pavement.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pavement.py b/pavement.py index f15cbe68..57f8ce97 100644 --- a/pavement.py +++ b/pavement.py @@ -7,7 +7,7 @@ from paver.setuputils import setup # noqa PYCOMPILE_CACHES = ['*.pyc', '*$py.class'] options( - sphinx=Bunch(builddir='.build'), + sphinx=Bunch(builddir='.build'), ) @@ -91,9 +91,15 @@ def readme(options): ]) def bump(options): s = "-- '%s'" % (options.custom, ) \ +<<<<<<< HEAD if getattr(options, 'custom', None) else '' sh('extra/release/bump_version.py \ kombu/__init__.py README.rst %s' % (s, )) +======= + if getattr(options, "custom", None) else "" + sh("extra/release/bump_version.py \ + kombu/__init__.py README.rst %s" % (s, )) +>>>>>>> 2.5 @task @@ -129,6 +135,7 @@ def flake8(options): }{exit $FOUND_FLAKE; '""" % (complexity, migrations_path), ignore_error=noerror) + @task @cmdopts([ ('noerror', 'E', 'Ignore errors'), |