mirror of
https://github.com/rpm-software-management/tito.git
synced 2025-02-23 20:22:46 +00:00
add pep8 tests and fix whitespace errors and warnings
This commit is contained in:
parent
5d336d0ce3
commit
1a772c5995
4 changed files with 15 additions and 15 deletions
|
@ -50,15 +50,15 @@ class CoprReleaser(KojiReleaser):
|
|||
|
||||
def _submit_build(self, executable, koji_opts, tag, srpm_location):
|
||||
""" Copy srpm to remote destination and submit it to Copr """
|
||||
cmd = self.releaser_config.get(self.target, "upload_command", raw = True)
|
||||
cmd = self.releaser_config.get(self.target, "upload_command", raw=True)
|
||||
url = self.releaser_config.get(self.target, "remote_location")
|
||||
if self.srpm_submitted:
|
||||
srpm_location = self.srpm_submitted
|
||||
srpm_base_name = os.path.basename(srpm_location)
|
||||
|
||||
# e.g. "scp %(srpm)s my.web.com:public_html/my_srpm/"
|
||||
cmd_upload = cmd % { 'srpm' : srpm_location }
|
||||
cmd_submit = "/usr/bin/copr-cli build %s %s%s" % ( self.releaser_config.get(self.target, "project_name"),
|
||||
cmd_upload = cmd % {'srpm': srpm_location}
|
||||
cmd_submit = "/usr/bin/copr-cli build %s %s%s" % (self.releaser_config.get(self.target, "project_name"),
|
||||
url, srpm_base_name)
|
||||
|
||||
if self.dry_run:
|
||||
|
|
|
@ -67,17 +67,17 @@ class Releaser(ConfigObject):
|
|||
ConfigObject.__init__(self, config=config)
|
||||
config_builder_args = self._parse_builder_args(releaser_config, target)
|
||||
if test:
|
||||
config_builder_args['test'] = True # builder must know to build from HEAD
|
||||
config_builder_args['test'] = True # builder must know to build from HEAD
|
||||
|
||||
# Override with builder args from command line if any were given:
|
||||
self.builder_args = dict(config_builder_args.items() +
|
||||
kwargs['builder_args'].items())
|
||||
kwargs['builder_args'].items())
|
||||
|
||||
# While we create a builder here, we don't actually call run on it
|
||||
# unless the releaser needs to:
|
||||
self.offline = False
|
||||
if 'offline' in kwargs:
|
||||
self.offline=kwargs['offline']
|
||||
self.offline = kwargs['offline']
|
||||
self.builder = create_builder(name, tag,
|
||||
config,
|
||||
build_dir, user_config, self.builder_args, offline=self.offline)
|
||||
|
@ -102,8 +102,8 @@ class Releaser(ConfigObject):
|
|||
self.target = target
|
||||
|
||||
self.dry_run = False
|
||||
self.test = test # releaser must know to use builder designation rather than tag
|
||||
self.auto_accept = auto_accept # don't ask for input, just go ahead
|
||||
self.test = test # releaser must know to use builder designation rather than tag
|
||||
self.auto_accept = auto_accept # don't ask for input, just go ahead
|
||||
self.no_cleanup = no_cleanup
|
||||
|
||||
self._check_releaser_config()
|
||||
|
|
|
@ -530,7 +530,7 @@ class VersionTagger(ConfigObject):
|
|||
suffix = self.config.get("globalconfig", "tag_suffix")
|
||||
return "%s-%s%s" % (self.project_name, new_version, suffix)
|
||||
|
||||
def _update_version_file (self, new_version):
|
||||
def _update_version_file(self, new_version):
|
||||
"""
|
||||
land this new_version in the designated file
|
||||
and stages that file for a git commit
|
||||
|
@ -549,14 +549,13 @@ class VersionTagger(ConfigObject):
|
|||
f = open(version_file, 'w')
|
||||
(new_ver, new_rel) = new_version.split('-')
|
||||
f.write(t.safe_substitute(
|
||||
version = new_ver,
|
||||
release = new_rel))
|
||||
version=new_ver,
|
||||
release=new_rel))
|
||||
f.close()
|
||||
|
||||
run_command("git add %s" % version_file)
|
||||
|
||||
|
||||
def _version_file_template (self):
|
||||
def _version_file_template(self):
|
||||
"""
|
||||
"$version_name = $version"
|
||||
or provide a configuration in tito.props to a file that is a
|
||||
|
@ -574,8 +573,7 @@ class VersionTagger(ConfigObject):
|
|||
return buf
|
||||
return None
|
||||
|
||||
|
||||
def _version_file_path (self):
|
||||
def _version_file_path(self):
|
||||
"""
|
||||
standard ${project_name}-version.conf
|
||||
or provide a configuration in tito.props, like
|
||||
|
|
|
@ -32,7 +32,9 @@ class TestPep8(TitoUnitTestFixture):
|
|||
def test_conformance(self):
|
||||
tests = [
|
||||
# http://pep8.readthedocs.org/en/latest/intro.html#error-codes
|
||||
'E2', # whitespace errors
|
||||
'E9', # runtime errors (SyntaxError, IndentationError, IOError)
|
||||
'W2', # whitespace warnings
|
||||
'W6', # deprecated features
|
||||
]
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue