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

DOC: Fix flake8 issues in doc/source/reshaping.rst #24183

Merged
merged 4 commits into from
Dec 10, 2018

Conversation

charlesdong1991
Copy link
Member

@charlesdong1991 charlesdong1991 commented Dec 9, 2018

@jreback jreback added the Docs label Dec 9, 2018
@codecov
Copy link

codecov bot commented Dec 9, 2018

Codecov Report

Merging #24183 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #24183   +/-   ##
=======================================
  Coverage   92.21%   92.21%           
=======================================
  Files         162      162           
  Lines       51723    51723           
=======================================
  Hits        47695    47695           
  Misses       4028     4028
Flag Coverage Δ
#multiple 90.61% <ø> (ø) ⬆️
#single 43.03% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3dbb137...12a447e. Read the comment docs.

@codecov
Copy link

codecov bot commented Dec 9, 2018

Codecov Report

Merging #24183 into master will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #24183      +/-   ##
==========================================
- Coverage   92.21%   92.21%   -0.01%     
==========================================
  Files         162      162              
  Lines       51723    51723              
==========================================
- Hits        47695    47694       -1     
- Misses       4028     4029       +1
Flag Coverage Δ
#multiple 90.61% <ø> (ø) ⬆️
#single 43.03% <ø> (-0.01%) ⬇️
Impacted Files Coverage Δ
pandas/io/json/json.py 92.61% <0%> (-0.48%) ⬇️
pandas/util/testing.py 87.51% <0%> (+0.09%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 138a59a...0c7c9ec. Read the comment docs.

Copy link
Member

@datapythonista datapythonista left a comment

Choose a reason for hiding this comment

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

lgtm

you'll have to merge the conflict in setup.cfg, we just merged a PR removing some other files from the exclude list

@charlesdong1991
Copy link
Member Author

@datapythonista thanks, just rebased...

@datapythonista
Copy link
Member

@charlesdong1991 can you delete the comparison_with_* from the exclude list? when fixing the conflict they were incorrectly added back

@charlesdong1991
Copy link
Member Author

oh, @datapythonista sorry, i didn't check very carefully... just recalled that they were in between HEAD, should be removed indeed.... sorry, next time will check the conflicts more carefully

@datapythonista
Copy link
Member

No worries, usually conflicts are about code added or modified, but when the code is deleted, the fix is usually removing the code block. It usually helps to do a git diff after fixing the conflict, so you know what your branch is actually changing with respect to master.

@jreback jreback added this to the 0.24.0 milestone Dec 10, 2018
@jreback
Copy link
Contributor

jreback commented Dec 10, 2018

can you merge master here

@jreback jreback merged commit c5a4711 into pandas-dev:master Dec 10, 2018
@jreback
Copy link
Contributor

jreback commented Dec 10, 2018

thanks!

@charlesdong1991
Copy link
Member Author

@datapythonista sorry, i was working and didn't notice the email... and many thanks for solving the merge conflict for me...

@datapythonista
Copy link
Member

no worries, these trivial conflicts can be easily fixed in the github UI

Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DOC: Fix flake8 issues in doc/source/reshaping.rst
3 participants