From 1cff2e00c0ccf996fb0b08b03c39bb230d80bdbd Mon Sep 17 00:00:00 2001
From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Thu, 23 Jan 2025 17:47:22 +0000
Subject: [PATCH] Update requirements and address changes in buildbot 4.2.1
 (#574)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
---
 master/custom/pr_testing.py | 16 +++++-----
 master/custom/schedulers.py |  7 +++--
 requirements.txt            | 62 ++++++++++++++++++-------------------
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/master/custom/pr_testing.py b/master/custom/pr_testing.py
index 5a3bc7070..b776ceb9b 100644
--- a/master/custom/pr_testing.py
+++ b/master/custom/pr_testing.py
@@ -52,8 +52,8 @@ def _post_comment(self, comments_url, comment):
         if self._token:
             headers["Authorization"] = "token " + self._token
 
-        http = yield httpclientservice.HTTPClientService.getService(
-            self.master,
+        http = yield httpclientservice.HTTPSession(
+            self.master.httpservice,
             self.github_api_endpoint,
             headers=headers,
             debug=self.debug,
@@ -71,8 +71,8 @@ def _remove_label_and_comment(self, payload, label):
         if self._token:
             headers["Authorization"] = "token " + self._token
 
-        http = yield httpclientservice.HTTPClientService.getService(
-            self.master,
+        http = yield httpclientservice.HTTPSession(
+            self.master.httpservice,
             self.github_api_endpoint,
             headers=headers,
             debug=self.debug,
@@ -102,8 +102,8 @@ def _get_pull_request(self, url):
         if self._token:
             headers["Authorization"] = "token " + self._token
 
-        http = yield httpclientservice.HTTPClientService.getService(
-            self.master,
+        http = yield httpclientservice.HTTPSession(
+            self.master.httpservice,
             self.github_api_endpoint,
             headers=headers,
             debug=self.debug,
@@ -126,8 +126,8 @@ def _user_has_write_permissions(self, payload, user):
         headers = {"User-Agent": "Buildbot"}
         if self._token:
             headers["Authorization"] = "token " + self._token
-        http = yield httpclientservice.HTTPClientService.getService(
-            self.master,
+        http = yield httpclientservice.HTTPSession(
+            self.master.httpservice,
             self.github_api_endpoint,
             headers=headers,
             debug=self.debug,
diff --git a/master/custom/schedulers.py b/master/custom/schedulers.py
index 94be071e1..572c9c399 100644
--- a/master/custom/schedulers.py
+++ b/master/custom/schedulers.py
@@ -13,11 +13,14 @@ def __init__(self, *args, stable_builder_names, **kwargs):
     def addBuildsetForChanges(self, **kwargs):
         log.msg("Preapring buildset for PR changes")
         changeids = kwargs.get("changeids")
-        if changeids is None or len(changeids) != 1:
-            log.msg("No changeids or more than one changeid found")
+        if changeids is None or len(changeids) == 0:
+            log.msg("No changeids found")
             yield super().addBuildsetForChanges(**kwargs)
             return
 
+        # It is possible that we get multiple changeids if there are multiple
+        # requests being made in quick succession. All these changeids will
+        # have the same properties, so we can just pick the first one.
         changeid = changeids[0]
         chdict = yield self.master.db.changes.getChange(changeid)
 
diff --git a/requirements.txt b/requirements.txt
index 2a085d775..41ddbd203 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,56 +1,56 @@
-alembic==1.13.3
-attrs==24.2.0
+alembic==1.14.1
+attrs==24.3.0
 autobahn==24.4.2
 Automat==24.8.1
-blinker==1.8.2
-buildbot==4.1.0
-buildbot-console-view==4.1.0
-buildbot-grid-view==4.1.0
-buildbot-waterfall-view==4.1.0
-buildbot-worker==4.1.0
-buildbot-wsgi-dashboards==4.1.0
-buildbot-www==4.1.0
-certifi==2024.8.30
+blinker==1.9.0
+buildbot==4.2.1
+buildbot-console-view==4.2.1
+buildbot-grid-view==4.2.1
+buildbot-waterfall-view==4.2.1
+buildbot-worker==4.2.1
+buildbot-wsgi-dashboards==4.2.1
+buildbot-www==4.2.1
+certifi==2024.12.14
 cffi==1.17.1
-charset-normalizer==3.4.0
-click==8.1.7
+charset-normalizer==3.4.1
+click==8.1.8
 constantly==23.10.4
-croniter==3.0.3
-cryptography==43.0.1
-Flask==3.0.3
+croniter==6.0.0
+cryptography==44.0.0
+Flask==3.1.0
 greenlet==3.1.1
 humanize==4.11.0
 hyperlink==21.0.0
 idna==3.10
-importlib_metadata==8.5.0
+importlib_metadata==8.6.1
 incremental==24.7.2
 itsdangerous==2.2.0
 Jinja2==3.1.5
-Mako==1.3.5
-MarkupSafe==3.0.1
+Mako==1.3.8
+MarkupSafe==3.0.2
 msgpack==1.1.0
-packaging==24.1
+packaging==24.2
 psycopg2==2.9.10
 pyasn1==0.6.1
 pyasn1_modules==0.4.1
 pycparser==2.22
-PyJWT==2.9.0
-pyOpenSSL==24.2.1
+PyJWT==2.10.1
+pyOpenSSL==25.0.0
 python-dateutil==2.9.0.post0
 pytz==2024.2
 PyYAML==6.0.2
 requests==2.32.3
-sentry-sdk==2.17.0
-service-identity==24.1.0
-six==1.16.0
-SQLAlchemy==2.0.36
-tomli==2.0.2
+sentry-sdk==2.20.0
+service-identity==24.2.0
+six==1.17.0
+SQLAlchemy==2.0.37
+tomli==2.2.1
 treq==24.9.1
-Twisted==24.7.0
+Twisted==24.11.0
 txaio==23.1.1
 typing_extensions==4.12.2
 unidiff==0.7.5
-urllib3==2.2.3
+urllib3==2.3.0
 Werkzeug==3.1.3
-zipp==3.20.2
-zope.interface==7.1.0
+zipp==3.21.0
+zope.interface==7.2