Skip to content

Fix import format at pandas/tests/io/arithmetic directory #24579

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
Merged
merged 6 commits into from
Jan 4, 2019
Merged

Fix import format at pandas/tests/io/arithmetic directory #24579

merged 6 commits into from
Jan 4, 2019
+34 −45

Conversation

mwoss
Copy link
Contributor

@mwoss mwoss commented Jan 3, 2019

Ran isort --recursive pandas/tests/io/arithmetic and then checked imports using isort --recursive --check-only pandas/tests/io/arithmetic

Sorry, something went wrong.

@mwoss
Fix import format at pandas/tests/io/arithmetic directory

Verified

This commit was signed with the committer’s verified signature. The key has expired.
graingert Thomas Grainger
GPG key ID: 2241857EB9DA2BC6
Expired
Verified
Learn about vigilant mode
6932fdb
@codecov
Copy link

codecov bot commented Jan 3, 2019

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #24579   +/-   ##
=======================================
  Coverage   92.33%   92.33%           
=======================================
  Files         166      166           
  Lines       52544    52544           
=======================================
  Hits        48516    48516           
  Misses       4028     4028
Flag Coverage Δ
#multiple 90.76% <ø> (ø) ⬆️
#single 43.05% <ø> (ø) ⬆️

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 9ad1e00...6932fdb. Read the comment docs.

@codecov
Copy link

codecov bot commented Jan 3, 2019 •
edited
Loading

Codecov Report

Merging #24579 into master will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #24579      +/-   ##
==========================================
+ Coverage   92.36%   92.38%   +0.02%     
==========================================
  Files         166      166              
  Lines       52497    52485      -12     
==========================================
+ Hits        48489    48490       +1     
+ Misses       4008     3995      -13
Flag Coverage Δ
#multiple 90.81% <ø> (+0.02%) ⬆️
#single 43.04% <ø> (ø) ⬆️
Impacted Files Coverage Δ
pandas/core/indexes/accessors.py 91% <0%> (ø) ⬆️
pandas/core/indexes/timedeltas.py 90.22% <0%> (ø) ⬆️
pandas/core/arrays/period.py 98.53% <0%> (+0.01%) ⬆️
pandas/core/arrays/interval.py 93.08% <0%> (+0.04%) ⬆️
pandas/util/testing.py 88.09% <0%> (+0.09%) ⬆️
pandas/core/internals/blocks.py 94.49% <0%> (+0.7%) ⬆️

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 0039158...2eb02d8. Read the comment docs.

@jreback
Copy link
Contributor

jreback commented Jan 3, 2019

need to merge master

@jreback jreback added the Code Style Code style, linting, code_checks label Jan 3, 2019
@mwoss
Merge branch 'master' into issue-23334-arithmetic

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
ac2d133 
# Conflicts:
#	pandas/tests/arithmetic/test_datetime64.py
#	setup.cfg
@mwoss
Copy link
Contributor Author

mwoss commented Jan 3, 2019

@jreback marged with master, tests are running at the moment

mwoss added 2 commits January 3, 2019 12:36
@mwoss
Fix a partially incorrect conflict resolve from previous commit (wron…

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
6ffd126 
…g function name)
@mwoss
Fix linting errors

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
7aa472e
@mwoss
Copy link
Contributor Author

mwoss commented Jan 3, 2019

@jreback Tests passed ;)

@jreback
Copy link
Contributor

jreback commented Jan 3, 2019

can you remove the files from setup.cfg (othewise its not testing these)

@mwoss
Copy link
Contributor Author

mwoss commented Jan 3, 2019 •
edited
Loading

I thought I've done that, my bad. I will do this in 4 hours.

mwoss added 2 commits January 3, 2019 22:20
@mwoss
Remove tests/arithmetic from setup.cfg

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
0a55c58
@mwoss
Repair import order in test/arithmetic/conftest.py

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
2eb02d8
@jreback jreback added this to the 0.24.0 milestone Jan 3, 2019
@jreback
Copy link
Contributor

jreback commented Jan 3, 2019

lgtm. ping on green.

@jreback jreback merged commit 1e6b4b7 into pandas-dev:master Jan 4, 2019
@jreback
Copy link
Contributor

jreback commented Jan 4, 2019

thanks @mwoss

Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
@mwoss @Pingviinituutti
Fix import format at pandas/tests/io/arithmetic directory (pandas-dev…
d8c25ed 
…#24579)
Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
@mwoss @Pingviinituutti
Fix import format at pandas/tests/io/arithmetic directory (pandas-dev…
feac141 
…#24579)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Code Style Code style, linting, code_checks
Projects
None yet
Milestone
0.24.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mwoss @jreback