summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbiao716.wang <biao716.wang@samsung.com>2019-12-12 17:45:59 +0800
committerbiao716.wang <biao716.wang@samsung.com>2019-12-12 17:45:59 +0800
commit72556c55c434f7f0d59d4f00c56eb0e83893ee19 (patch)
tree56b538c6b3d3cc88534d9a2a2230def790348ee8
parent4696eb2a81eeb2af32cbdda8b0e612b3726ac1f7 (diff)
downloadgit-buildpackage-72556c55c434f7f0d59d4f00c56eb0e83893ee19.tar.gz
git-buildpackage-72556c55c434f7f0d59d4f00c56eb0e83893ee19.tar.bz2
git-buildpackage-72556c55c434f7f0d59d4f00c56eb0e83893ee19.zip
fix pylint error for Ubuntu 14.04, add gbp/version.py filesubmit/trunk/20200519.184310submit/trunk/20200519.164610submit/trunk/20200519.161030submit/trunk/20200513.162810submit/trunk/20200423.122334submit/trunk/20200423.115423submit/trunk/20200423.102810submit/trunk/20200422.165210submit/trunk/20200422.142510submit/trunk/20200422.115210submit/trunk/20200414.191000submit/trunk/20200414.173500submit/trunk/20200414.141500submit/trunk/20200413.151000submit/trunk/20200413.150500submit/trunk/20200413.150000submit/trunk/20200413.132320submit/trunk/20200410.160020submit/trunk/20200410.143020submit/trunk/20200409.202020submit/trunk/20200409.200220submit/trunk/20200409.194520submit/trunk/20200219.120523submit/trunk/20200115.110101submit/trunk/20200114.110000submit/trunk/20200114.100000submit/trunk/20200110.111659submit/trunk/20200109.154402submit/trunk/20200109.151502submit/trunk/20200109.124502submit/trunk/20200109.112402submit/trunk/20200109.105802submit/trunk/20200108.192702submit/trunk/20200108.172702submit/trunk/20200105.091946submit/trunk/20200104.134833submit/trunk/20200104.111033accepted/tizen/devbase/tools/20200520.012809accepted/tizen/devbase/tools/20200514.023607accepted/tizen/devbase/tools/20200423.100549accepted/tizen/devbase/tools/20200415.093457accepted/tizen/devbase/tools/20200219.094542accepted/tizen/devbase/tools/20200115.231434accepted/tizen/devbase/tools/20200114.115815accepted/tizen/devbase/tools/20200114.020233accepted/tizen/devbase/tools/20200110.011759accepted/tizen/devbase/tools/20200109.052803accepted/tizen/devbase/tools/20200106.014315accepted/tizen/devbase/tools/20200104.060141
Change-Id: I741176ae7adff77ad09bb07ab6b5352481500454 Signed-off-by: biao716.wang <biao716.wang@samsung.com>
-rw-r--r--.gitignore1
-rw-r--r--gbp/bb/__init__.py5
-rw-r--r--gbp/scripts/buildpackage_bb.py3
-rwxr-xr-xgbp/scripts/clone_bb.py3
-rwxr-xr-xgbp/scripts/import_bb.py2
-rwxr-xr-xgbp/scripts/pq_bb.py2
-rwxr-xr-xgbp/scripts/submit_bb.py3
-rw-r--r--gbp/version.py2
-rw-r--r--tests/test_rpm.py2
9 files changed, 4 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index afc87fff..fdb134a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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,