-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Supporting for Python 2 and 3 with the same code base #1240
Conversation
If the tests would fail on the intermediate commits, please squash them before the merge. That way we don't need to use "git bisect --skip" as often. |
@goodfeli Tests failed on 5 commits. Because most of fixes are simple syntactic changes (e.g. from |
No, if it's only test_format.py that fails, it's fine not to squash. |
I'm fine with merging this, do we need approval from a current CCW member? |
I skimmed through this PR this morning and it looked fine to me. We might need to update the pull request checklist in the future to reflect the changes to using e.g. |
I'm also fine with it being merged. Vincent Dumoulin, B.Sc. Physique et Informatique On Fri, Nov 14, 2014 at 4:04 PM, Bart van Merriënboer <
|
It probably will mean that all current pull requests will need to be rebased, though. |
I think it's better to rebase the other pull requests than to rebase this one. This one is huge and very hard to rebase. It is also more vulnerable to needing additional rebases since anything we merge is likely to conflict with it. So I'm going to merge it now to avoid this PR getting stuck in an infinite rebase loop. |
Supporting for Python 2 and 3 with the same code base
Erm, I wish I had seen this earlier. This introduces a dependency on six. Are we okay with this? I'd prefer just throwing six in packaged_dependencies personally. |
six is packaged with Theano, so I guess we could use that version. |
resolve #948