diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | gbp/bb/__init__.py | 5 | ||||
| -rw-r--r-- | gbp/scripts/buildpackage_bb.py | 3 | ||||
| -rwxr-xr-x | gbp/scripts/clone_bb.py | 3 | ||||
| -rwxr-xr-x | gbp/scripts/import_bb.py | 2 | ||||
| -rwxr-xr-x | gbp/scripts/pq_bb.py | 2 | ||||
| -rwxr-xr-x | gbp/scripts/submit_bb.py | 3 | ||||
| -rw-r--r-- | gbp/version.py | 2 | ||||
| -rw-r--r-- | tests/test_rpm.py | 2 |
9 files changed, 4 insertions, 19 deletions
@@ -3,7 +3,6 @@ .coverage .ropeproject/ coverage.xml -gbp/version.py build/ gbp.egg-info/ nosetests.xml diff --git a/gbp/bb/__init__.py b/gbp/bb/__init__.py index 1efeb221..d6f205b4 100644 --- a/gbp/bb/__init__.py +++ b/gbp/bb/__init__.py @@ -32,9 +32,6 @@ from gbp.scripts.common.buildpackage import dump_tree bb = None -# pylint: disable=bad-continuation - - def import_bb(): """Import bitbake lib""" bb_bin = subprocess.Popen(['which', 'bitbake'], stdout=subprocess.PIPE, @@ -54,7 +51,7 @@ def import_bb(): def init_tinfoil(config_only=False, tracking=False): """Initialize the Bitbake tinfoil module""" - import bb.tinfoil + import bb.tinfoil #pylint: disable=import-error try: tinfoil = bb.tinfoil.Tinfoil(tracking=tracking) except (SystemExit, bb.BBHandledException): diff --git a/gbp/scripts/buildpackage_bb.py b/gbp/scripts/buildpackage_bb.py index 95c66368..340724c8 100644 --- a/gbp/scripts/buildpackage_bb.py +++ b/gbp/scripts/buildpackage_bb.py @@ -42,9 +42,6 @@ from gbp.scripts.common.pq import is_pq_branch, pq_branch_base from gbp.bb import (bb, init_tinfoil, guess_bb_path, BBFile, bb_from_repo, pkg_version, parse_bb) -# pylint: disable=bad-continuation - - def guess_export_params(repo, options): """Get commit and tree from where to export packaging and patches""" tree = None diff --git a/gbp/scripts/clone_bb.py b/gbp/scripts/clone_bb.py index a7e9c9f4..7cc6b9a2 100755 --- a/gbp/scripts/clone_bb.py +++ b/gbp/scripts/clone_bb.py @@ -32,9 +32,6 @@ import gbp.log from gbp.rpm.git import RpmGitRepository as GitRepository from gbp.bb import bb, init_tinfoil, guess_pkg -# pylint: disable=bad-continuation - - def guess_remote(tinfoil, source): """Guess the remote repository URL""" # Try to determine if a remote URL is referenced diff --git a/gbp/scripts/import_bb.py b/gbp/scripts/import_bb.py index d0aeae1c..5d249776 100755 --- a/gbp/scripts/import_bb.py +++ b/gbp/scripts/import_bb.py @@ -34,8 +34,6 @@ from gbp.pkg import parse_archive_filename from gbp.scripts.import_srpm import move_tag_stamp, force_to_branch_head from gbp.bb import bb, init_tinfoil, pkg_version, guess_pkg -# pylint: disable=bad-continuation - NO_PACKAGING_BRANCH_MSG = """ Repository does not have branch '%s' for meta/packaging files. You need to reate it or use --packaging-branch to specify it. diff --git a/gbp/scripts/pq_bb.py b/gbp/scripts/pq_bb.py index c8247bc8..23e9e896 100755 --- a/gbp/scripts/pq_bb.py +++ b/gbp/scripts/pq_bb.py @@ -38,8 +38,6 @@ from gbp.scripts.pq_rpm import (generate_patches, safe_patches, import_extra_files) from gbp.bb import bb, init_tinfoil, parse_bb, pkg_version -# pylint: disable=bad-continuation - USAGE_STRING = \ """%prog [options] action - maintain patches on a patch queue branch tions: diff --git a/gbp/scripts/submit_bb.py b/gbp/scripts/submit_bb.py index 7edece5d..b3a9b852 100755 --- a/gbp/scripts/submit_bb.py +++ b/gbp/scripts/submit_bb.py @@ -28,9 +28,6 @@ from gbp.errors import GbpError from gbp.format import format_msg from gbp.git import GitRepository, GitRepositoryError -# pylint: disable=bad-continuation - - def guess_remote(repo, options): """Guess remote where to push""" if options.remote: diff --git a/gbp/version.py b/gbp/version.py new file mode 100644 index 00000000..a4f16706 --- /dev/null +++ b/gbp/version.py @@ -0,0 +1,2 @@ +"The current gbp version number" +gbp_version="0.0" diff --git a/tests/test_rpm.py b/tests/test_rpm.py index 97390465..f059f556 100644 --- a/tests/test_rpm.py +++ b/tests/test_rpm.py @@ -20,7 +20,7 @@ import filecmp import os import shutil import tempfile -from nose.tools import assert_raises, eq_ +from nose.tools import assert_raises, eq_ #pylint: disable=no-name-in-module from gbp.errors import GbpError from gbp.rpm import (SrcRpmFile, SpecFile, parse_srpm, NoSpecError, guess_spec, |