Skip to content

Commit

Permalink
Merge pull request buildbot#7761 from pmisik/dep-update-2024-w26
Browse files Browse the repository at this point in the history
Fix issues in "Scheduled biweekly dependency update for week 26"
  • Loading branch information
p12tic authored Jul 9, 2024
2 parents 9b861e1 + a70588f commit f61602f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 17 deletions.
1 change: 1 addition & 0 deletions master/buildbot/test/unit/process/test_buildrequest.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def test_collapseRequests_no_other_request(self):
def collapseRequests_fn(master, builder, brdict1, brdict2):
# Allow all requests
self.fail("Should never be called")
# pylint: disable=unreachable
return True

self.bldr.getCollapseRequestsFn = lambda: collapseRequests_fn
Expand Down
30 changes: 15 additions & 15 deletions requirements-ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ buildbot-www==4.0.0

autobahn==23.6.2; python_version >= "3.9"
autobahn==22.7.1; python_version < "3.9" # pyup: ignore
boto3==1.34.127
boto3==1.34.136
msgpack==1.0.8
Markdown==3.6
pylint==3.2.3
ruff==0.4.9
mypy==1.9.0
mypy-zope==1.0.4
pylint==3.2.5
ruff==0.5.0
mypy==1.10.1
mypy-zope==1.0.5

# The following are transitive dependencies of the above. The versions are pinned so that tests
# are reproducible. The versions should be upgraded whenever we see new versions to catch problems
Expand All @@ -21,7 +21,7 @@ mypy-zope==1.0.4

alabaster==0.7.16; python_version >= "3.9"
alabaster==0.7.13; python_version < "3.9" # pyup: ignore 0.7.14 dropped support for Python 3.8 and earlier
alembic==1.13.1
alembic==1.13.2
appdirs==1.4.4
asn1crypto==1.5.1
astroid==3.2.2
Expand All @@ -30,7 +30,7 @@ Automat==22.10.0
Babel==2.15.0
backports.functools-lru-cache==2.0.0
boto==2.49.0
botocore==1.34.127
botocore==1.34.136
certifi==2024.7.4
cffi==1.16.0
chardet==5.2.0
Expand All @@ -39,7 +39,7 @@ click==8.1.7
configparser==7.0.0
constantly==23.10.4
cookies==2.2.1
coverage==7.5.3
coverage==7.5.4
croniter==2.0.5
cryptography==42.0.8
decorator==5.1.1
Expand All @@ -54,11 +54,11 @@ future==1.0.0
graphql-core==3.3.0a4; python_version >= "3.12" # pyup: ignore (temporary switch to PRE-RELEASE version; remove this once 3.3.0 or newer is released as RELEASE version)
graphql-core==3.2.3; python_version < "3.12"
greenlet==3.0.3
hvac==2.2.0
hvac==2.3.0
hyperlink==21.0.0
idna==3.7
imagesize==1.4.1
importlib-metadata==7.1.0
importlib-metadata==8.0.0
importlib-resources==6.4.0; python_version < "3.9"
incremental==22.10.0
ipaddress==1.0.23
Expand All @@ -75,15 +75,15 @@ markdown2==2.4.13
MarkupSafe==2.1.5
mccabe==0.7.0
more-itertools==10.3.0
moto==5.0.9
moto==5.0.10
olefile==0.47
packaging==24.1
parameterized==0.9.0
pathlib2==2.3.7.post1
pbr==6.0.0
Pillow==10.3.0
Pillow==10.4.0
platformdirs==4.2.2
psutil==5.9.8
psutil==6.0.0
pyaml==24.4.0
pyasn1==0.6.0
pyasn1-modules==0.4.0
Expand All @@ -103,13 +103,13 @@ requests==2.32.3
responses==0.25.3
ruamel.yaml==0.18.6
ruamel.yaml.clib==0.2.8
s3transfer==0.10.1
s3transfer==0.10.2
service-identity==24.1.0
setuptools-trial==0.6.0
singledispatch==4.1.0
six==1.16.0
snowballstemmer==2.2.0
SQLAlchemy==2.0.30
SQLAlchemy==2.0.31
sqlparse==0.5.0
termcolor==2.4.0
testtools==2.7.2
Expand Down
2 changes: 1 addition & 1 deletion requirements-ciworker.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parameterized==0.9.0; python_version >= "3.6"
pbr==6.0.0
# pin PyHamcrest, because 2.x no longer supports Python 2.7
PyHamcrest==1.9.0 # pyup: ignore
psutil==5.9.8
psutil==6.0.0
pycparser==2.22; python_version >= "3.6"
six==1.16.0
Twisted==24.3.0; python_version >= "3.6"
Expand Down
2 changes: 1 addition & 1 deletion requirements-master-docker-extras.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
requests==2.32.3
psycopg2==2.9.9
txrequests==0.9.6
pycairo==1.26.0
pycairo==1.26.1
1 change: 1 addition & 0 deletions worker/buildbot_worker/commands/fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ def _tryChmod(self, rc, path):
assert isinstance(rc, int)
if rc == 0:
defer.returnValue(0)
# pylint: disable=unreachable
return # pragma: no cover
# Attempt a recursive chmod and re-try the rm -rf after.

Expand Down

0 comments on commit f61602f

Please sign in to comment.