Control: tags -1 patch
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/pylint-fixes.patch: Update to incorporate fix for new use-a-generator
failures.
Thanks for considering the patch.
Logan
diff -Nru python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch
python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch
--- python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch 2020-10-27
23:19:59.000000000 -0400
+++ python-jenkinsapi-0.3.11/debian/patches/pylint-fixes.patch 2021-04-10
13:53:15.000000000 -0400
@@ -1,6 +1,5 @@
-diff -Naur a/jenkinsapi/credential.py b/jenkinsapi/credential.py
---- a/jenkinsapi/credential.py 2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/credential.py 2020-10-27 21:03:49.025512695 -0600
+--- a/jenkinsapi/credential.py
++++ b/jenkinsapi/credential.py
@@ -83,7 +83,7 @@
def __init__(self, cred_dict):
@@ -70,9 +69,8 @@
}
- return super(AmazonWebServicesCredentials,
self)._get_attributes_xml(data)
+ return super()._get_attributes_xml(data)
-diff -Naur a/jenkinsapi/credentials.py b/jenkinsapi/credentials.py
---- a/jenkinsapi/credentials.py 2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/credentials.py 2020-10-27 21:04:33.021889279 -0600
+--- a/jenkinsapi/credentials.py
++++ b/jenkinsapi/credentials.py
@@ -100,8 +100,8 @@
except JenkinsAPIException as jae:
raise JenkinsAPIException('Latest version of Credentials '
@@ -104,9 +102,8 @@
self.poll()
self.credentials = self._data['credentials']
if description in self:
-diff -Naur a/jenkinsapi/fingerprint.py b/jenkinsapi/fingerprint.py
---- a/jenkinsapi/fingerprint.py 2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/fingerprint.py 2020-10-27 20:59:57.595597808 -0600
+--- a/jenkinsapi/fingerprint.py
++++ b/jenkinsapi/fingerprint.py
@@ -96,14 +96,14 @@
def validate(self):
try:
@@ -126,9 +123,8 @@
return True
def get_info(self):
-diff -Naur a/jenkinsapi/jenkinsbase.py b/jenkinsapi/jenkinsbase.py
---- a/jenkinsapi/jenkinsbase.py 2020-02-16 16:46:46.767307926 -0700
-+++ b/jenkinsapi/jenkinsbase.py 2020-10-27 20:58:54.431099252 -0600
+--- a/jenkinsapi/jenkinsbase.py
++++ b/jenkinsapi/jenkinsbase.py
@@ -84,9 +84,9 @@
response.raise_for_status()
try:
@@ -141,9 +137,8 @@
def pprint(self):
"""
-diff -Naur a/jenkinsapi/job.py b/jenkinsapi/job.py
---- a/jenkinsapi/job.py 2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/job.py 2020-10-27 20:58:21.502844386 -0600
+--- a/jenkinsapi/job.py
++++ b/jenkinsapi/job.py
@@ -89,7 +89,7 @@
return branches
@@ -196,9 +191,8 @@
def __delitem__(self, build_number):
self.delete_build(build_number)
-diff -Naur a/jenkinsapi/node.py b/jenkinsapi/node.py
---- a/jenkinsapi/node.py 2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/node.py 2020-10-27 20:54:01.232984206 -0600
+--- a/jenkinsapi/node.py
++++ b/jenkinsapi/node.py
@@ -118,10 +118,10 @@
credential = self.jenkins.credentials[
na['credential_description']
@@ -212,9 +206,8 @@
retries = na['max_num_retries'] if 'max_num_retries' in na else ''
re_wait = na['retry_wait_time'] if 'retry_wait_time' in na else ''
-diff -Naur a/jenkinsapi/nodes.py b/jenkinsapi/nodes.py
---- a/jenkinsapi/nodes.py 2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/nodes.py 2020-10-27 20:50:45.423835163 -0600
+--- a/jenkinsapi/nodes.py
++++ b/jenkinsapi/nodes.py
@@ -75,8 +75,8 @@
nodename = item['displayName']
try:
@@ -237,9 +230,8 @@
def values(self):
"""
-diff -Naur a/jenkinsapi/plugins.py b/jenkinsapi/plugins.py
---- a/jenkinsapi/plugins.py 2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/plugins.py 2020-10-27 20:49:44.063536416 -0600
+--- a/jenkinsapi/plugins.py
++++ b/jenkinsapi/plugins.py
@@ -82,8 +82,8 @@
def __getitem__(self, plugin_name):
try:
@@ -251,9 +243,30 @@
def __setitem__(self, shortName, plugin):
"""
-diff -Naur a/jenkinsapi/queue.py b/jenkinsapi/queue.py
---- a/jenkinsapi/queue.py 2020-02-16 16:46:46.775307980 -0700
-+++ b/jenkinsapi/queue.py 2020-10-27 20:48:12.011156888 -0600
+@@ -138,7 +138,7 @@
+ jobs = self.update_center_install_status['data']['jobs']
+ except JenkinsAPIException:
+ return True # Jenkins 1.X has no update_center
+- return any([job for job in jobs if job['requiresRestart'] == 'true'])
++ return any(job for job in jobs if job['requiresRestart'] == 'true')
+
+ def _install_specific_version(self, plugin):
+ """
+@@ -208,9 +208,9 @@
+ jobs = self.update_center_install_status['data']['jobs']
+ except JenkinsAPIException:
+ return False # lack of update_center in Jenkins 1.X
+- return any([job for job in jobs
+- if job['name'] == plugin.shortName
+- and job['version'] == plugin.version])
++ return any(job for job in jobs
++ if job['name'] == plugin.shortName
++ and job['version'] == plugin.version)
+
+ def plugin_version_already_installed(self, plugin):
+ """
+--- a/jenkinsapi/queue.py
++++ b/jenkinsapi/queue.py
@@ -170,11 +170,11 @@
def get_build_number(self):
try:
