Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ca8f96b
TST: tests for maybe_promote (precursor to #23982)
h-vetinari Feb 24, 2019
a881929
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari May 13, 2019
e14d8a2
Fix tabs vs. spaces
h-vetinari May 13, 2019
bc10a87
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari May 14, 2019
ab328c0
fix conftest
h-vetinari May 14, 2019
80d4081
more conftest merge conflict artefact fixes
h-vetinari May 14, 2019
4a2327c
lint
h-vetinari May 14, 2019
a205ea9
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari May 30, 2019
79299af
Review (jreback)
h-vetinari May 30, 2019
1b18fde
Add docstring to _check_promote
h-vetinari May 30, 2019
ff3be04
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari May 31, 2019
9fec7f9
doc improvements
h-vetinari May 31, 2019
bf8c02d
fix c&p artefact
h-vetinari May 31, 2019
595012c
Introduce parametrized fixture for box-variants; override where required
h-vetinari May 31, 2019
f89e8b4
improve docstring for box-fixture
h-vetinari May 31, 2019
4317f77
fix comments
h-vetinari May 31, 2019
c0b4a3f
fix fixture docstrings
h-vetinari May 31, 2019
d6001a7
docstring updates
h-vetinari May 31, 2019
f73740b
add ids for box-fixture
h-vetinari Jun 1, 2019
895fcb5
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari Jun 1, 2019
200365e
lint
h-vetinari Jun 1, 2019
bb36925
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari Jun 5, 2019
a97d29b
break out function to make _check_promote even more branchless
h-vetinari Jun 5, 2019
8c982f2
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari Jun 10, 2019
a1add65
Refactor with reduced any_numpy_dtype fixture (review jreback)
h-vetinari Jun 10, 2019
636b1f1
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
h-vetinari Jun 21, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into tst_maybe_promote…
…_precursor
  • Loading branch information
h-vetinari committed May 31, 2019
commit ff3be046a4005412e7edb46387f7f1035f6e3bc2

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.