Skip to content

Updated condition to skip for pytables build issue on numpy 1.15 #22098 #22522

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 7 commits into from
Aug 31, 2018
Merged

Updated condition to skip for pytables build issue on numpy 1.15 #22098 #22522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
966741d
Updated condition to skip for pytables build issue on numpy 1.15 #22098
NikhilKumarM Aug 27, 2018
583211f
Merge branch 'master' of https://github.com/pandas-dev/pandas into br…
NikhilKumarM Aug 27, 2018
cc2ea5b
Updated the message for skipping and added trailing comma
NikhilKumarM Aug 27, 2018
90690bf
Merge branch 'master' of https://github.com/pandas-dev/pandas into br…
NikhilKumarM Aug 28, 2018
d6cba4c
Explicitly checking numpy version 1.15 for pytables test
NikhilKumarM Aug 28, 2018
b252c1e
Merge branch 'master' of https://github.com/pandas-dev/pandas into br…
NikhilKumarM Aug 29, 2018
3337b74
Changed LooseVersion(1.15) to LooseVersion(1.15.0)
NikhilKumarM Aug 29, 2018
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
4 changes: 3 additions & 1 deletion pandas/compat/numpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
_np_version_under1p13 = _nlv < LooseVersion('1.13')
_np_version_under1p14 = _nlv < LooseVersion('1.14')
_np_version_under1p15 = _nlv < LooseVersion('1.15')
_np_version_equal1p15 = _nlv == LooseVersion('1.15')
Copy link

Choose a reason for hiding this comment

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

Is the pattern to change this to

_np_version_under1p16 = _nlv < LooseVersion('1.16')
_np_version_equal1p16 = _nlv == LooseVersion('1.16')

when numpy 1.16 comes out? Or is this a one off to meet a current need?


if _nlv < '1.9':
raise ImportError('this version of pandas is incompatible with '
Expand Down Expand Up @@ -74,5 +75,6 @@ def np_array_datetime64_compat(arr, *args, **kwargs):
'_np_version_under1p12',
'_np_version_under1p13',
'_np_version_under1p14',
'_np_version_under1p15'
'_np_version_under1p15',
'_np_version_equal1p15'
Copy link
Contributor

Choose a reason for hiding this comment

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

nint: add a trailing comma

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is the comma required after '_np_version_equal1p15'?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, but it makes the next diff nicer.

]
4 changes: 2 additions & 2 deletions pandas/tests/io/test_pytables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from pandas import (Series, DataFrame, Panel, MultiIndex, Int64Index,
RangeIndex, Categorical, bdate_range,
date_range, timedelta_range, Index, DatetimeIndex,
isna, compat, concat, Timestamp, _np_version_under1p15)
isna, compat, concat, Timestamp, _np_version_equal1p15)

import pandas.util.testing as tm
import pandas.util._test_decorators as td
Expand Down Expand Up @@ -2192,7 +2192,7 @@ def test_unimplemented_dtypes_table_columns(self):
pytest.raises(TypeError, store.append, 'df_unimplemented', df)

@pytest.mark.skipif(
not _np_version_under1p15,
Copy link
Contributor

Choose a reason for hiding this comment

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

don't define anything new here, juse use LooseVersion explicity to check for 1.15.0 as this is the only version affected.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have changed it. Could you please have a look at it @jreback. let me know if changes required.

_np_version_equal1p15,
reason=("pytables conda build package needs build "
Copy link
Contributor

Choose a reason for hiding this comment

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

You could update this message to link to the upstream numpy issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated.

"with numpy 1.15: gh-22098"))
def test_calendar_roundtrip_issue(self):
Expand Down