Revert "TST: remove deprecated usages of FrozenList.add from test… · pandas-dev/pandas@527ded9 (original) (raw)
6 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -940,9 +940,9 @@ def construct_index_parts(idx, major=True): | ||
| 940 | 940 | minor_labels, minor_levels, minor_names = construct_index_parts( |
| 941 | 941 | self.minor_axis, major=False) |
| 942 | 942 | |
| 943 | -levels = list(major_levels) + list(minor_levels) | |
| 944 | -labels = list(major_labels) + list(minor_labels) | |
| 945 | -names = list(major_names) + list(minor_names) | |
| 943 | +levels = major_levels + minor_levels | |
| 944 | +labels = major_labels + minor_labels | |
| 945 | +names = major_names + minor_names | |
| 946 | 946 | |
| 947 | 947 | index = MultiIndex(levels=levels, labels=labels, names=names, |
| 948 | 948 | verify_integrity=False) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -216,8 +216,8 @@ def get_new_columns(self): | ||
| 216 | 216 | width = len(self.value_columns) |
| 217 | 217 | propagator = np.repeat(np.arange(width), stride) |
| 218 | 218 | if isinstance(self.value_columns, MultiIndex): |
| 219 | -new_levels = self.value_columns.levels.union((self.removed_level,)) | |
| 220 | -new_names = self.value_columns.names.union((self.removed_name,)) | |
| 219 | +new_levels = self.value_columns.levels + (self.removed_level,) | |
| 220 | +new_names = self.value_columns.names + (self.removed_name,) | |
| 221 | 221 | |
| 222 | 222 | new_labels = [lab.take(propagator) |
| 223 | 223 | for lab in self.value_columns.labels] |
| @@ -806,7 +806,7 @@ def melt(frame, id_vars=None, value_vars=None, var_name=None, | ||
| 806 | 806 | for col in id_vars: |
| 807 | 807 | mdata[col] = np.tile(frame.pop(col).values, K) |
| 808 | 808 | |
| 809 | -mcolumns = list(id_vars) + list(var_name) + list([value_name]) | |
| 809 | +mcolumns = id_vars + var_name + [value_name] | |
| 810 | 810 | |
| 811 | 811 | mdata[value_name] = frame.values.ravel('F') |
| 812 | 812 | for i, col in enumerate(var_name): |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -787,7 +787,7 @@ def str_extractall(arr, pat, flags=0): | ||
| 787 | 787 | if 0 < len(index_list): |
| 788 | 788 | from pandas import MultiIndex |
| 789 | 789 | index = MultiIndex.from_tuples( |
| 790 | -index_list, names=arr.index.names.union(["match"])) | |
| 790 | +index_list, names=arr.index.names + ["match"]) | |
| 791 | 791 | else: |
| 792 | 792 | index = None |
| 793 | 793 | result = arr._constructor_expanddim(match_list, index=index, |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -28,7 +28,7 @@ def check_value_counts(df, keys, bins): | ||
| 28 | 28 | |
| 29 | 29 | gr = df.groupby(keys, sort=isort) |
| 30 | 30 | right = gr['3rd'].apply(Series.value_counts, **kwargs) |
| 31 | -right.index.names = right.index.names[:-1].union(['3rd']) | |
| 31 | +right.index.names = right.index.names[:-1] + ['3rd'] | |
| 32 | 32 | |
| 33 | 33 | # have to sort on index because of unstable sort on values |
| 34 | 34 | left, right = map(rebuild_index, (left, right)) # xref GH9212 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -574,7 +574,7 @@ def _make_concat_multiindex(indexes, keys, levels=None, names=None): | ||
| 574 | 574 | " not have the same number of levels") |
| 575 | 575 | |
| 576 | 576 | # also copies |
| 577 | -names = list(names) + list(_get_consensus_names(indexes)) | |
| 577 | +names = names + _get_consensus_names(indexes) | |
| 578 | 578 | |
| 579 | 579 | return MultiIndex(levels=levels, labels=label_list, names=names, |
| 580 | 580 | verify_integrity=False) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -5,4 +5,4 @@ | ||
| 5 | 5 | # https://github.com/pytest-dev/pytest/issues/1075 |
| 6 | 6 | export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') |
| 7 | 7 | |
| 8 | -pytest pandas --skip-slow --skip-network -m "not single" -n 4 $@ | |
| 8 | +pytest pandas --skip-slow --skip-network -m "not single" -n 4 |