Skip to content

Commit

Permalink
Upgrade to PyYAML 6.0.1 (#1508)
Browse files Browse the repository at this point in the history
Resolves #1507

The release of [Cython `3` broke PyYAML
`5.4`](yaml/pyyaml#724). This PR upgrades to
PyYAML `6.0.1` which pins `Cython < 3.0.0`.

Notes
1. While bootstrapping the molecule testing environment, it was
[complaining about the following dependency
conflict](https://app.circleci.com/pipelines/github/tiny-pilot/tinypilot/3695/workflows/1e8382a7-5a08-4a64-a87a-a5af41916c70/jobs/22051?invite=true#step-105-155):
    ```bash
    The conflict is caused by:
        The user requested PyYAML==6.0.1
        molecule 3.2.3 depends on PyYAML<6 and >=5.1
    ```
So based on [someone's suggestion from the original GitHub
issue](yaml/pyyaml#724 (comment)),
I pinned `pyyaml` to version `5.3.1`. However, I only did this for the
[molecule
dependencies](https://github.com/tiny-pilot/tinypilot/pull/1508/files#diff-0852a7343763d1af5bb207aac9c7ac61e43aea1d676c9ab25ba6ae7503804578).

<a data-ca-tag
href="https://codeapprove.com/pr/tiny-pilot/tinypilot/1508"><img
src="https://codeapprove.com/external/github-tag-allbg.png" alt="Review
on CodeApprove" /></a>
  • Loading branch information
jdeanwallace authored Jul 19, 2023
1 parent 72f2d5a commit ec45ba7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ansible-role/molecule/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ PyNaCl==1.5.0
pyparsing==3.0.9
python-dateutil==2.8.2
python-slugify==6.1.2
PyYAML==5.4.1
PyYAML==5.3.1
requests==2.28.1
rich==12.5.1
selinux==0.2.1
Expand Down
2 changes: 1 addition & 1 deletion app/license_notice.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class LicenseMetadata:
name='pyyaml',
homepage_url='https://pyyaml.org',
license_url=
'https://raw.githubusercontent.com/yaml/pyyaml/5.4.1/LICENSE',
'https://raw.githubusercontent.com/yaml/pyyaml/6.0.1/LICENSE',
),
LicenseMetadata(
name='bidict',
Expand Down
2 changes: 1 addition & 1 deletion bundler/bundle/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ MarkupSafe==2.1.1
packaging==21.3
pycparser==2.21
pyparsing==3.0.9
PyYAML==6.0
PyYAML==6.0.1
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ eventlet==0.31.0
Flask==1.1.1
Flask-SocketIO==5.0.1
Flask-WTF==0.14.3
pyyaml==5.4.1
pyyaml==6.0.1

# Indirect dependencies
bidict==0.21.2
Expand Down

0 comments on commit ec45ba7

Please sign in to comment.