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

Merge upstream PLY 3.9 into pycparser tree. #161

Merged
merged 2 commits into from Jan 28, 2017
Merged

Merge upstream PLY 3.9 into pycparser tree. #161

merged 2 commits into from Jan 28, 2017

Conversation

riggsd
Copy link
Contributor

@riggsd riggsd commented Jan 25, 2017

This updates PLY to the latest upstream code. Fixes Issue #160.

@eliben
Copy link
Owner

eliben commented Jan 25, 2017

Isn't the version you're copying here 3.10 rather than 3.9?

@riggsd
Copy link
Contributor Author

riggsd commented Jan 25, 2017

Ehrrm... Apologies, I thought that I'd merged the 3.9 tag, but I actually merged HEAD, which is one inconsistently-numbered commit ahead. The package-level __init__.py declares version 3.9 while the sub-modules each declare 3.10.

I'll resubmit with a checkout of the 3.9 release tag.

@eliben eliben merged commit 8e7d955 into eliben:master Jan 28, 2017
@riggsd riggsd deleted the update-ply branch January 30, 2017 04:53
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