8000 Update requirements and address changes in buildbot 4.2.1 (#574) · python/buildmaster-config@1cff2e0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1cff2e0

Browse files
pablogsalhugovk
pablogsal
and
hugovk
authored
Update requirements and address changes in buildbot 4.2.1 (#574)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
1 parent 982c88e commit 1cff2e0

File tree

3 files changed

+44
-41
lines changed

3 files changed

+44
-41
lines changed

‎master/custom/pr_testing.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def _post_comment(self, comments_url, comment):
5252
if self._token:
5353
headers["Authorization"] = "token " + self._token
5454

55-
http = yield httpclientservice.HTTPClientService.getService(
56-
self.master,
55+
http = yield httpclientservice.HTTPSession(
56+
self.master.httpservice,
5757
self.github_api_endpoint,
5858
headers=headers,
5959
debug=self.debug,
@@ -71,8 +71,8 @@ def _remove_label_and_comment(self, payload, label):
7171
if self._token:
7272
headers["Authorization"] = "token " + self._token
7373

74-
http = yield httpclientservice.HTTPClientService.getService(
75-
self.master,
74+
http = yield httpclientservice.HTTPSession(
75+
self.master.httpservice,
7676
self.github_api_endpoint,
7777
headers=headers,
7878
debug=self.debug,
@@ -102,8 +102,8 @@ def _get_pull_request(self, url):
102102
if self._token:
103103
headers["Authorization"] = "token " + self._token
104104

105-
http = yield httpclientservice.HTTPClientService.getService(
106-
self.master,
105+
http = yield httpclientservice.HTTPSession(
106+
self.master.httpservice,
107107
self.github_api_endpoint,
108108
headers=headers,
109109
debug=self.debug,
@@ -126,8 +126,8 @@ def _user_has_write_permissions(self, payload, user):
126126
headers = {"User-Agent": "Buildbot"}
127127
if self._token:
128128
headers["Authorization"] = "token " + self._token
129-
http = yield httpclientservice.HTTPClientService.getService(
130-
self.master,
129+
http = yield httpclientservice.HTTPSession(
130+
self.master.httpservice,
131131
self.github_api_endpoint,
132132
headers=headers,
133133
debug=self.debug,

‎master/custom/schedulers.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ def __init__(self, *args, stable_builder_names, **kwargs):
1313
def addBuildsetForChanges(self, **kwargs):
1414
log.msg("Preapring buildset for PR changes")
1515
changeids = kwargs.get("changeids")
16-
if changeids is None or len(changeids) != 1:
17-
log.msg("No changeids or more than one changeid found")
16+
if changeids is None or len(changeids) == 0:
17+
log.msg("No changeids found")
1818
yield super().addBuildsetForChanges(**kwargs)
1919
return
2020

21+
# It is possible that we get multiple changeids if there are multiple
22+
# requests being made in quick succession. All these changeids will
23+
# have the same properties, so we can just pick the first one.
2124
changeid = changeids[0]
2225
chdict = yield self.master.db.changes.getChange(changeid)
2326

‎requirements.txt

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
alembic==1.13.3
2-
attrs==24.2.0
1+
alembic==1.14.1
2+
attrs==24.3.0
33
autobahn==24.4.2
44
Automat==24.8.1
5-
blinker==1.8.2
6-
buildbot==4.1.0
7-
buildbot-console-view==4.1.0
8-
buildbot-grid-view==4.1.0
9-
buildbot-waterfall-view==4.1.0
10-
buildbot-worker==4.1.0
11-
buildbot-wsgi-dashboards==4.1.0
12-
buildbot-www==4.1.0
13-
certifi==2024.8.30
5+
blinker==1.9.0
6+
buildbot==4.2.1
7+
buildbot-console-view==4.2.1
8+
buildbot-grid-view==4.2.1
9+
buildbot-waterfall-view==4.2.1
10+
buildbot-worker==4.2.1
11+
buildbot-wsgi-dashboards==4.2.1
12+
buildbot-www==4.2.1
13+
certifi==2024.12.14
14< 6D40 /td>14
cffi==1.17.1
15-
charset-normalizer==3.4.0
16-
click==8.1.7
15+
charset-normalizer==3.4.1
16+
click==8.1.8
1717
constantly==23.10.4
18-
croniter==3.0.3
19-
cryptography==43.0.1
20-
Flask==3.0.3
18+
croniter==6.0.0
19+
cryptography==44.0.0
20+
Flask==3.1.0
2121
greenlet==3.1.1
2222
humanize==4.11.0
2323
hyperlink==21.0.0
2424
idna==3.10
25-
importlib_metadata==8.5.0
25+
importlib_metadata==8.6.1
2626
incremental==24.7.2
2727
itsdangerous==2.2.0
2828
Jinja2==3.1.5
29-
Mako==1.3.5
30-
MarkupSafe==3.0.1
29+
Mako==1.3.8
30+
MarkupSafe==3.0.2
3131
msgpack==1.1.0
32-
packaging==24.1
32+
packaging==24.2
3333
psycopg2==2.9.10
3434
pyasn1==0.6.1
3535
pyasn1_modules==0.4.1
3636
pycparser==2.22
37-
PyJWT==2.9.0
38-
pyOpenSSL==24.2.1
37+
PyJWT==2.10.1
38+
pyOpenSSL==25.0.0
3939
python-dateutil==2.9.0.post0
4040
pytz==2024.2
4141
PyYAML==6.0.2
4242
requests==2.32.3
43-
sentry-sdk==2.17.0
44-
service-identity==24.1.0
45-
six==1.16.0
46-
SQLAlchemy==2.0.36
47-
tomli==2.0.2
43+
sentry-sdk==2.20.0
44+
service-identity==24.2.0
45+
six==1.17.0
46+
SQLAlchemy==2.0.37
47+
tomli==2.2.1
4848
treq==24.9.1
49-
Twisted==24.7.0
49+
Twisted==24.11.0
5050
txaio==23.1.1
5151
typing_extensions==4.12.2
5252
unidiff==0.7.5
53-
urllib3==2.2.3
53+
urllib3==2.3.0
5454
Werkzeug==3.1.3
55-
zipp==3.20.2
56-
zope.interface==7.1.0
55+
zipp==3.21.0
56+
zope.interface==7.2

0 commit comments

Comments
 (0)
0