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.

Sign up for GitHub

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

Jump to bottom

1.14.1 cherry-pick request: Add contents of wrapped module __dict__ to DeprecationWrapper __dict__. #30236

Merged
merged 2 commits into from
Jul 2, 2019
Merged

1.14.1 cherry-pick request: Add contents of wrapped module __dict__ to DeprecationWrapper __dict__. #30236

merged 2 commits into from
Jul 2, 2019

Conversation

annarev
Copy link
Contributor

@annarev annarev commented Jun 28, 2019

Cherrypick of b789a3b

Add contents of wrapped module dict to DeprecationWrapper dict.
Should fix the following two issues:
#30184,
#30028.

Also, while at it, reducing maximum deprecation warnings to 1 per module to reduce amount of spam.

@tensorflow-bot tensorflow-bot bot added the size:M CL Change Size: Medium label Jun 28, 2019
mihaimaruseac
mihaimaruseac previously approved these changes Jun 28, 2019
View reviewed changes
@annarev
Copy link
Contributor Author

annarev commented Jun 28, 2019

Looks like there are new failures for MacOS Contrib build. I will push what I think is a fix and rerun the builds.

@rthadur rthadur self-assigned this Jun 28, 2019
@rthadur rthadur added this to Assigned Reviewer in PR Queue via automation Jun 28, 2019
@annarev annarev added the kokoro:force-run Tests on submitted change label Jun 29, 2019
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jun 29, 2019
@annarev annarev added the kokoro:force-run Tests on submitted change label Jul 1, 2019
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jul 1, 2019
@annarev annarev added the kokoro:force-run Tests on submitted change label Jul 1, 2019
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jul 1, 2019
@annarev annarev added the kokoro:force-run Tests on submitted change label Jul 1, 2019
@kokoro-team kokoro-team removed kokoro:force-run Tests on submitted change labels Jul 1, 2019
@annarev
Copy link
Contributor Author

annarev commented Jul 2, 2019 •
edited

Build errors of the form ImportError: cannot import name 'feature_column_v2' are caused by estimator version mismatch in our builds.

I changed Mac and Python3 PIP builds to correctly install tensorflow_estimator==1.14.0 and they passed (except MacOS Py2 which failed due to infra issue).
I haven't fixed estimator version pulled in for build on Windows. So, it still fails with feature_column_v2 error. However, since we know what causes that error, I think this cherrypick is now ok to submit.

PR Queue automation moved this from Assigned Reviewer to Approved by Reviewer Jul 2, 2019
@annarev annarev merged commit 88340a9 into tensorflow:r1.14 Jul 2, 2019
PR Queue automation moved this from Approved by Reviewer to Merged Jul 2, 2019
@annarev annarev deleted the cherrypicks_3NED8 branch July 2, 2019 07:10
@sylee957 sylee957 mentioned this pull request Jul 9, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaimaruseac mihaimaruseac mihaimaruseac approved these changes

Assignees

@rthadur rthadur

Labels
cla: yes size:M CL Change Size: Medium
Projects
PR Queue
  
Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@annarev @mihaimaruseac @googlebot @kokoro-team @rthadur