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

TST: xref #25630 #25643

Merged
merged 2 commits into from
Mar 10, 2019
Merged

TST: xref #25630 #25643

merged 2 commits into from
Mar 10, 2019

Conversation

jreback
Copy link
Contributor

@jreback jreback commented Mar 10, 2019

skip on PY2 & old numpy for masked arrays

@jreback jreback added this to the 0.24.2 milestone Mar 10, 2019
jreback added 2 commits March 10, 2019 18:16
skip on PY2 & old numpy for masked arrays
@codecov
Copy link

codecov bot commented Mar 10, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@16edaaf). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #25643   +/-   ##
=========================================
  Coverage          ?   41.71%           
=========================================
  Files             ?      173           
  Lines             ?    52968           
  Branches          ?        0           
=========================================
  Hits              ?    22096           
  Misses            ?    30872           
  Partials          ?        0
Flag Coverage Δ
#single 41.71% <ø> (?)

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 16edaaf...51f048a. Read the comment docs.

@codecov
Copy link

codecov bot commented Mar 10, 2019

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #25643   +/-   ##
=======================================
  Coverage   91.26%   91.26%           
=======================================
  Files         173      173           
  Lines       52968    52968           
=======================================
  Hits        48339    48339           
  Misses       4629     4629
Flag Coverage Δ
#multiple 89.83% <ø> (ø) ⬆️
#single 41.71% <ø> (ø) ⬆️

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 16edaaf...51f048a. Read the comment docs.

@jreback jreback merged commit f886139 into pandas-dev:master Mar 10, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Mar 10, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 0.24.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 f88613929d6c83952cb5a6bf70678a78be480baa
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #25643: TST: xref #25630'
  1. Push to a named branch :
git push YOURFORK 0.24.x:auto-backport-of-pr-25643-on-0.24.x
  1. Create a PR against branch 0.24.x, I would have named this PR:

"Backport PR #25643 on branch 0.24.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

jreback added a commit to jreback/pandas that referenced this pull request Mar 10, 2019
jreback added a commit that referenced this pull request Mar 11, 2019
* TST: failing wheel building on PY2 and old numpy (#25631)

closes #25630

* TST: xref #25630 (#25643)

* TST: xref #25630

* add PY2 import
thoo added a commit to thoo/pandas that referenced this pull request Mar 11, 2019
* upstream/master: (110 commits)
  DOC: hardcode contributors for 0.24.x releases (pandas-dev#25662)
  DOC: restore toctree maxdepth (pandas-dev#25134)
  BUG: Redefine IndexOpsMixin.size, fix pandas-dev#25580. (pandas-dev#25584)
  BUG: to_csv line endings with compression (pandas-dev#25625)
  DOC: file obj for to_csv must be newline='' (pandas-dev#25624)
  Suppress incorrect warning in nargsort for timezone-aware DatetimeIndex (pandas-dev#25629)
  TST: fix incorrect sparse test (now failing on scipy master) (pandas-dev#25653)
  CLN: Removed debugging code (pandas-dev#25647)
  DOC: require Return section only if return is not None nor commentary (pandas-dev#25008)
  DOC:Remove hard-coded examples from _flex_doc_SERIES (pandas-dev#24589) (pandas-dev#25524)
  TST: xref pandas-dev#25630 (pandas-dev#25643)
  BUG: Fix pandas-dev#25481 by fixing the error message in TypeError (pandas-dev#25540)
  Fixturize tests/frame/test_mutate_columns.py (pandas-dev#25642)
  Fixturize tests/frame/test_join.py (pandas-dev#25639)
  Fixturize tests/frame/test_combine_concat.py (pandas-dev#25634)
  Fixturize tests/frame/test_asof.py (pandas-dev#25628)
  BUG: Fix user-facing AssertionError with to_html (pandas-dev#25608) (pandas-dev#25620)
  DOC: resolve all GL03 docstring validation errors (pandas-dev#25525)
  TST: failing wheel building on PY2 and old numpy (pandas-dev#25631)
  DOC: Remove makePanel from docs (pandas-dev#25609) (pandas-dev#25612)
  ...
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.

2 participants