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

Fix boards.txt.py compatible with python3 #4995

Closed
wants to merge 11 commits into from

Conversation

wemos
Copy link
Contributor

@wemos wemos commented Aug 2, 2018

change print "" to print()

@d-a-v
Copy link
Collaborator

d-a-v commented Aug 2, 2018

Thanks !

Could you please sanitize this pull request by saving this file somewhere and starting from a clean-up-to-date master branch, then bring this file back and create a new PR ? (or you may try and update your master branch and use git rebase master in this fixing branch)

doc/faq/a05-board-generator.rst also needs update by removing the "python 2" requirement.

@wemos wemos closed this Aug 2, 2018
@wemos wemos deleted the fix_boards.txt.py branch August 2, 2018 11:59
@wemos
Copy link
Contributor Author

wemos commented Aug 2, 2018

I make new PR #4996 , is it correct?

@d-a-v
Copy link
Collaborator

d-a-v commented Aug 2, 2018

As far as I can see, it is the same one. Your previous commits are visible in this PR and they should not. Your master branch may not be flat (gitk may show a tube map).

What I would try is:

git checkout master
git pull origin master
git checkout e4d9c279ef1991256793745242c177148ca58b2a # current HEAD
git checkout -b new_fix_board
# copy/update files
# git add/commit files
git push wemos new_fix_board

@wemos
Copy link
Contributor Author

wemos commented Aug 2, 2018

@d-a-v Thank you for your help.
I make new #4998 , I think it is correct now.

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.

4 participants