Skip to content
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.

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

pin pyyaml to python2 compatible version #31

Merged
merged 1 commit into from Oct 8, 2021

Conversation

adam-bloom
Copy link
Contributor

@adam-bloom adam-bloom commented Oct 7, 2021

Well...not related to my last change...but also a one line fix as I hoped.

Looks like https://pypi.org/project/PyYAML/6.0b1/#history was released on pypi on Monday (which drops python2.7 support: yaml/pyyaml#550) - just in time to wreak havoc here! I've added an explicit version pin to 5.4.1. Hopefully, duktape will eventually be updated to be python3 compatible - looks like the vcpkg folks are interested in svaarala/duktape#1794 as well! (The vcpkg port attempts to install pyyaml if it is not present, but it falls into the same trap now, so removing this separate install step was not successful.)

@tupaschoal mind giving this another go? Thanks!

@tupaschoal tupaschoal merged commit 643afb7 into OpenRCT2:master Oct 8, 2021
@tupaschoal
Copy link
Member

Seems to have worked fine now @adam-bloom :)

PS: Weirdly MAC takes A LOT longer to build than the windows ones, I'm guessing it's caching.

@adam-bloom
Copy link
Contributor Author

Seems to have worked fine now @adam-bloom :)

PS: Weirdly MAC takes A LOT longer to build than the windows ones, I'm guessing it's caching.

Yeah, there’s no caching on the Mac build. It also builds both architectures serially (intel and M1) where as the windows jobs do that in parallel. I figured we don’t build these all that often right now, so we have better things to do than optimize it further.

@tupaschoal
Copy link
Member

Agreed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants