-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
DOC: Fixes flake8 issues in whatsnew v0.13.* #24256 #24322
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
Conversation
Seuss27
commented
Dec 17, 2018
- closes DOC: Fix flake8 issues in doc/source/whatsnew/v0.13.*.rst #24256
Added the setup.cfg file
Added setup.cfg
Added the flake8-group: ignore to fix the intentional E999 errors and fixed the remaining flake8 issues in v0.13.0.rst
Corrected issues in v0.13.1.rst
Updated setup.cfg to the most recent version before PR
Added missing space in setup.cfg exclusion section.
One more try with setup.cfg...
I am not sure if there is anything different I can do with the merge conflict in setup.cfg. Please advise. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good changes, just added a few comments. Also, you'll have to fix the conflicts, I guess we removed some more fixed pages from setup.cfg
One more try with setup.cfg...
Another attempt to get the conflicts resolved with setup.cfg Incorporated the requested changes.
Rollback strange changes to setup.cfg and hopefully resolve the merge conflict.
….13*" This reverts commit bb06bdb.
Another attempt to fix the merge conflict with setup.cfg
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you do the merge from master, and fix the conflicts please. We can't merge this PR otherwise.
pls merge master |
Fixed merge errors with setup.cfg, reapplying changes in this version
Codecov Report
@@ Coverage Diff @@
## master #24322 +/- ##
==========================================
- Coverage 92.28% 92.28% -0.01%
==========================================
Files 162 162
Lines 51831 51835 +4
==========================================
+ Hits 47833 47835 +2
- Misses 3998 4000 +2
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #24322 +/- ##
==========================================
- Coverage 92.28% 92.28% -0.01%
==========================================
Files 162 162
Lines 51831 51835 +4
==========================================
+ Hits 47833 47835 +2
- Misses 3998 4000 +2
Continue to review full report at Codecov.
|
Implemented remaining requested changes...
thanks @Seuss27 |