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

Updates to davisagli-py-3 branch #60

Closed
wants to merge 7 commits into from

Conversation

ale-rt
Copy link
Member

@ale-rt ale-rt commented Apr 17, 2018

No description provided.

@ale-rt ale-rt requested review from davisagli and icemac April 21, 2018 20:39
Copy link
Member

@icemac icemac left a comment

Choose a reason for hiding this comment

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

I am not sure what's the intent of the changes but from code level the look okay to me.

@ale-rt
Copy link
Member Author

ale-rt commented May 9, 2018

@davisagli if you are committing to this branch it might have sense to merge this branch into your (the original one I did not want to mess up).

@dataflake dataflake self-requested a review May 13, 2018 10:41
Copy link
Member

@dataflake dataflake left a comment

Choose a reason for hiding this comment

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

Most of this branch is no longer needed. I manually merged the minimum changes necessary to make all tests pass on the davisagli-py3 branch. I would like to merge that branch into master this week at the sprint in Halle, all further work can then branch off master again.

@ale-rt
Copy link
Member Author

ale-rt commented May 13, 2018

Thanks! Probably some of the changes are still needed to have Products.CMFCore tests green, but we can't sort this out the next week.
I will not be at the sprint but I will try to be available remotely :)

@dataflake
Copy link
Member

Tests are actually all green in CMFCore: zopefoundation/Products.CMFCore#42. That is ready to merge as well.

@ale-rt
Copy link
Member Author

ale-rt commented May 14, 2018

The tests are green because they are using this branch: https://github.com/zopefoundation/Products.CMFCore/pull/42/files#diff-a55fc4e553af13234f26342646b88e19R19 :)

@dataflake
Copy link
Member

Closing the pull request, I pulled all I needed from that branch.

@dataflake dataflake closed this May 16, 2018
@dataflake dataflake deleted the davisagli-py3-extension-2 branch May 16, 2018 10:42
@pbauer pbauer restored the davisagli-py3-extension-2 branch May 16, 2018 12:23
@davisagli
Copy link
Member

Thanks for sorting that out, @dataflake

@davilima6 davilima6 deleted the davisagli-py3-extension-2 branch June 7, 2018 18:50
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.

5 participants