Skip to content

DEPS: Bump numpy to 1.13.3 #25554

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

Merged
merged 25 commits into from
Mar 28, 2019
Merged

DEPS: Bump numpy to 1.13.3 #25554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bcaf944
DEPS: bump numpy minimum to 1.13.3
h-vetinari Mar 25, 2019
ca28cdb
Fixes
h-vetinari Mar 25, 2019
4830f49
Enforce higher bottleneck version
h-vetinari Mar 25, 2019
49e8a06
Shift mpl pin away from coverage job
h-vetinari Mar 25, 2019
01e2b06
Clean up scipy cruft
h-vetinari Mar 25, 2019
a3e09c2
Reshuffle mpl pins
h-vetinari Mar 26, 2019
27bf206
More numpy cruft
h-vetinari Mar 26, 2019
64fc701
Fix order and pin in azure compat job
h-vetinari Mar 26, 2019
327ef30
Reformulate version bump in whatsnew, add lowest version pins where m…
h-vetinari Mar 26, 2019
f3f7d2b
clean some old sqlalchemy code
h-vetinari Mar 26, 2019
5f2e19b
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 26, 2019
e3d9f6e
Review (jreback)
h-vetinari Mar 26, 2019
182d67c
Fixes
h-vetinari Mar 26, 2019
d0bb930
Lint
h-vetinari Mar 26, 2019
3ea9cd8
Update whatsnew issues references
h-vetinari Mar 26, 2019
ffd86ff
split table in whatsnew (review jreback)
h-vetinari Mar 27, 2019
fb449ea
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 27, 2019
a7d7190
Remove left-over comment
h-vetinari Mar 27, 2019
aad68c6
Remove cython from deps in whatsnew
h-vetinari Mar 27, 2019
fa674e3
Fix wording
h-vetinari Mar 27, 2019
8005679
Reinstate better regexes
h-vetinari Mar 27, 2019
b4288e9
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 27, 2019
e0f8a6d
Review (jreback)
h-vetinari Mar 27, 2019
445a9a2
Simplify regex
h-vetinari Mar 28, 2019
20ad5a5
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pandas/tests/test_algos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,11 @@ def test_complex_sorting(self):
# gh 12666 - check no segfault
x17 = np.array([complex(i) for i in range(17)], dtype=object)

msg = (r"'(<|>)' not supported between instances of 'complex' and"
r" 'complex'|"
r"unorderable types: complex\(\) > complex\(\)")
msg = ("unorderable types: {0} [<>] {0}".format(r"complex\(\)")
+ "|" +
"'[<>]' not supported between instances of {0} and {0}".format(
"'complex'")
)
with pytest.raises(TypeError, match=msg):
algos.factorize(x17[::-1], sort=True)

Expand Down
11 changes: 7 additions & 4 deletions pandas/tests/test_sorting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,10 +413,13 @@ def test_mixed_integer_from_list(self):
def test_unsortable(self):
# GH 13714
arr = np.array([1, 2, datetime.now(), 0, 3], dtype=object)
msg = (r"'(<|>)' not supported between instances of ('"
r"datetime\.datetime' and 'int'|'int' and 'datetime\.datetime"
r"')|"
r"unorderable types: int\(\) > datetime\.datetime\(\)")
msg = ("unorderable types: ({0} [<>] {1}|{1} [<>] {0})".format(
r"int\(\)", r"datetime\.datetime\(\)") # noqa: E126
Copy link
Contributor

Choose a reason for hiding this comment

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

this fails the wheel building CI. pls don't revert this, I don't want to debug this problem. Just make this MUCH simpler so it will pretty much always pass.

Copy link
Contributor Author

@h-vetinari h-vetinari Mar 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

It will not fail the wheel building CI. I actually checked the wheel builder failures from #25867 before giving my review in #25874.

In case you don't have time to read the review, the original code in #25752 has an if _np_version_under1p14 else-switch that turned out to be wrong, while the regex here only uses a |-conjunction.

[...] I don't want to debug this problem.

Neither did I, but I've had to for a passing CI. Please have a look at the actual regexes. What I've written is a proper superset of the current regexes (again, now that the switch has been turned into "|").

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just make this MUCH simpler so it will pretty much always pass.

Done.

+ "|" +
("'[<>]' not supported between instances of "
"({0} and {1}|{1} and {0})").format(
"'int'", r"'datetime\.datetime'")
)
with pytest.raises(TypeError, match=msg):
safe_sort(arr)

Expand Down