Skip to content

Bump pyyaml from 5.3.1 to 5.4 #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dubious90 merged 3 commits into from
Mar 29, 2021
Merged

Bump pyyaml from 5.3.1 to 5.4 #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7d521c
Bump pyyaml from 5.3.1 to 5.4
dependabot[bot] Mar 25, 2021
6c5f161
Merge remote-tracking branch 'upstream/main' into dependabot/pip/pyya…
Mar 27, 2021
2ea2c61
deflake
Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile-nighthawk-benchmark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /usr/local/bin/benchmarks

COPY benchmarks /usr/local/bin/benchmarks/

RUN apk add --no-cache docker=20.10.3-r0 openrc=0.42.1-r19 python3>=3.8.7-r0
RUN apk add --no-cache docker>=20.10.3-r0 openrc>=0.42.1-r19 python3>=3.8.7-r0
Copy link
Copy Markdown
Member

@oschaaf oschaaf Mar 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mum4k I think this change deflakes the docker benchmark image build runs.
/cc @abaptiste

RUN rc-update add docker boot

RUN if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python; fi && \
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ requests==2.24.0
pytest==6.0.1
pytest-dependency==0.5.1
pytest-xdist==1.34.0
pyyaml==5.3.1
pyyaml==5.4
zipp==3.1.0
importlib_metadata==1.7.0