Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions swat/cas/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -3982,7 +3982,7 @@ def _topk_frequency(self, maxtie=0, skipna=True):
out = out.drop('Rank', axis=1)

if 'NumVar' in out.columns and 'CharVar' in out.columns:
out['NumVar'].fillna(out['CharVar'], inplace=True)
out.fillna({'NumVar': out['CharVar']}, inplace=True)
out.drop('CharVar', axis=1, inplace=True)
out.rename(columns=dict(NumVar='top'), inplace=True)

Expand Down Expand Up @@ -4379,7 +4379,7 @@ def _topk_values(self, stats=None, axis=None, skipna=True, level=None,
minmax = pd.concat(minmax)
minmax.loc[:, 'stat'] = ['max', 'min'] * int(len(minmax) / 2)
if 'NumVar' in minmax.columns and 'CharVar' in minmax.columns:
minmax['NumVar'].fillna(minmax['CharVar'], inplace=True)
minmax.fillna({'NumVar': minmax['CharVar']}, inplace=True)
minmax.rename(columns=dict(NumVar='value', Column='column'),
inplace=True)
elif 'NumVar' in minmax.columns:
Expand Down
Empty file modified swat/tests/cas/test_bygroups.py
100755 → 100644
Empty file.
Empty file modified swat/tests/cas/test_connection.py
100755 → 100644
Empty file.
6 changes: 3 additions & 3 deletions swat/tests/cas/test_datamsg.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ def setUp(self):
swat.options.interactive_mode = False
swat.options.cas.missing.int64 = -999999

self.s = swat.CAS(HOST, PORT, USER, PASSWD, protocol=PROTOCOL)

if self.s._protocol in ['http', 'https']:
if PROTOCOL in ['http', 'https']:
tm.TestCase.skipTest(self, 'REST does not support data messages')

self.s = swat.CAS(HOST, PORT, USER, PASSWD, protocol=PROTOCOL)

if type(self).server_type is None:
# Set once per class and have every test use it.
# No need to change between tests.
Expand Down
2 changes: 2 additions & 0 deletions swat/tests/cas/test_echo.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ def setUp(self):

out = self.s.loadactionset(actionset='actionTest')
if out.severity != 0:
self.s.endsession()
del self.s
self.skipTest("actionTest failed to load")

def tearDown(self):
Expand Down
2 changes: 2 additions & 0 deletions swat/tests/cas/test_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ def setUp(self):

r = self.s.loadactionset(actionset='actionTest')
if r.severity != 0:
self.s.endsession()
del self.s
self.skipTest("actionTest failed to load")

self.s.loadactionset(actionset='simple')
Expand Down
Empty file modified swat/tests/cas/test_table.py
100755 → 100644
Empty file.
Empty file modified swat/tests/test_config.py
100755 → 100644
Empty file.
Empty file modified swat/tests/test_dataframe.py
100755 → 100644
Empty file.