Merge pull request buildbot#7940 from pmisik/dep-update-2024-w33-ruff

Update ruff from 0.5.2 to 0.6.1

Makefile

@@ -95,7 +95,7 @@ rmpyc:
 	find master worker \( -name '*.pyc' -o -name '*.pyo' \) -exec rm -v {} \;
 
 ruff:
-	ruff --fix .
+	ruff format .
 
 docker: docker-buildbot-worker docker-buildbot-master
 	echo done

master/buildbot/test/unit/util/test_interfaces.py

@@ -32,6 +32,7 @@ def myfunc2(x, y=2, *args):
             @self.assertArgSpecMatches(myfunc)
             def myfunc3(x, y=3, *args):
                 pass
+
         except Exception as e:
             error = e
         else:
@@ -59,6 +60,7 @@ def myfunc4(x, y):
             @self.assertArgSpecMatches(myfunc, myfunc3)
             def myfunc5(x, y):
                 pass
+
         except Exception as e:
             error = e
         else:
@@ -72,6 +74,7 @@ def myfunc5(x, y):
             @self.assertArgSpecMatches(myfunc, myfunc3)
             def myfunc6(xx, yy):
                 pass
+
         except Exception as e:
             error = e
         else:

master/buildbot/test/util/endpoint.py

@@ -106,6 +106,7 @@ def test_get_spec(self):
             @self.assertArgSpecMatches(self.ep.get)
             def get(self, resultSpec, kwargs):
                 pass
+
         except trial.unittest.FailTest:
 
             @self.assertArgSpecMatches(self.ep.get)

requirements-ci.txt

@@ -62,7 +62,7 @@ pytz==2024.1
 PyYAML==6.0.1
 requests==2.32.3
 responses==0.25.3
-ruff==0.5.2
+ruff==0.6.1
 s3transfer==0.10.2
 service-identity==24.1.0
 setuptools-trial==0.6.0

worker/buildbot_worker/commands/fs.py

@@ -195,6 +195,7 @@ def eb(f):
             @d.addCallback
             def send_rc(rc):
                 self.sendStatus([('rc', rc)])
+
         else:
             if not os.path.exists(os.path.dirname(to_path)):
                 os.makedirs(os.path.dirname(to_path))

worker/buildbot_worker/commands/utils.py

@@ -103,6 +103,7 @@ def rmdirRecursive(dir):
                     os.chmod(full_name, 0o700)
                 os.remove(full_name)
         os.rmdir(dir)
+
 else:
     # use rmtree on POSIX
     import shutil