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

poyo -> pyyaml (Issue #1513) #1515

Closed
wants to merge 5 commits into from
Closed

poyo -> pyyaml (Issue #1513) #1515

wants to merge 5 commits into from

Conversation

acturner
Copy link

I understand it may not be desirable to add pyyaml as a dependency, but these few changes do address both Issue #1513 and Issue #1514.

@simobasso
Copy link
Member

simobasso commented Apr 11, 2021

Hey, @acturner, please check #1516.

Sadly pyyaml can't be introduced without dropping windows users, please have a look at #1498 (comment)

@acturner
Copy link
Author

acturner commented Apr 11, 2021

@simobasso - Understood, unfortunately #1516 doesn't seem to fix these issues.
EDIT: #1516 fixes #1514 but not #1514

@simobasso
Copy link
Member

@acturner, thanks for reaching out. I just tried with your fork, and it works. Did you change anything?

@acturner
Copy link
Author

@simobasso Sorry I was mistaken, #1516 fixes #1514 - I had a similar solution, which doesn't require calling merge_configs when the key is missing (you can see in the diff). As far as fixing #1513, I just replaced poyo with pyyaml, which I know you said we can't use. It appears to be a problem with poyo ...

@samj1912
Copy link

Hey, @acturner, please check #1516.

Sadly pyyaml can't be introduced without dropping windows users, please have a look at #1498 (comment)

Hmm, AFAIK this should not be the case anymore. These yaml libraries now ship with wheels for windows so it should be possible to switch over. It is worth exploring moving to a better supported yaml library IMHO.

Copy link
Contributor

@glumia glumia left a comment

Choose a reason for hiding this comment

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

Please remove also lines 179:183 in tests/conftest.py, they are not needed anymore if we don't use poyo.

cookiecutter/config.py Outdated Show resolved Hide resolved
cookiecutter/config.py Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
cookiecutter/config.py Outdated Show resolved Hide resolved
@acturner
Copy link
Author

@glumia I believe I made all of your changes - let me know if anything doesn't look right. Cheers!

Copy link
Contributor

@glumia glumia left a comment

Choose a reason for hiding this comment

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

🔝 lgtm!

@acturner acturner changed the title Issues #1513 & #1514 poyo -> pyyaml (Issue #1513 ) Apr 26, 2021
@acturner
Copy link
Author

acturner commented Apr 26, 2021

Updated title to reflect that this PR no longer fixes Issue #1514 (but PR #1516 does).

@acturner acturner changed the title poyo -> pyyaml (Issue #1513 ) poyo -> pyyaml (Issue #1513) Apr 26, 2021
cookiecutter/config.py Outdated Show resolved Hide resolved
Co-authored-by: Sambhav Kothari <sambhavs.email@gmail.com>
@simobasso
Copy link
Member

Hey @acturner, thanks for this pr; I just enabled the ci.

Could you please check windows failures? Also, have you seen #1489 opened by @dHannasch?

@samj1912
Copy link

#1489 does seem like a similar implementation. It also fixes the test issues related to Windows builds.

@simobasso simobasso added the feature This issue/PR relates to major feature request. label Apr 26, 2021
@acturner
Copy link
Author

@simobasso @samj1912 I will check out #1489 soon and see what's going on with the Windows builds - also should probably add some tests for the bug this fixes (in case anyone makes a PR to use poyo again or something that breaks similarly)

@ssbarnea ssbarnea self-requested a review April 27, 2021 08:02
@ssbarnea
Copy link
Member

I do support this change but I fixing windows builds is required before being able to merge it.

@ssbarnea
Copy link
Member

Merged #1489 which did pass the tests.

@ssbarnea ssbarnea closed this Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature This issue/PR relates to major feature request.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants