From e96624b8a3f903798f7977fb92da09fc7417ec98 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 10:48:40 -0600 Subject: [PATCH 01/17] rename --- pandas/util/{testing.py => _testing.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pandas/util/{testing.py => _testing.py} (100%) diff --git a/pandas/util/testing.py b/pandas/util/_testing.py similarity index 100% rename from pandas/util/testing.py rename to pandas/util/_testing.py From d52d35f9d6a5e721ae0e6aa1579e44dac820ed7a Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 11:05:39 -0600 Subject: [PATCH 02/17] replace --- asv_bench/benchmarks/categoricals.py | 3 ++- asv_bench/benchmarks/ctors.py | 3 ++- asv_bench/benchmarks/frame_ctor.py | 3 ++- asv_bench/benchmarks/frame_methods.py | 3 ++- asv_bench/benchmarks/gil.py | 5 +++-- asv_bench/benchmarks/groupby.py | 3 ++- asv_bench/benchmarks/index_object.py | 3 ++- asv_bench/benchmarks/indexing.py | 3 ++- asv_bench/benchmarks/inference.py | 3 ++- asv_bench/benchmarks/io/csv.py | 3 ++- asv_bench/benchmarks/io/excel.py | 5 +++-- asv_bench/benchmarks/io/hdf.py | 3 ++- asv_bench/benchmarks/io/json.py | 3 ++- asv_bench/benchmarks/io/pickle.py | 3 ++- asv_bench/benchmarks/io/sql.py | 3 ++- asv_bench/benchmarks/io/stata.py | 3 ++- asv_bench/benchmarks/join_merge.py | 3 ++- asv_bench/benchmarks/multiindex_object.py | 3 ++- asv_bench/benchmarks/reindex.py | 3 ++- asv_bench/benchmarks/series_methods.py | 3 ++- asv_bench/benchmarks/strings.py | 3 ++- ci/code_checks.sh | 4 ++-- doc/source/development/contributing.rst | 4 ++-- doc/source/user_guide/io.rst | 2 +- doc/source/user_guide/reshaping.rst | 4 ++-- doc/source/user_guide/scale.rst | 2 +- doc/source/whatsnew/v0.12.0.rst | 2 +- doc/source/whatsnew/v0.13.1.rst | 2 +- doc/source/whatsnew/v0.18.0.rst | 2 +- doc/source/whatsnew/v0.20.0.rst | 2 +- doc/source/whatsnew/v0.21.0.rst | 2 +- doc/source/whatsnew/v0.23.0.rst | 2 +- doc/source/whatsnew/v1.0.0.rst | 2 +- pandas/_libs/testing.pyx | 12 ++++++------ pandas/conftest.py | 2 +- pandas/testing.py | 2 +- pandas/tests/api/test_api.py | 3 ++- pandas/tests/api/test_types.py | 3 ++- pandas/tests/arithmetic/common.py | 3 ++- pandas/tests/arithmetic/conftest.py | 3 ++- pandas/tests/arithmetic/test_datetime64.py | 2 +- pandas/tests/arithmetic/test_numeric.py | 3 ++- pandas/tests/arithmetic/test_object.py | 3 ++- pandas/tests/arithmetic/test_period.py | 2 +- pandas/tests/arithmetic/test_timedelta64.py | 2 +- pandas/tests/arrays/categorical/test_algos.py | 3 ++- pandas/tests/arrays/categorical/test_analytics.py | 2 +- pandas/tests/arrays/categorical/test_api.py | 3 ++- pandas/tests/arrays/categorical/test_constructors.py | 2 +- pandas/tests/arrays/categorical/test_dtypes.py | 3 ++- pandas/tests/arrays/categorical/test_indexing.py | 3 ++- pandas/tests/arrays/categorical/test_missing.py | 3 ++- pandas/tests/arrays/categorical/test_operators.py | 3 ++- pandas/tests/arrays/categorical/test_sorting.py | 3 ++- pandas/tests/arrays/categorical/test_subclass.py | 3 ++- pandas/tests/arrays/categorical/test_warnings.py | 2 +- pandas/tests/arrays/interval/test_interval.py | 3 ++- pandas/tests/arrays/interval/test_ops.py | 3 ++- pandas/tests/arrays/sparse/test_accessor.py | 2 +- pandas/tests/arrays/sparse/test_arithmetics.py | 3 ++- pandas/tests/arrays/sparse/test_array.py | 2 +- pandas/tests/arrays/sparse/test_combine_concat.py | 3 ++- pandas/tests/arrays/sparse/test_libsparse.py | 2 +- pandas/tests/arrays/string_/test_string.py | 2 +- pandas/tests/arrays/test_array.py | 3 ++- pandas/tests/arrays/test_boolean.py | 2 +- pandas/tests/arrays/test_datetimelike.py | 2 +- pandas/tests/arrays/test_datetimes.py | 3 ++- pandas/tests/arrays/test_integer.py | 2 +- pandas/tests/arrays/test_numpy.py | 3 ++- pandas/tests/arrays/test_period.py | 2 +- pandas/tests/arrays/test_timedeltas.py | 3 ++- pandas/tests/base/test_constructors.py | 2 +- pandas/tests/base/test_conversion.py | 3 ++- pandas/tests/base/test_ops.py | 2 +- pandas/tests/computation/test_eval.py | 2 +- .../tests/dtypes/cast/test_construct_from_scalar.py | 3 ++- pandas/tests/dtypes/cast/test_construct_ndarray.py | 4 ++-- pandas/tests/dtypes/cast/test_downcast.py | 3 ++- pandas/tests/dtypes/cast/test_infer_dtype.py | 3 ++- pandas/tests/dtypes/cast/test_upcast.py | 3 ++- pandas/tests/dtypes/test_common.py | 2 +- pandas/tests/dtypes/test_dtypes.py | 3 ++- pandas/tests/dtypes/test_generic.py | 3 ++- pandas/tests/dtypes/test_inference.py | 2 +- pandas/tests/dtypes/test_missing.py | 2 +- pandas/tests/extension/arrow/test_bool.py | 3 ++- pandas/tests/extension/base/base.py | 2 +- pandas/tests/extension/base/groupby.py | 3 ++- pandas/tests/extension/base/interface.py | 3 ++- pandas/tests/extension/base/methods.py | 3 ++- pandas/tests/extension/base/missing.py | 3 ++- pandas/tests/extension/base/reduce.py | 3 ++- pandas/tests/extension/decimal/test_decimal.py | 3 ++- pandas/tests/extension/json/test_json.py | 3 ++- pandas/tests/extension/test_boolean.py | 2 +- pandas/tests/extension/test_categorical.py | 3 ++- pandas/tests/extension/test_common.py | 3 ++- pandas/tests/extension/test_numpy.py | 2 +- pandas/tests/extension/test_sparse.py | 2 +- pandas/tests/frame/conftest.py | 3 ++- pandas/tests/frame/indexing/test_categorical.py | 3 ++- pandas/tests/frame/indexing/test_datetime.py | 3 ++- pandas/tests/frame/indexing/test_indexing.py | 2 +- pandas/tests/frame/indexing/test_where.py | 3 ++- pandas/tests/frame/methods/test_append.py | 3 ++- pandas/tests/frame/methods/test_asof.py | 3 ++- pandas/tests/frame/methods/test_clip.py | 3 ++- pandas/tests/frame/methods/test_count.py | 3 ++- pandas/tests/frame/methods/test_cov_corr.py | 2 +- pandas/tests/frame/methods/test_describe.py | 3 ++- pandas/tests/frame/methods/test_diff.py | 3 ++- pandas/tests/frame/methods/test_drop_duplicates.py | 3 ++- pandas/tests/frame/methods/test_duplicated.py | 3 ++- pandas/tests/frame/methods/test_explode.py | 3 ++- pandas/tests/frame/methods/test_isin.py | 3 ++- pandas/tests/frame/methods/test_nlargest.py | 3 ++- pandas/tests/frame/methods/test_pct_change.py | 3 ++- pandas/tests/frame/methods/test_quantile.py | 3 ++- pandas/tests/frame/methods/test_rank.py | 2 +- pandas/tests/frame/methods/test_replace.py | 3 ++- pandas/tests/frame/methods/test_round.py | 3 ++- pandas/tests/frame/methods/test_shift.py | 3 ++- pandas/tests/frame/methods/test_sort_index.py | 3 ++- pandas/tests/frame/methods/test_sort_values.py | 3 ++- pandas/tests/frame/methods/test_to_dict.py | 3 ++- pandas/tests/frame/methods/test_to_records.py | 3 ++- pandas/tests/frame/methods/test_transpose.py | 3 ++- pandas/tests/frame/methods/test_truncate.py | 3 ++- pandas/tests/frame/test_alter_axes.py | 3 ++- pandas/tests/frame/test_analytics.py | 2 +- pandas/tests/frame/test_api.py | 2 +- pandas/tests/frame/test_apply.py | 3 ++- pandas/tests/frame/test_arithmetic.py | 3 ++- pandas/tests/frame/test_axis_select_reindex.py | 2 +- pandas/tests/frame/test_block_internals.py | 3 ++- pandas/tests/frame/test_combine_concat.py | 3 ++- pandas/tests/frame/test_constructors.py | 2 +- pandas/tests/frame/test_cumulative.py | 3 ++- pandas/tests/frame/test_dtypes.py | 3 ++- pandas/tests/frame/test_join.py | 3 ++- pandas/tests/frame/test_missing.py | 2 +- pandas/tests/frame/test_mutate_columns.py | 3 ++- pandas/tests/frame/test_nonunique_indexes.py | 3 ++- pandas/tests/frame/test_operators.py | 3 ++- pandas/tests/frame/test_period.py | 3 ++- pandas/tests/frame/test_query_eval.py | 2 +- pandas/tests/frame/test_repr_info.py | 2 +- pandas/tests/frame/test_reshape.py | 3 ++- pandas/tests/frame/test_sort_values_level_as_str.py | 2 +- pandas/tests/frame/test_subclass.py | 3 ++- pandas/tests/frame/test_timeseries.py | 3 ++- pandas/tests/frame/test_timezones.py | 3 ++- pandas/tests/frame/test_to_csv.py | 2 +- pandas/tests/generic/test_frame.py | 2 +- pandas/tests/generic/test_generic.py | 3 ++- pandas/tests/generic/test_series.py | 2 +- pandas/tests/groupby/aggregate/test_aggregate.py | 3 ++- pandas/tests/groupby/aggregate/test_cython.py | 3 ++- pandas/tests/groupby/aggregate/test_other.py | 3 ++- pandas/tests/groupby/conftest.py | 3 ++- pandas/tests/groupby/test_apply.py | 3 ++- pandas/tests/groupby/test_bin_groupby.py | 2 +- pandas/tests/groupby/test_categorical.py | 2 +- pandas/tests/groupby/test_counting.py | 3 ++- pandas/tests/groupby/test_filters.py | 3 ++- pandas/tests/groupby/test_groupby.py | 2 +- pandas/tests/groupby/test_grouping.py | 3 ++- pandas/tests/groupby/test_index_as_string.py | 3 ++- pandas/tests/groupby/test_nth.py | 3 ++- pandas/tests/groupby/test_rank.py | 3 ++- pandas/tests/groupby/test_timegrouper.py | 3 ++- pandas/tests/groupby/test_transform.py | 2 +- pandas/tests/groupby/test_value_counts.py | 3 ++- pandas/tests/groupby/test_whitelist.py | 3 ++- pandas/tests/indexes/categorical/test_category.py | 2 +- .../tests/indexes/categorical/test_constructors.py | 3 ++- pandas/tests/indexes/common.py | 2 +- pandas/tests/indexes/conftest.py | 3 ++- pandas/tests/indexes/datetimelike.py | 3 ++- pandas/tests/indexes/datetimes/test_astype.py | 3 ++- pandas/tests/indexes/datetimes/test_constructors.py | 2 +- pandas/tests/indexes/datetimes/test_date_range.py | 2 +- pandas/tests/indexes/datetimes/test_datetime.py | 3 ++- pandas/tests/indexes/datetimes/test_datetimelike.py | 3 ++- pandas/tests/indexes/datetimes/test_formats.py | 3 ++- pandas/tests/indexes/datetimes/test_indexing.py | 3 ++- pandas/tests/indexes/datetimes/test_misc.py | 3 ++- pandas/tests/indexes/datetimes/test_missing.py | 3 ++- pandas/tests/indexes/datetimes/test_ops.py | 3 ++- .../tests/indexes/datetimes/test_partial_slicing.py | 3 ++- pandas/tests/indexes/datetimes/test_scalar_compat.py | 2 +- pandas/tests/indexes/datetimes/test_setops.py | 2 +- pandas/tests/indexes/datetimes/test_shift.py | 2 +- pandas/tests/indexes/datetimes/test_timezones.py | 2 +- pandas/tests/indexes/datetimes/test_tools.py | 2 +- pandas/tests/indexes/interval/test_astype.py | 3 ++- pandas/tests/indexes/interval/test_base.py | 3 ++- pandas/tests/indexes/interval/test_constructors.py | 3 ++- pandas/tests/indexes/interval/test_formats.py | 3 ++- pandas/tests/indexes/interval/test_indexing.py | 3 ++- pandas/tests/indexes/interval/test_interval.py | 3 ++- pandas/tests/indexes/interval/test_interval_range.py | 3 ++- pandas/tests/indexes/interval/test_interval_tree.py | 2 +- pandas/tests/indexes/interval/test_setops.py | 3 ++- pandas/tests/indexes/multi/test_analytics.py | 2 +- pandas/tests/indexes/multi/test_astype.py | 4 ++-- pandas/tests/indexes/multi/test_compat.py | 3 ++- pandas/tests/indexes/multi/test_constructors.py | 2 +- pandas/tests/indexes/multi/test_contains.py | 2 +- pandas/tests/indexes/multi/test_conversion.py | 3 ++- pandas/tests/indexes/multi/test_copy.py | 3 ++- pandas/tests/indexes/multi/test_drop.py | 2 +- pandas/tests/indexes/multi/test_duplicates.py | 2 +- pandas/tests/indexes/multi/test_equivalence.py | 3 ++- pandas/tests/indexes/multi/test_format.py | 3 ++- pandas/tests/indexes/multi/test_get_set.py | 3 ++- pandas/tests/indexes/multi/test_indexing.py | 3 ++- pandas/tests/indexes/multi/test_integrity.py | 3 ++- pandas/tests/indexes/multi/test_join.py | 3 ++- pandas/tests/indexes/multi/test_missing.py | 2 +- pandas/tests/indexes/multi/test_names.py | 3 ++- pandas/tests/indexes/multi/test_partial_indexing.py | 3 ++- pandas/tests/indexes/multi/test_reindex.py | 3 ++- pandas/tests/indexes/multi/test_reshape.py | 3 ++- pandas/tests/indexes/multi/test_setops.py | 3 ++- pandas/tests/indexes/multi/test_sorting.py | 2 +- pandas/tests/indexes/period/test_asfreq.py | 3 ++- pandas/tests/indexes/period/test_astype.py | 3 ++- pandas/tests/indexes/period/test_constructors.py | 2 +- pandas/tests/indexes/period/test_formats.py | 3 ++- pandas/tests/indexes/period/test_indexing.py | 2 +- pandas/tests/indexes/period/test_ops.py | 3 ++- pandas/tests/indexes/period/test_partial_slicing.py | 3 ++- pandas/tests/indexes/period/test_period.py | 2 +- pandas/tests/indexes/period/test_period_range.py | 3 ++- pandas/tests/indexes/period/test_scalar_compat.py | 3 ++- pandas/tests/indexes/period/test_setops.py | 3 ++- pandas/tests/indexes/period/test_shift.py | 3 ++- pandas/tests/indexes/period/test_tools.py | 2 +- pandas/tests/indexes/ranges/test_constructors.py | 3 ++- pandas/tests/indexes/ranges/test_range.py | 3 ++- pandas/tests/indexes/ranges/test_setops.py | 3 ++- pandas/tests/indexes/test_base.py | 2 +- pandas/tests/indexes/test_common.py | 2 +- pandas/tests/indexes/test_numeric.py | 2 +- pandas/tests/indexes/test_numpy_compat.py | 3 ++- pandas/tests/indexes/test_setops.py | 3 ++- pandas/tests/indexes/timedeltas/test_astype.py | 3 ++- pandas/tests/indexes/timedeltas/test_constructors.py | 3 ++- pandas/tests/indexes/timedeltas/test_indexing.py | 3 ++- pandas/tests/indexes/timedeltas/test_ops.py | 3 ++- .../tests/indexes/timedeltas/test_partial_slicing.py | 3 ++- .../tests/indexes/timedeltas/test_scalar_compat.py | 3 ++- pandas/tests/indexes/timedeltas/test_setops.py | 3 ++- pandas/tests/indexes/timedeltas/test_shift.py | 2 +- pandas/tests/indexes/timedeltas/test_timedelta.py | 3 ++- .../tests/indexes/timedeltas/test_timedelta_range.py | 3 ++- pandas/tests/indexes/timedeltas/test_tools.py | 3 ++- pandas/tests/indexing/common.py | 3 ++- pandas/tests/indexing/interval/test_interval.py | 3 ++- pandas/tests/indexing/interval/test_interval_new.py | 3 ++- pandas/tests/indexing/multiindex/conftest.py | 3 ++- .../indexing/multiindex/test_chaining_and_caching.py | 3 ++- pandas/tests/indexing/multiindex/test_getitem.py | 3 ++- pandas/tests/indexing/multiindex/test_iloc.py | 3 ++- .../tests/indexing/multiindex/test_indexing_slow.py | 3 ++- pandas/tests/indexing/multiindex/test_ix.py | 2 +- pandas/tests/indexing/multiindex/test_loc.py | 3 ++- pandas/tests/indexing/multiindex/test_multiindex.py | 2 +- pandas/tests/indexing/multiindex/test_partial.py | 3 ++- pandas/tests/indexing/multiindex/test_set_ops.py | 3 ++- pandas/tests/indexing/multiindex/test_setitem.py | 3 ++- pandas/tests/indexing/multiindex/test_slice.py | 2 +- pandas/tests/indexing/multiindex/test_sorted.py | 3 ++- pandas/tests/indexing/multiindex/test_xs.py | 3 ++- pandas/tests/indexing/test_callable.py | 3 ++- pandas/tests/indexing/test_categorical.py | 3 ++- pandas/tests/indexing/test_chaining_and_caching.py | 3 ++- pandas/tests/indexing/test_coercion.py | 2 +- pandas/tests/indexing/test_datetime.py | 3 ++- pandas/tests/indexing/test_floats.py | 3 ++- pandas/tests/indexing/test_iloc.py | 3 ++- pandas/tests/indexing/test_indexing.py | 2 +- pandas/tests/indexing/test_indexing_engines.py | 3 +-- pandas/tests/indexing/test_indexing_slow.py | 3 ++- pandas/tests/indexing/test_loc.py | 3 ++- pandas/tests/indexing/test_partial.py | 3 ++- pandas/tests/indexing/test_scalar.py | 3 ++- pandas/tests/indexing/test_timedelta.py | 3 ++- pandas/tests/internals/test_internals.py | 2 +- pandas/tests/io/conftest.py | 2 +- pandas/tests/io/excel/conftest.py | 3 +-- pandas/tests/io/excel/test_odf.py | 3 ++- pandas/tests/io/excel/test_openpyxl.py | 3 ++- pandas/tests/io/excel/test_readers.py | 2 +- pandas/tests/io/excel/test_style.py | 3 ++- pandas/tests/io/excel/test_writers.py | 2 +- pandas/tests/io/excel/test_xlrd.py | 3 ++- pandas/tests/io/excel/test_xlsxwriter.py | 3 ++- pandas/tests/io/excel/test_xlwt.py | 3 ++- pandas/tests/io/formats/test_css.py | 2 +- pandas/tests/io/formats/test_eng_formatting.py | 3 ++- pandas/tests/io/formats/test_format.py | 2 +- pandas/tests/io/formats/test_style.py | 2 +- pandas/tests/io/formats/test_to_csv.py | 3 ++- pandas/tests/io/formats/test_to_excel.py | 2 +- pandas/tests/io/formats/test_to_html.py | 3 ++- pandas/tests/io/formats/test_to_latex.py | 3 ++- pandas/tests/io/json/test_compression.py | 2 +- pandas/tests/io/json/test_json_table_schema.py | 3 ++- pandas/tests/io/json/test_normalize.py | 3 ++- pandas/tests/io/json/test_pandas.py | 2 +- pandas/tests/io/json/test_readlines.py | 3 ++- pandas/tests/io/json/test_ujson.py | 2 +- pandas/tests/io/parser/test_c_parser_only.py | 2 +- pandas/tests/io/parser/test_comment.py | 3 ++- pandas/tests/io/parser/test_common.py | 2 +- pandas/tests/io/parser/test_compression.py | 3 ++- pandas/tests/io/parser/test_converters.py | 3 ++- pandas/tests/io/parser/test_dialect.py | 2 +- pandas/tests/io/parser/test_dtypes.py | 2 +- pandas/tests/io/parser/test_header.py | 2 +- pandas/tests/io/parser/test_index_col.py | 3 ++- pandas/tests/io/parser/test_mangle_dupes.py | 3 ++- pandas/tests/io/parser/test_multi_thread.py | 3 ++- pandas/tests/io/parser/test_na_values.py | 2 +- pandas/tests/io/parser/test_network.py | 2 +- pandas/tests/io/parser/test_parse_dates.py | 2 +- pandas/tests/io/parser/test_python_parser_only.py | 2 +- pandas/tests/io/parser/test_quoting.py | 2 +- pandas/tests/io/parser/test_read_fwf.py | 3 ++- pandas/tests/io/parser/test_skiprows.py | 2 +- pandas/tests/io/parser/test_textreader.py | 2 +- pandas/tests/io/parser/test_unsupported.py | 3 +-- pandas/tests/io/parser/test_usecols.py | 2 +- pandas/tests/io/pytables/conftest.py | 2 +- pandas/tests/io/pytables/test_compat.py | 3 ++- pandas/tests/io/pytables/test_complex.py | 2 +- pandas/tests/io/pytables/test_pytables_missing.py | 2 +- pandas/tests/io/pytables/test_store.py | 2 +- pandas/tests/io/pytables/test_timezones.py | 2 +- pandas/tests/io/sas/test_sas.py | 3 ++- pandas/tests/io/sas/test_sas7bdat.py | 2 +- pandas/tests/io/sas/test_xport.py | 3 ++- pandas/tests/io/test_clipboard.py | 3 ++- pandas/tests/io/test_common.py | 2 +- pandas/tests/io/test_compression.py | 3 ++- pandas/tests/io/test_date_converters.py | 2 +- pandas/tests/io/test_feather.py | 3 ++- pandas/tests/io/test_gcs.py | 3 ++- pandas/tests/io/test_html.py | 2 +- pandas/tests/io/test_orc.py | 3 ++- pandas/tests/io/test_parquet.py | 2 +- pandas/tests/io/test_pickle.py | 2 +- pandas/tests/io/test_spss.py | 3 ++- pandas/tests/io/test_sql.py | 3 ++- pandas/tests/io/test_stata.py | 3 ++- pandas/tests/plotting/common.py | 2 +- pandas/tests/plotting/test_boxplot_method.py | 2 +- pandas/tests/plotting/test_converter.py | 2 +- pandas/tests/plotting/test_datetimelike.py | 2 +- pandas/tests/plotting/test_frame.py | 2 +- pandas/tests/plotting/test_groupby.py | 2 +- pandas/tests/plotting/test_hist_method.py | 2 +- pandas/tests/plotting/test_misc.py | 2 +- pandas/tests/plotting/test_series.py | 2 +- pandas/tests/reductions/test_reductions.py | 3 ++- pandas/tests/reductions/test_stat_reductions.py | 2 +- pandas/tests/resample/test_base.py | 3 ++- pandas/tests/resample/test_datetime_index.py | 2 +- pandas/tests/resample/test_period_index.py | 2 +- pandas/tests/resample/test_resample_api.py | 3 ++- pandas/tests/resample/test_resampler_grouper.py | 5 +++-- pandas/tests/resample/test_time_grouper.py | 3 ++- pandas/tests/resample/test_timedelta.py | 3 ++- pandas/tests/reshape/merge/test_join.py | 2 +- pandas/tests/reshape/merge/test_merge.py | 3 ++- pandas/tests/reshape/merge/test_merge_asof.py | 3 ++- .../reshape/merge/test_merge_index_as_string.py | 3 ++- pandas/tests/reshape/merge/test_merge_ordered.py | 3 ++- pandas/tests/reshape/merge/test_multi.py | 3 ++- pandas/tests/reshape/test_concat.py | 3 ++- pandas/tests/reshape/test_cut.py | 3 ++- pandas/tests/reshape/test_melt.py | 3 ++- pandas/tests/reshape/test_pivot.py | 3 ++- pandas/tests/reshape/test_qcut.py | 3 ++- pandas/tests/reshape/test_reshape.py | 3 ++- pandas/tests/reshape/test_union_categoricals.py | 3 ++- pandas/tests/reshape/test_util.py | 3 ++- pandas/tests/scalar/period/test_period.py | 2 +- pandas/tests/scalar/test_na_scalar.py | 2 +- pandas/tests/scalar/test_nat.py | 2 +- pandas/tests/scalar/timedelta/test_arithmetic.py | 3 ++- pandas/tests/scalar/timedelta/test_timedelta.py | 2 +- pandas/tests/scalar/timestamp/test_timestamp.py | 2 +- pandas/tests/scalar/timestamp/test_unary_ops.py | 2 +- pandas/tests/series/conftest.py | 2 +- pandas/tests/series/indexing/test_alter_index.py | 3 ++- pandas/tests/series/indexing/test_boolean.py | 3 ++- pandas/tests/series/indexing/test_callable.py | 3 ++- pandas/tests/series/indexing/test_datetime.py | 2 +- pandas/tests/series/indexing/test_iloc.py | 3 ++- pandas/tests/series/indexing/test_indexing.py | 3 ++- pandas/tests/series/indexing/test_loc.py | 3 ++- pandas/tests/series/indexing/test_numeric.py | 3 ++- pandas/tests/series/methods/test_append.py | 3 ++- pandas/tests/series/methods/test_argsort.py | 3 ++- pandas/tests/series/methods/test_asof.py | 3 ++- pandas/tests/series/methods/test_clip.py | 3 ++- pandas/tests/series/methods/test_count.py | 3 ++- pandas/tests/series/methods/test_cov_corr.py | 2 +- pandas/tests/series/methods/test_describe.py | 3 ++- pandas/tests/series/methods/test_diff.py | 3 ++- pandas/tests/series/methods/test_drop_duplicates.py | 3 ++- pandas/tests/series/methods/test_duplicated.py | 3 ++- pandas/tests/series/methods/test_explode.py | 3 ++- pandas/tests/series/methods/test_isin.py | 3 ++- pandas/tests/series/methods/test_nlargest.py | 3 ++- pandas/tests/series/methods/test_pct_change.py | 3 ++- pandas/tests/series/methods/test_quantile.py | 3 ++- pandas/tests/series/methods/test_rank.py | 2 +- pandas/tests/series/methods/test_replace.py | 3 ++- pandas/tests/series/methods/test_round.py | 3 ++- pandas/tests/series/methods/test_searchsorted.py | 3 ++- pandas/tests/series/methods/test_shift.py | 2 +- pandas/tests/series/methods/test_sort_index.py | 3 ++- pandas/tests/series/methods/test_sort_values.py | 3 ++- pandas/tests/series/methods/test_to_dict.py | 3 ++- pandas/tests/series/methods/test_truncate.py | 3 ++- pandas/tests/series/methods/test_value_counts.py | 3 ++- pandas/tests/series/test_alter_axes.py | 3 ++- pandas/tests/series/test_analytics.py | 2 +- pandas/tests/series/test_api.py | 3 ++- pandas/tests/series/test_apply.py | 3 ++- pandas/tests/series/test_arithmetic.py | 3 ++- pandas/tests/series/test_combine_concat.py | 3 ++- pandas/tests/series/test_constructors.py | 2 +- pandas/tests/series/test_cumulative.py | 3 ++- pandas/tests/series/test_datetime_values.py | 2 +- pandas/tests/series/test_dtypes.py | 2 +- pandas/tests/series/test_duplicates.py | 3 ++- pandas/tests/series/test_internals.py | 3 ++- pandas/tests/series/test_io.py | 3 ++- pandas/tests/series/test_missing.py | 2 +- pandas/tests/series/test_operators.py | 3 ++- pandas/tests/series/test_period.py | 3 ++- pandas/tests/series/test_repr.py | 3 ++- pandas/tests/series/test_subclass.py | 2 +- pandas/tests/series/test_timeseries.py | 2 +- pandas/tests/series/test_timezones.py | 2 +- pandas/tests/series/test_ufunc.py | 3 ++- pandas/tests/test_algos.py | 2 +- pandas/tests/test_downstream.py | 3 ++- pandas/tests/test_expressions.py | 3 ++- pandas/tests/test_join.py | 2 +- pandas/tests/test_lib.py | 2 +- pandas/tests/test_multilevel.py | 3 ++- pandas/tests/test_nanops.py | 2 +- pandas/tests/test_optional_dependency.py | 3 +-- pandas/tests/test_register_accessor.py | 3 ++- pandas/tests/test_sorting.py | 3 ++- pandas/tests/test_strings.py | 2 +- pandas/tests/test_take.py | 2 +- pandas/tests/tools/test_numeric.py | 3 ++- pandas/tests/tseries/frequencies/test_inference.py | 2 +- pandas/tests/tseries/holiday/test_calendar.py | 3 ++- pandas/tests/tseries/holiday/test_holiday.py | 2 +- pandas/tests/tseries/offsets/test_fiscal.py | 2 +- pandas/tests/tseries/offsets/test_offsets.py | 2 +- pandas/tests/tseries/offsets/test_ticks.py | 3 ++- pandas/tests/tslibs/test_array_to_datetime.py | 2 +- pandas/tests/tslibs/test_conversion.py | 2 +- pandas/tests/tslibs/test_fields.py | 3 +-- pandas/tests/tslibs/test_parsing.py | 3 +-- pandas/tests/util/test_assert_almost_equal.py | 3 ++- pandas/tests/util/test_assert_categorical_equal.py | 3 ++- .../tests/util/test_assert_extension_array_equal.py | 3 ++- pandas/tests/util/test_assert_frame_equal.py | 3 ++- pandas/tests/util/test_assert_index_equal.py | 3 ++- .../tests/util/test_assert_interval_array_equal.py | 3 ++- pandas/tests/util/test_assert_numpy_array_equal.py | 3 ++- pandas/tests/util/test_assert_produces_warning.py | 2 +- pandas/tests/util/test_assert_series_equal.py | 3 ++- pandas/tests/util/test_deprecate.py | 3 +-- pandas/tests/util/test_deprecate_kwarg.py | 3 +-- pandas/tests/util/test_hashing.py | 3 ++- pandas/tests/util/test_util.py | 3 +-- pandas/tests/window/common.py | 3 ++- pandas/tests/window/moments/test_moments_ewm.py | 3 ++- .../tests/window/moments/test_moments_expanding.py | 3 ++- pandas/tests/window/moments/test_moments_rolling.py | 2 +- pandas/tests/window/test_api.py | 2 +- pandas/tests/window/test_apply.py | 2 +- pandas/tests/window/test_base_indexer.py | 3 ++- pandas/tests/window/test_dtypes.py | 3 ++- pandas/tests/window/test_expanding.py | 2 +- pandas/tests/window/test_grouper.py | 3 ++- pandas/tests/window/test_numba.py | 2 +- pandas/tests/window/test_pairwise.py | 3 ++- pandas/tests/window/test_rolling.py | 2 +- pandas/tests/window/test_timeseries_window.py | 3 ++- pandas/util/_testing.py | 4 ++-- scripts/list_future_warnings.sh | 2 +- setup.cfg | 2 +- 505 files changed, 837 insertions(+), 528 deletions(-) diff --git a/asv_bench/benchmarks/categoricals.py b/asv_bench/benchmarks/categoricals.py index 43b1b31a0bfe8..c7f24b928cdf0 100644 --- a/asv_bench/benchmarks/categoricals.py +++ b/asv_bench/benchmarks/categoricals.py @@ -2,8 +2,9 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm try: from pandas.api.types import union_categoricals diff --git a/asv_bench/benchmarks/ctors.py b/asv_bench/benchmarks/ctors.py index a9e45cad22d27..f0820af897dbe 100644 --- a/asv_bench/benchmarks/ctors.py +++ b/asv_bench/benchmarks/ctors.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DatetimeIndex, Index, MultiIndex, Series, Timestamp -import pandas.util.testing as tm def no_change(arr): diff --git a/asv_bench/benchmarks/frame_ctor.py b/asv_bench/benchmarks/frame_ctor.py index 1deca8fe3aad0..ec263b4b4ddd9 100644 --- a/asv_bench/benchmarks/frame_ctor.py +++ b/asv_bench/benchmarks/frame_ctor.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range -import pandas.util.testing as tm try: from pandas.tseries.offsets import Nano, Hour diff --git a/asv_bench/benchmarks/frame_methods.py b/asv_bench/benchmarks/frame_methods.py index ae6c07107f4a0..5477d3f5e5c40 100644 --- a/asv_bench/benchmarks/frame_methods.py +++ b/asv_bench/benchmarks/frame_methods.py @@ -3,8 +3,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, NaT, Series, date_range, isnull, period_range -import pandas.util.testing as tm class GetNumericData: diff --git a/asv_bench/benchmarks/gil.py b/asv_bench/benchmarks/gil.py index 860c6cc6192bb..9415f70cae96e 100644 --- a/asv_bench/benchmarks/gil.py +++ b/asv_bench/benchmarks/gil.py @@ -1,8 +1,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, Series, date_range, factorize, read_csv from pandas.core.algorithms import take_1d -import pandas.util.testing as tm try: from pandas import ( @@ -24,7 +25,7 @@ except ImportError: from pandas import algos try: - from pandas.util.testing import test_parallel + from pandas.util._testing import test_parallel have_real_test_parallel = True except ImportError: diff --git a/asv_bench/benchmarks/groupby.py b/asv_bench/benchmarks/groupby.py index d51c53e2264f1..9ade9492ae85b 100644 --- a/asv_bench/benchmarks/groupby.py +++ b/asv_bench/benchmarks/groupby.py @@ -4,6 +4,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import ( Categorical, DataFrame, @@ -13,7 +15,6 @@ date_range, period_range, ) -import pandas.util.testing as tm method_blacklist = { "object": { diff --git a/asv_bench/benchmarks/index_object.py b/asv_bench/benchmarks/index_object.py index d69799eb70040..666b55c3f2557 100644 --- a/asv_bench/benchmarks/index_object.py +++ b/asv_bench/benchmarks/index_object.py @@ -2,6 +2,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import ( DatetimeIndex, Float64Index, @@ -12,7 +14,6 @@ Series, date_range, ) -import pandas.util.testing as tm class SetOperations: diff --git a/asv_bench/benchmarks/indexing.py b/asv_bench/benchmarks/indexing.py index c78c2fa92827e..5be915fa9237e 100644 --- a/asv_bench/benchmarks/indexing.py +++ b/asv_bench/benchmarks/indexing.py @@ -2,6 +2,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import ( CategoricalIndex, DataFrame, @@ -17,7 +19,6 @@ option_context, period_range, ) -import pandas.util.testing as tm class NumericSeriesIndexing: diff --git a/asv_bench/benchmarks/inference.py b/asv_bench/benchmarks/inference.py index e85b3bd2c7687..021ba361e94ea 100644 --- a/asv_bench/benchmarks/inference.py +++ b/asv_bench/benchmarks/inference.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, Series, to_numeric -import pandas.util.testing as tm from .pandas_vb_common import lib, numeric_dtypes diff --git a/asv_bench/benchmarks/io/csv.py b/asv_bench/benchmarks/io/csv.py index b8e8630e663ee..f0cd96713ab4a 100644 --- a/asv_bench/benchmarks/io/csv.py +++ b/asv_bench/benchmarks/io/csv.py @@ -4,8 +4,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import Categorical, DataFrame, date_range, read_csv, to_datetime -import pandas.util.testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/excel.py b/asv_bench/benchmarks/io/excel.py index 75d87140488e3..c1f8936316dcd 100644 --- a/asv_bench/benchmarks/io/excel.py +++ b/asv_bench/benchmarks/io/excel.py @@ -1,12 +1,13 @@ from io import BytesIO import numpy as np + +import pandas.util._testing as tm + from odf.opendocument import OpenDocumentSpreadsheet from odf.table import Table, TableCell, TableRow from odf.text import P - from pandas import DataFrame, ExcelWriter, date_range, read_excel -import pandas.util.testing as tm def _generate_dataframe(): diff --git a/asv_bench/benchmarks/io/hdf.py b/asv_bench/benchmarks/io/hdf.py index 88c1a3dc48ea4..f27be3e29efd8 100644 --- a/asv_bench/benchmarks/io/hdf.py +++ b/asv_bench/benchmarks/io/hdf.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, HDFStore, date_range, read_hdf -import pandas.util.testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/json.py b/asv_bench/benchmarks/io/json.py index 27096bcaba78b..11af156c1fb4e 100644 --- a/asv_bench/benchmarks/io/json.py +++ b/asv_bench/benchmarks/io/json.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, concat, date_range, read_json, timedelta_range -import pandas.util.testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/pickle.py b/asv_bench/benchmarks/io/pickle.py index 12620656dd2bf..5db0e04760cd2 100644 --- a/asv_bench/benchmarks/io/pickle.py +++ b/asv_bench/benchmarks/io/pickle.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, date_range, read_pickle -import pandas.util.testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/sql.py b/asv_bench/benchmarks/io/sql.py index 6cc7f56ae3d65..ae69dbf9f2dd4 100644 --- a/asv_bench/benchmarks/io/sql.py +++ b/asv_bench/benchmarks/io/sql.py @@ -3,8 +3,9 @@ import numpy as np from sqlalchemy import create_engine +import pandas.util._testing as tm + from pandas import DataFrame, date_range, read_sql_query, read_sql_table -import pandas.util.testing as tm class SQL: diff --git a/asv_bench/benchmarks/io/stata.py b/asv_bench/benchmarks/io/stata.py index f3125f8598418..ba240fb72aa29 100644 --- a/asv_bench/benchmarks/io/stata.py +++ b/asv_bench/benchmarks/io/stata.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, date_range, read_stata -import pandas.util.testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/join_merge.py b/asv_bench/benchmarks/join_merge.py index 5cf9f6336ba0c..9887430f66dca 100644 --- a/asv_bench/benchmarks/join_merge.py +++ b/asv_bench/benchmarks/join_merge.py @@ -2,8 +2,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series, concat, date_range, merge, merge_asof -import pandas.util.testing as tm try: from pandas import merge_ordered diff --git a/asv_bench/benchmarks/multiindex_object.py b/asv_bench/benchmarks/multiindex_object.py index 5a396c9f0deff..c78a1658ed1ce 100644 --- a/asv_bench/benchmarks/multiindex_object.py +++ b/asv_bench/benchmarks/multiindex_object.py @@ -2,8 +2,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, RangeIndex, date_range -import pandas.util.testing as tm class GetLoc: diff --git a/asv_bench/benchmarks/reindex.py b/asv_bench/benchmarks/reindex.py index cd450f801c805..9323d6de22fd3 100644 --- a/asv_bench/benchmarks/reindex.py +++ b/asv_bench/benchmarks/reindex.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, Series, date_range, period_range -import pandas.util.testing as tm from .pandas_vb_common import lib diff --git a/asv_bench/benchmarks/series_methods.py b/asv_bench/benchmarks/series_methods.py index a3f1d92545c3f..35f17cbea83aa 100644 --- a/asv_bench/benchmarks/series_methods.py +++ b/asv_bench/benchmarks/series_methods.py @@ -2,8 +2,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import NaT, Series, date_range -import pandas.util.testing as tm class SeriesConstructor: diff --git a/asv_bench/benchmarks/strings.py b/asv_bench/benchmarks/strings.py index f30b2482615bd..7ad1e47d11011 100644 --- a/asv_bench/benchmarks/strings.py +++ b/asv_bench/benchmarks/strings.py @@ -2,8 +2,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, Series -import pandas.util.testing as tm class Methods: diff --git a/ci/code_checks.sh b/ci/code_checks.sh index dc1c8481b1712..70c4caeb55e77 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -139,8 +139,8 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then RET=$(($RET + $?)) ; echo $MSG "DONE" # Checks for test suite - # Check for imports from pandas.util.testing instead of `import pandas.util.testing as tm` - invgrep -R --include="*.py*" -E "from pandas.util.testing import" pandas/tests + # Check for imports from pandas.util._testing instead of `import pandas.util._testing as tm` + invgrep -R --include="*.py*" -E "from pandas.util._testing import" pandas/tests RET=$(($RET + $?)) ; echo $MSG "DONE" invgrep -R --include="*.py*" -E "from pandas.util import testing as tm" pandas/tests RET=$(($RET + $?)) ; echo $MSG "DONE" diff --git a/doc/source/development/contributing.rst b/doc/source/development/contributing.rst index d7b3e159f8ce7..885f64d8820f9 100644 --- a/doc/source/development/contributing.rst +++ b/doc/source/development/contributing.rst @@ -957,7 +957,7 @@ inspiration. If your test requires working with files or network connectivity, there is more information on the `testing page `_ of the wiki. -The ``pandas.util.testing`` module has many special ``assert`` functions that +The ``pandas.util._testing`` module has many special ``assert`` functions that make it easier to make statements about whether Series or DataFrame objects are equivalent. The easiest way to verify that your code is correct is to explicitly construct the result you expect, then compare the actual result to @@ -1143,7 +1143,7 @@ If your change involves checking that a warning is actually emitted, use .. code-block:: python - import pandas.util.testing as tm + import pandas.util._testing as tm df = pd.DataFrame() diff --git a/doc/source/user_guide/io.rst b/doc/source/user_guide/io.rst index c32b009948fda..fc43df068312c 100644 --- a/doc/source/user_guide/io.rst +++ b/doc/source/user_guide/io.rst @@ -1519,7 +1519,7 @@ rows will skip the intervening rows. .. ipython:: python - from pandas.util.testing import makeCustomDataframe as mkdf + from pandas.util._testing import makeCustomDataframe as mkdf df = mkdf(5, 3, r_idx_nlevels=2, c_idx_nlevels=4) df.to_csv('mi.csv') print(open('mi.csv').read()) diff --git a/doc/source/user_guide/reshaping.rst b/doc/source/user_guide/reshaping.rst index 8583a9312b690..7ed0b37c8ca07 100644 --- a/doc/source/user_guide/reshaping.rst +++ b/doc/source/user_guide/reshaping.rst @@ -14,7 +14,7 @@ Reshaping by pivoting DataFrame objects .. ipython:: python :suppress: - import pandas.util.testing as tm + import pandas.util._testing as tm tm.N = 3 def unpivot(frame): @@ -38,7 +38,7 @@ For the curious here is how the above ``DataFrame`` was created: .. code-block:: python - import pandas.util.testing as tm + import pandas.util._testing as tm tm.N = 3 diff --git a/doc/source/user_guide/scale.rst b/doc/source/user_guide/scale.rst index 0611c6334937f..4a21ea922eb3f 100644 --- a/doc/source/user_guide/scale.rst +++ b/doc/source/user_guide/scale.rst @@ -26,7 +26,7 @@ Assuming you want or need the expressiveness and power of pandas, let's carry on .. ipython:: python :suppress: - from pandas.util.testing import _make_timeseries + from pandas.util._testing import _make_timeseries # Make a random in-memory dataset ts = _make_timeseries(freq="30S", seed=0) diff --git a/doc/source/whatsnew/v0.12.0.rst b/doc/source/whatsnew/v0.12.0.rst index 86ff338536f80..f037ae0ee4d74 100644 --- a/doc/source/whatsnew/v0.12.0.rst +++ b/doc/source/whatsnew/v0.12.0.rst @@ -236,7 +236,7 @@ I/O enhancements .. ipython:: python - from pandas.util.testing import makeCustomDataframe as mkdf + from pandas.util._testing import makeCustomDataframe as mkdf df = mkdf(5, 3, r_idx_nlevels=2, c_idx_nlevels=4) df.to_csv('mi.csv') print(open('mi.csv').read()) diff --git a/doc/source/whatsnew/v0.13.1.rst b/doc/source/whatsnew/v0.13.1.rst index 6242c40d44bf8..2f71cb274d1d6 100644 --- a/doc/source/whatsnew/v0.13.1.rst +++ b/doc/source/whatsnew/v0.13.1.rst @@ -224,7 +224,7 @@ Enhancements .. code-block:: ipython - In [28]: import pandas.util.testing as tm + In [28]: import pandas.util._testing as tm In [29]: panel = tm.makePanel(5) diff --git a/doc/source/whatsnew/v0.18.0.rst b/doc/source/whatsnew/v0.18.0.rst index a7174c6325f86..bf6bd87b47f38 100644 --- a/doc/source/whatsnew/v0.18.0.rst +++ b/doc/source/whatsnew/v0.18.0.rst @@ -1279,7 +1279,7 @@ Bug Fixes - Removed ``millisecond`` property of ``DatetimeIndex``. This would always raise a ``ValueError`` (:issue:`12019`). - Bug in ``Series`` constructor with read-only data (:issue:`11502`) -- Removed ``pandas.util.testing.choice()``. Should use ``np.random.choice()``, instead. (:issue:`12386`) +- Removed ``pandas.util._testing.choice()``. Should use ``np.random.choice()``, instead. (:issue:`12386`) - Bug in ``.loc`` setitem indexer preventing the use of a TZ-aware DatetimeIndex (:issue:`12050`) - Bug in ``.style`` indexes and MultiIndexes not appearing (:issue:`11655`) - Bug in ``to_msgpack`` and ``from_msgpack`` which did not correctly serialize or deserialize ``NaT`` (:issue:`12307`). diff --git a/doc/source/whatsnew/v0.20.0.rst b/doc/source/whatsnew/v0.20.0.rst index e7dc6150ffcb1..9eed6427cdd8d 100644 --- a/doc/source/whatsnew/v0.20.0.rst +++ b/doc/source/whatsnew/v0.20.0.rst @@ -1360,7 +1360,7 @@ provides a :meth:`~Panel.to_xarray` method to automate this conversion (:issue:` .. code-block:: ipython - In [133]: import pandas.util.testing as tm + In [133]: import pandas.util._testing as tm In [134]: p = tm.makePanel() diff --git a/doc/source/whatsnew/v0.21.0.rst b/doc/source/whatsnew/v0.21.0.rst index f33943e423b25..9726525f14e2d 100644 --- a/doc/source/whatsnew/v0.21.0.rst +++ b/doc/source/whatsnew/v0.21.0.rst @@ -927,7 +927,7 @@ Other API changes - :class:`pandas.HDFStore`'s string representation is now faster and less detailed. For the previous behavior, use ``pandas.HDFStore.info()``. (:issue:`16503`). - Compression defaults in HDF stores now follow pytables standards. Default is no compression and if ``complib`` is missing and ``complevel`` > 0 ``zlib`` is used (:issue:`15943`) - ``Index.get_indexer_non_unique()`` now returns a ndarray indexer rather than an ``Index``; this is consistent with ``Index.get_indexer()`` (:issue:`16819`) -- Removed the ``@slow`` decorator from ``pandas.util.testing``, which caused issues for some downstream packages' test suites. Use ``@pytest.mark.slow`` instead, which achieves the same thing (:issue:`16850`) +- Removed the ``@slow`` decorator from ``pandas.util._testing``, which caused issues for some downstream packages' test suites. Use ``@pytest.mark.slow`` instead, which achieves the same thing (:issue:`16850`) - Moved definition of ``MergeError`` to the ``pandas.errors`` module. - The signature of :func:`Series.set_axis` and :func:`DataFrame.set_axis` has been changed from ``set_axis(axis, labels)`` to ``set_axis(labels, axis=0)``, for consistency with the rest of the API. The old signature is deprecated and will show a ``FutureWarning`` (:issue:`14636`) - :func:`Series.argmin` and :func:`Series.argmax` will now raise a ``TypeError`` when used with ``object`` dtypes, instead of a ``ValueError`` (:issue:`13595`) diff --git a/doc/source/whatsnew/v0.23.0.rst b/doc/source/whatsnew/v0.23.0.rst index f4c283ea742f7..3bb9b961b537a 100644 --- a/doc/source/whatsnew/v0.23.0.rst +++ b/doc/source/whatsnew/v0.23.0.rst @@ -648,7 +648,7 @@ provides a :meth:`~Panel.to_xarray` method to automate this conversion (:issue:` .. code-block:: ipython - In [75]: import pandas.util.testing as tm + In [75]: import pandas.util._testing as tm In [76]: p = tm.makePanel() diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 59644440149ff..1cd082374a440 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -681,7 +681,7 @@ or ``matplotlib.Axes.plot``. See :ref:`plotting.formatters` for more. - Ability to read pickles containing :class:`Categorical` instances created with pre-0.16 version of pandas has been removed (:issue:`27538`) - Removed :func:`pandas.tseries.plotting.tsplot` (:issue:`18627`) - Removed the previously deprecated keywords "reduce" and "broadcast" from :meth:`DataFrame.apply` (:issue:`18577`) -- Removed the previously deprecated ``assert_raises_regex`` function in ``pandas.util.testing`` (:issue:`29174`) +- Removed the previously deprecated ``assert_raises_regex`` function in ``pandas.util._testing`` (:issue:`29174`) - Removed the previously deprecated ``FrozenNDArray`` class in ``pandas.core.indexes.frozen`` (:issue:`29335`) - Removed the previously deprecated keyword "nthreads" from :func:`read_feather`, use "use_threads" instead (:issue:`23053`) - Removed :meth:`Index.is_lexsorted_for_tuple` (:issue:`29305`) diff --git a/pandas/_libs/testing.pyx b/pandas/_libs/testing.pyx index 026bd7a44a509..1772eea918cb4 100644 --- a/pandas/_libs/testing.pyx +++ b/pandas/_libs/testing.pyx @@ -123,7 +123,7 @@ cpdef assert_almost_equal(a, b, if isiterable(a): if not isiterable(b): - from pandas.util.testing import assert_class_equal + from pandas.util._testing import assert_class_equal # classes can't be the same, to raise error assert_class_equal(a, b, obj=obj) @@ -134,12 +134,12 @@ cpdef assert_almost_equal(a, b, if a_is_ndarray and b_is_ndarray: na, nb = a.size, b.size if a.shape != b.shape: - from pandas.util.testing import raise_assert_detail + from pandas.util._testing import raise_assert_detail raise_assert_detail( obj, f'{obj} shapes are different', a.shape, b.shape) if check_dtype and not is_dtype_equal(a.dtype, b.dtype): - from pandas.util.testing import assert_attr_equal + from pandas.util._testing import assert_attr_equal assert_attr_equal('dtype', a, b, obj=obj) if array_equivalent(a, b, strict_nan=True): @@ -149,7 +149,7 @@ cpdef assert_almost_equal(a, b, na, nb = len(a), len(b) if na != nb: - from pandas.util.testing import raise_assert_detail + from pandas.util._testing import raise_assert_detail # if we have a small diff set, print it if abs(na - nb) < 10: @@ -168,7 +168,7 @@ cpdef assert_almost_equal(a, b, diff += 1 if is_unequal: - from pandas.util.testing import raise_assert_detail + from pandas.util._testing import raise_assert_detail msg = (f"{obj} values are different " f"({np.round(diff * 100.0 / na, 5)} %)") raise_assert_detail(obj, msg, lobj, robj) @@ -176,7 +176,7 @@ cpdef assert_almost_equal(a, b, return True elif isiterable(b): - from pandas.util.testing import assert_class_equal + from pandas.util._testing import assert_class_equal # classes can't be the same, to raise error assert_class_equal(a, b, obj=obj) diff --git a/pandas/conftest.py b/pandas/conftest.py index eb7263fe116cc..b7fd6dd039f00 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -12,11 +12,11 @@ from pytz import FixedOffset, utc import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame from pandas.core import ops -import pandas.util.testing as tm hypothesis.settings.register_profile( "ci", diff --git a/pandas/testing.py b/pandas/testing.py index acae47367d997..25cb4ad104e9c 100644 --- a/pandas/testing.py +++ b/pandas/testing.py @@ -4,7 +4,7 @@ Public testing utility functions. """ -from pandas.util.testing import ( +from pandas.util._testing import ( assert_frame_equal, assert_index_equal, assert_series_equal, diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index d865f26983579..ebf37ed7a1ced 100644 --- a/pandas/tests/api/test_api.py +++ b/pandas/tests/api/test_api.py @@ -1,8 +1,9 @@ from typing import List +import pandas.util._testing as tm + import pandas as pd from pandas import api, compat -import pandas.util.testing as tm class Base: diff --git a/pandas/tests/api/test_types.py b/pandas/tests/api/test_types.py index 97480502f192c..8e7f1bd3502b9 100644 --- a/pandas/tests/api/test_types.py +++ b/pandas/tests/api/test_types.py @@ -1,5 +1,6 @@ +import pandas.util._testing as tm + from pandas.api import types -import pandas.util.testing as tm from .test_api import Base diff --git a/pandas/tests/arithmetic/common.py b/pandas/tests/arithmetic/common.py index bc02a1e76a695..7885ed46e34ee 100644 --- a/pandas/tests/arithmetic/common.py +++ b/pandas/tests/arithmetic/common.py @@ -4,8 +4,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, Series -import pandas.util.testing as tm def assert_invalid_addsub_type(left, right, msg=None): diff --git a/pandas/tests/arithmetic/conftest.py b/pandas/tests/arithmetic/conftest.py index 64588af3e3053..d62b5b58e4e6a 100644 --- a/pandas/tests/arithmetic/conftest.py +++ b/pandas/tests/arithmetic/conftest.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm # ------------------------------------------------------------------ # Helper Functions diff --git a/pandas/tests/arithmetic/test_datetime64.py b/pandas/tests/arithmetic/test_datetime64.py index ec25f022f5a9e..56288bbdb1c8d 100644 --- a/pandas/tests/arithmetic/test_datetime64.py +++ b/pandas/tests/arithmetic/test_datetime64.py @@ -14,6 +14,7 @@ from pandas._libs.tslibs.offsets import shift_months from pandas.compat.numpy import np_datetime64_compat from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -33,7 +34,6 @@ assert_invalid_comparison, get_upcast_box, ) -import pandas.util.testing as tm # ------------------------------------------------------------------ # Comparisons diff --git a/pandas/tests/arithmetic/test_numeric.py b/pandas/tests/arithmetic/test_numeric.py index 9733d589ee93b..32d841d478143 100644 --- a/pandas/tests/arithmetic/test_numeric.py +++ b/pandas/tests/arithmetic/test_numeric.py @@ -10,10 +10,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, Series, Timedelta, TimedeltaIndex from pandas.core import ops -import pandas.util.testing as tm def adjust_negative_zero(zero, expected): diff --git a/pandas/tests/arithmetic/test_object.py b/pandas/tests/arithmetic/test_object.py index f9c1de115b3a4..7349c77d764ce 100644 --- a/pandas/tests/arithmetic/test_object.py +++ b/pandas/tests/arithmetic/test_object.py @@ -7,10 +7,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series, Timestamp from pandas.core import ops -import pandas.util.testing as tm # ------------------------------------------------------------------ # Comparisons diff --git a/pandas/tests/arithmetic/test_period.py b/pandas/tests/arithmetic/test_period.py index 8bc952e85bb5d..b94604a17636a 100644 --- a/pandas/tests/arithmetic/test_period.py +++ b/pandas/tests/arithmetic/test_period.py @@ -8,12 +8,12 @@ from pandas._libs.tslibs.period import IncompatibleFrequency from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import Period, PeriodIndex, Series, period_range from pandas.core import ops from pandas.core.arrays import TimedeltaArray -import pandas.util.testing as tm from pandas.tseries.frequencies import to_offset diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py index d61adf5ef2e7b..bcacf2cd6000c 100644 --- a/pandas/tests/arithmetic/test_timedelta64.py +++ b/pandas/tests/arithmetic/test_timedelta64.py @@ -6,6 +6,7 @@ import pytest from pandas.errors import OutOfBoundsDatetime, PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -23,7 +24,6 @@ assert_invalid_comparison, get_upcast_box, ) -import pandas.util.testing as tm # ------------------------------------------------------------------ # Timedelta64[ns] dtype Comparisons diff --git a/pandas/tests/arrays/categorical/test_algos.py b/pandas/tests/arrays/categorical/test_algos.py index 870a0a5db175e..fa62d420b2756 100644 --- a/pandas/tests/arrays/categorical/test_algos.py +++ b/pandas/tests/arrays/categorical/test_algos.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm @pytest.mark.parametrize("ordered", [True, False]) diff --git a/pandas/tests/arrays/categorical/test_analytics.py b/pandas/tests/arrays/categorical/test_analytics.py index 4122a64a64516..0ac7464d77386 100644 --- a/pandas/tests/arrays/categorical/test_analytics.py +++ b/pandas/tests/arrays/categorical/test_analytics.py @@ -4,10 +4,10 @@ import pytest from pandas.compat import PYPY +import pandas.util._testing as tm from pandas import Categorical, Index, NaT, Series, date_range from pandas.api.types import is_scalar -import pandas.util.testing as tm class TestCategoricalAnalytics: diff --git a/pandas/tests/arrays/categorical/test_api.py b/pandas/tests/arrays/categorical/test_api.py index 82f2fe1ab8fb6..af70e3f4b3bf5 100644 --- a/pandas/tests/arrays/categorical/test_api.py +++ b/pandas/tests/arrays/categorical/test_api.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, CategoricalIndex, DataFrame, Index, Series from pandas.core.arrays.categorical import _recode_for_categories from pandas.tests.arrays.categorical.common import TestCategorical -import pandas.util.testing as tm class TestCategoricalAPI: diff --git a/pandas/tests/arrays/categorical/test_constructors.py b/pandas/tests/arrays/categorical/test_constructors.py index 6c8b654c1955c..c31540fe131ac 100644 --- a/pandas/tests/arrays/categorical/test_constructors.py +++ b/pandas/tests/arrays/categorical/test_constructors.py @@ -4,6 +4,7 @@ import pytest from pandas.compat.numpy import _np_version_under1p16 +import pandas.util._testing as tm from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -24,7 +25,6 @@ period_range, timedelta_range, ) -import pandas.util.testing as tm class TestCategoricalConstructors: diff --git a/pandas/tests/arrays/categorical/test_dtypes.py b/pandas/tests/arrays/categorical/test_dtypes.py index 85bf385b029a3..c736541f77925 100644 --- a/pandas/tests/arrays/categorical/test_dtypes.py +++ b/pandas/tests/arrays/categorical/test_dtypes.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import Categorical, CategoricalIndex, Index, Series, Timestamp -import pandas.util.testing as tm class TestCategoricalDtypes: diff --git a/pandas/tests/arrays/categorical/test_indexing.py b/pandas/tests/arrays/categorical/test_indexing.py index 37dea53f792cb..ae1b2a9d09ab2 100644 --- a/pandas/tests/arrays/categorical/test_indexing.py +++ b/pandas/tests/arrays/categorical/test_indexing.py @@ -1,11 +1,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, CategoricalIndex, Index, PeriodIndex, Series import pandas.core.common as com from pandas.tests.arrays.categorical.common import TestCategorical -import pandas.util.testing as tm class TestCategoricalIndexingWithFactor(TestCategorical): diff --git a/pandas/tests/arrays/categorical/test_missing.py b/pandas/tests/arrays/categorical/test_missing.py index 3037ac79cd592..954168aace227 100644 --- a/pandas/tests/arrays/categorical/test_missing.py +++ b/pandas/tests/arrays/categorical/test_missing.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import Categorical, Index, Series, isna -import pandas.util.testing as tm class TestCategoricalMissing: diff --git a/pandas/tests/arrays/categorical/test_operators.py b/pandas/tests/arrays/categorical/test_operators.py index 10e33bf70dc66..fb3e35a9c4c7a 100644 --- a/pandas/tests/arrays/categorical/test_operators.py +++ b/pandas/tests/arrays/categorical/test_operators.py @@ -4,10 +4,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, DataFrame, Series, date_range from pandas.tests.arrays.categorical.common import TestCategorical -import pandas.util.testing as tm class TestCategoricalOpsWithFactor(TestCategorical): diff --git a/pandas/tests/arrays/categorical/test_sorting.py b/pandas/tests/arrays/categorical/test_sorting.py index a0b09e19ece6e..65b7d573171f9 100644 --- a/pandas/tests/arrays/categorical/test_sorting.py +++ b/pandas/tests/arrays/categorical/test_sorting.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, Index -import pandas.util.testing as tm class TestCategoricalSort: diff --git a/pandas/tests/arrays/categorical/test_subclass.py b/pandas/tests/arrays/categorical/test_subclass.py index cfc7b8541302f..4e89d1143e8da 100644 --- a/pandas/tests/arrays/categorical/test_subclass.py +++ b/pandas/tests/arrays/categorical/test_subclass.py @@ -1,5 +1,6 @@ +import pandas.util._testing as tm + from pandas import Categorical -import pandas.util.testing as tm class TestCategoricalSubclassing: diff --git a/pandas/tests/arrays/categorical/test_warnings.py b/pandas/tests/arrays/categorical/test_warnings.py index 29bd5252dbe3a..9d369e7f6e46a 100644 --- a/pandas/tests/arrays/categorical/test_warnings.py +++ b/pandas/tests/arrays/categorical/test_warnings.py @@ -1,6 +1,6 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm class TestCategoricalWarnings: diff --git a/pandas/tests/arrays/interval/test_interval.py b/pandas/tests/arrays/interval/test_interval.py index 655a6e717119b..56f002ac151f9 100644 --- a/pandas/tests/arrays/interval/test_interval.py +++ b/pandas/tests/arrays/interval/test_interval.py @@ -1,6 +1,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Index, @@ -12,7 +14,6 @@ timedelta_range, ) from pandas.core.arrays import IntervalArray -import pandas.util.testing as tm @pytest.fixture( diff --git a/pandas/tests/arrays/interval/test_ops.py b/pandas/tests/arrays/interval/test_ops.py index a55c33c2f22e9..f2513c3029160 100644 --- a/pandas/tests/arrays/interval/test_ops.py +++ b/pandas/tests/arrays/interval/test_ops.py @@ -2,9 +2,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Interval, IntervalIndex, Timedelta, Timestamp from pandas.core.arrays import IntervalArray -import pandas.util.testing as tm @pytest.fixture(params=[IntervalArray, IntervalIndex]) diff --git a/pandas/tests/arrays/sparse/test_accessor.py b/pandas/tests/arrays/sparse/test_accessor.py index eab174862818c..5c31dd81878ea 100644 --- a/pandas/tests/arrays/sparse/test_accessor.py +++ b/pandas/tests/arrays/sparse/test_accessor.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm class TestSeriesAccessor: diff --git a/pandas/tests/arrays/sparse/test_arithmetics.py b/pandas/tests/arrays/sparse/test_arithmetics.py index f1d2803ce5505..3a3786c1701d9 100644 --- a/pandas/tests/arrays/sparse/test_arithmetics.py +++ b/pandas/tests/arrays/sparse/test_arithmetics.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.core import ops from pandas.core.arrays.sparse import SparseDtype -import pandas.util.testing as tm @pytest.fixture(params=["integer", "block"]) diff --git a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py index 0aaf294378bf7..88c317e7627e7 100644 --- a/pandas/tests/arrays/sparse/test_array.py +++ b/pandas/tests/arrays/sparse/test_array.py @@ -7,11 +7,11 @@ from pandas._libs.sparse import IntIndex import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import isna from pandas.core.arrays.sparse import SparseArray, SparseDtype -import pandas.util.testing as tm @pytest.fixture(params=["integer", "block"]) diff --git a/pandas/tests/arrays/sparse/test_combine_concat.py b/pandas/tests/arrays/sparse/test_combine_concat.py index 4ad1aa60e7b4f..7cb64c36c9452 100644 --- a/pandas/tests/arrays/sparse/test_combine_concat.py +++ b/pandas/tests/arrays/sparse/test_combine_concat.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestSparseArrayConcat: diff --git a/pandas/tests/arrays/sparse/test_libsparse.py b/pandas/tests/arrays/sparse/test_libsparse.py index 7a85ccf271e76..25f4a35332a3a 100644 --- a/pandas/tests/arrays/sparse/test_libsparse.py +++ b/pandas/tests/arrays/sparse/test_libsparse.py @@ -5,10 +5,10 @@ import pandas._libs.sparse as splib import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import Series from pandas.core.arrays.sparse import BlockIndex, IntIndex, _make_index -import pandas.util.testing as tm TEST_LENGTH = 20 diff --git a/pandas/tests/arrays/string_/test_string.py b/pandas/tests/arrays/string_/test_string.py index c3f342f16a0bf..81454265d91a1 100644 --- a/pandas/tests/arrays/string_/test_string.py +++ b/pandas/tests/arrays/string_/test_string.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm def test_repr_with_NA(): diff --git a/pandas/tests/arrays/test_array.py b/pandas/tests/arrays/test_array.py index f2a4e73e7b6ad..d0b49ccfdc14d 100644 --- a/pandas/tests/arrays/test_array.py +++ b/pandas/tests/arrays/test_array.py @@ -5,6 +5,8 @@ import pytest import pytz +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import registry import pandas as pd @@ -12,7 +14,6 @@ from pandas.api.types import is_scalar from pandas.core.arrays import PandasArray, integer_array, period_array from pandas.tests.extension.decimal import DecimalArray, DecimalDtype, to_decimal -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/arrays/test_boolean.py b/pandas/tests/arrays/test_boolean.py index abec4b42c0ffb..b8a0f7e390e9e 100644 --- a/pandas/tests/arrays/test_boolean.py +++ b/pandas/tests/arrays/test_boolean.py @@ -4,12 +4,12 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas.arrays import BooleanArray from pandas.core.arrays.boolean import coerce_to_array from pandas.tests.extension.base import BaseOpsUtil -import pandas.util.testing as tm def make_data(): diff --git a/pandas/tests/arrays/test_datetimelike.py b/pandas/tests/arrays/test_datetimelike.py index e9c64d04ec860..04c520dc3f4c8 100644 --- a/pandas/tests/arrays/test_datetimelike.py +++ b/pandas/tests/arrays/test_datetimelike.py @@ -4,13 +4,13 @@ import pytest from pandas._libs import OutOfBoundsDatetime +import pandas.util._testing as tm import pandas as pd from pandas.core.arrays import DatetimeArray, PeriodArray, TimedeltaArray from pandas.core.indexes.datetimes import DatetimeIndex from pandas.core.indexes.period import PeriodIndex from pandas.core.indexes.timedeltas import TimedeltaIndex -import pandas.util.testing as tm # TODO: more freq variants diff --git a/pandas/tests/arrays/test_datetimes.py b/pandas/tests/arrays/test_datetimes.py index d5ec473f4c74d..a6c7018ab6211 100644 --- a/pandas/tests/arrays/test_datetimes.py +++ b/pandas/tests/arrays/test_datetimes.py @@ -6,12 +6,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import DatetimeTZDtype import pandas as pd from pandas.core.arrays import DatetimeArray from pandas.core.arrays.datetimes import sequence_to_dt64ns -import pandas.util.testing as tm class TestDatetimeArrayConstructor: diff --git a/pandas/tests/arrays/test_integer.py b/pandas/tests/arrays/test_integer.py index f9b002d4409ce..2fe77d6b1c838 100644 --- a/pandas/tests/arrays/test_integer.py +++ b/pandas/tests/arrays/test_integer.py @@ -2,6 +2,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.generic import ABCIndexClass @@ -19,7 +20,6 @@ UInt64Dtype, ) from pandas.tests.extension.base import BaseOpsUtil -import pandas.util.testing as tm def make_data(): diff --git a/pandas/tests/arrays/test_numpy.py b/pandas/tests/arrays/test_numpy.py index 8828a013aeea1..36cd2318dd03c 100644 --- a/pandas/tests/arrays/test_numpy.py +++ b/pandas/tests/arrays/test_numpy.py @@ -5,10 +5,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.arrays import PandasArray from pandas.core.arrays.numpy_ import PandasDtype -import pandas.util.testing as tm @pytest.fixture( diff --git a/pandas/tests/arrays/test_period.py b/pandas/tests/arrays/test_period.py index 252f278242fcc..b9efd66a4c229 100644 --- a/pandas/tests/arrays/test_period.py +++ b/pandas/tests/arrays/test_period.py @@ -3,12 +3,12 @@ from pandas._libs.tslibs import iNaT from pandas._libs.tslibs.period import IncompatibleFrequency +import pandas.util._testing as tm from pandas.core.dtypes.dtypes import PeriodDtype, registry import pandas as pd from pandas.core.arrays import PeriodArray, period_array -import pandas.util.testing as tm # ---------------------------------------------------------------------------- # Dtype diff --git a/pandas/tests/arrays/test_timedeltas.py b/pandas/tests/arrays/test_timedeltas.py index 8d54ea564e1c2..a5b098f8d9509 100644 --- a/pandas/tests/arrays/test_timedeltas.py +++ b/pandas/tests/arrays/test_timedeltas.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.core.arrays import TimedeltaArray -import pandas.util.testing as tm class TestTimedeltaArrayConstructor: diff --git a/pandas/tests/base/test_constructors.py b/pandas/tests/base/test_constructors.py index a9e0473ac067a..462f67f2431c9 100644 --- a/pandas/tests/base/test_constructors.py +++ b/pandas/tests/base/test_constructors.py @@ -5,12 +5,12 @@ import pytest from pandas.compat import PYPY +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series from pandas.core.accessor import PandasDelegate from pandas.core.base import NoNewAttributesMixin, PandasObject -import pandas.util.testing as tm class TestPandasDelegate: diff --git a/pandas/tests/base/test_conversion.py b/pandas/tests/base/test_conversion.py index 4295d89869a72..c45a99b7781b6 100644 --- a/pandas/tests/base/test_conversion.py +++ b/pandas/tests/base/test_conversion.py @@ -1,13 +1,14 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_datetime64_dtype, is_timedelta64_dtype from pandas.core.dtypes.dtypes import DatetimeTZDtype import pandas as pd from pandas import CategoricalIndex, Series, Timedelta, Timestamp from pandas.core.arrays import DatetimeArray, PandasArray, TimedeltaArray -import pandas.util.testing as tm class TestToIterable: diff --git a/pandas/tests/base/test_ops.py b/pandas/tests/base/test_ops.py index 0d8c280d91256..cd16c4389a57f 100644 --- a/pandas/tests/base/test_ops.py +++ b/pandas/tests/base/test_ops.py @@ -8,6 +8,7 @@ from pandas._libs.tslib import iNaT from pandas.compat import PYPY from pandas.compat.numpy import np_array_datetime64_compat +import pandas.util._testing as tm from pandas.core.dtypes.common import ( is_datetime64_dtype, @@ -30,7 +31,6 @@ Timestamp, ) from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin -import pandas.util.testing as tm class Ops: diff --git a/pandas/tests/computation/test_eval.py b/pandas/tests/computation/test_eval.py index 8438eea84baa8..310e09ba63f48 100644 --- a/pandas/tests/computation/test_eval.py +++ b/pandas/tests/computation/test_eval.py @@ -11,6 +11,7 @@ from pandas.errors import PerformanceWarning import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.common import is_bool, is_list_like, is_scalar @@ -33,7 +34,6 @@ _special_case_arith_ops_syms, _unary_math_ops, ) -import pandas.util.testing as tm @pytest.fixture( diff --git a/pandas/tests/dtypes/cast/test_construct_from_scalar.py b/pandas/tests/dtypes/cast/test_construct_from_scalar.py index 71f41fcf5b447..cc65d47ef77bf 100644 --- a/pandas/tests/dtypes/cast/test_construct_from_scalar.py +++ b/pandas/tests/dtypes/cast/test_construct_from_scalar.py @@ -1,8 +1,9 @@ +import pandas.util._testing as tm + from pandas.core.dtypes.cast import construct_1d_arraylike_from_scalar from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import Categorical -import pandas.util.testing as tm def test_cast_1d_array_like_from_scalar_categorical(): diff --git a/pandas/tests/dtypes/cast/test_construct_ndarray.py b/pandas/tests/dtypes/cast/test_construct_ndarray.py index 620e74f80d5fb..7faf20302c7cf 100644 --- a/pandas/tests/dtypes/cast/test_construct_ndarray.py +++ b/pandas/tests/dtypes/cast/test_construct_ndarray.py @@ -1,9 +1,9 @@ import numpy as np import pytest -from pandas.core.dtypes.cast import construct_1d_ndarray_preserving_na +import pandas.util._testing as tm -import pandas.util.testing as tm +from pandas.core.dtypes.cast import construct_1d_ndarray_preserving_na @pytest.mark.parametrize( diff --git a/pandas/tests/dtypes/cast/test_downcast.py b/pandas/tests/dtypes/cast/test_downcast.py index 99afabfa42a04..bc196a886a016 100644 --- a/pandas/tests/dtypes/cast/test_downcast.py +++ b/pandas/tests/dtypes/cast/test_downcast.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.cast import maybe_downcast_to_dtype from pandas import DatetimeIndex, Series, Timestamp -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/dtypes/cast/test_infer_dtype.py b/pandas/tests/dtypes/cast/test_infer_dtype.py index 37fa003668435..08debe2bda95f 100644 --- a/pandas/tests/dtypes/cast/test_infer_dtype.py +++ b/pandas/tests/dtypes/cast/test_infer_dtype.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.cast import ( cast_scalar_to_array, infer_dtype_from_array, @@ -19,7 +21,6 @@ Timestamp, date_range, ) -import pandas.util.testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/dtypes/cast/test_upcast.py b/pandas/tests/dtypes/cast/test_upcast.py index 49e850f3e87b5..33420b210cc27 100644 --- a/pandas/tests/dtypes/cast/test_upcast.py +++ b/pandas/tests/dtypes/cast/test_upcast.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.cast import maybe_upcast_putmask from pandas import Series -import pandas.util.testing as tm @pytest.mark.parametrize("result", [Series([10, 11, 12]), [10, 11, 12], (10, 11, 12)]) diff --git a/pandas/tests/dtypes/test_common.py b/pandas/tests/dtypes/test_common.py index 7abb43bb25e14..608619115d31f 100644 --- a/pandas/tests/dtypes/test_common.py +++ b/pandas/tests/dtypes/test_common.py @@ -5,6 +5,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.cast import astype_nansafe import pandas.core.dtypes.common as com @@ -26,7 +27,6 @@ UNSIGNED_EA_INT_DTYPES, UNSIGNED_INT_DTYPES, ) -import pandas.util.testing as tm # EA & Actual Dtypes diff --git a/pandas/tests/dtypes/test_dtypes.py b/pandas/tests/dtypes/test_dtypes.py index 3a933a5ca8cdc..1ca1edc41c8d2 100644 --- a/pandas/tests/dtypes/test_dtypes.py +++ b/pandas/tests/dtypes/test_dtypes.py @@ -4,6 +4,8 @@ import pytest import pytz +import pandas.util._testing as tm + from pandas.core.dtypes.common import ( is_bool_dtype, is_categorical, @@ -28,7 +30,6 @@ import pandas as pd from pandas import Categorical, CategoricalIndex, IntervalIndex, Series, date_range from pandas.core.arrays.sparse import SparseDtype -import pandas.util.testing as tm class Base: diff --git a/pandas/tests/dtypes/test_generic.py b/pandas/tests/dtypes/test_generic.py index c17a8997a9b8f..e5ee943dda2a7 100644 --- a/pandas/tests/dtypes/test_generic.py +++ b/pandas/tests/dtypes/test_generic.py @@ -2,10 +2,11 @@ import numpy as np +import pandas.util._testing as tm + from pandas.core.dtypes import generic as gt import pandas as pd -import pandas.util.testing as tm class TestABCClasses: diff --git a/pandas/tests/dtypes/test_inference.py b/pandas/tests/dtypes/test_inference.py index 343dcc6849af6..28bcf0945edb9 100644 --- a/pandas/tests/dtypes/test_inference.py +++ b/pandas/tests/dtypes/test_inference.py @@ -18,6 +18,7 @@ from pandas._libs import iNaT, lib, missing as libmissing import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes import inference from pandas.core.dtypes.common import ( @@ -53,7 +54,6 @@ isna, ) from pandas.core.arrays import IntegerArray -import pandas.util.testing as tm @pytest.fixture(params=[True, False], ids=str) diff --git a/pandas/tests/dtypes/test_missing.py b/pandas/tests/dtypes/test_missing.py index 5e7c6e4b48682..1d189228a0fbf 100644 --- a/pandas/tests/dtypes/test_missing.py +++ b/pandas/tests/dtypes/test_missing.py @@ -9,6 +9,7 @@ from pandas._libs import missing as libmissing from pandas._libs.tslibs import iNaT, is_null_datetimelike +import pandas.util._testing as tm from pandas.core.dtypes.common import is_scalar from pandas.core.dtypes.dtypes import DatetimeTZDtype, IntervalDtype, PeriodDtype @@ -23,7 +24,6 @@ import pandas as pd from pandas import DatetimeIndex, Float64Index, NaT, Series, TimedeltaIndex, date_range -import pandas.util.testing as tm now = pd.Timestamp.now() utcnow = pd.Timestamp.now("UTC") diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index e88c63b19003f..ea549f6c192ff 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.tests.extension import base -import pandas.util.testing as tm pytest.importorskip("pyarrow", minversion="0.12.0") diff --git a/pandas/tests/extension/base/base.py b/pandas/tests/extension/base/base.py index 2f808d20acd31..e91a875a14647 100644 --- a/pandas/tests/extension/base/base.py +++ b/pandas/tests/extension/base/base.py @@ -1,4 +1,4 @@ -import pandas.util.testing as tm +import pandas.util._testing as tm class BaseExtensionTests: diff --git a/pandas/tests/extension/base/groupby.py b/pandas/tests/extension/base/groupby.py index dc926d2ff6ab4..673bf6515366f 100644 --- a/pandas/tests/extension/base/groupby.py +++ b/pandas/tests/extension/base/groupby.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/interface.py b/pandas/tests/extension/base/interface.py index a29f6deeffae6..e2f4b326c5540 100644 --- a/pandas/tests/extension/base/interface.py +++ b/pandas/tests/extension/base/interface.py @@ -1,10 +1,11 @@ import numpy as np +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_extension_array_dtype from pandas.core.dtypes.dtypes import ExtensionDtype import pandas as pd -import pandas.util.testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/methods.py b/pandas/tests/extension/base/methods.py index 973088cb72e7a..10c2ffafa73ba 100644 --- a/pandas/tests/extension/base/methods.py +++ b/pandas/tests/extension/base/methods.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.core.sorting import nargsort -import pandas.util.testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/missing.py b/pandas/tests/extension/base/missing.py index 21bbb365ab0f3..1df0ccba6e85e 100644 --- a/pandas/tests/extension/base/missing.py +++ b/pandas/tests/extension/base/missing.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/reduce.py b/pandas/tests/extension/base/reduce.py index 8766bb771f8a2..64e630acfe907 100644 --- a/pandas/tests/extension/base/reduce.py +++ b/pandas/tests/extension/base/reduce.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/decimal/test_decimal.py b/pandas/tests/extension/decimal/test_decimal.py index b5c3abd8ce8f6..63bb68646137e 100644 --- a/pandas/tests/extension/decimal/test_decimal.py +++ b/pandas/tests/extension/decimal/test_decimal.py @@ -5,9 +5,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.tests.extension import base -import pandas.util.testing as tm from .array import DecimalArray, DecimalDtype, make_data, to_decimal diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index 01f2565e2ee58..aa995ebfeac00 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -3,9 +3,10 @@ import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.tests.extension import base -import pandas.util.testing as tm from .array import JSONArray, JSONDtype, make_data diff --git a/pandas/tests/extension/test_boolean.py b/pandas/tests/extension/test_boolean.py index a02433da2da12..166e37aa6ed39 100644 --- a/pandas/tests/extension/test_boolean.py +++ b/pandas/tests/extension/test_boolean.py @@ -17,11 +17,11 @@ import pytest from pandas.compat.numpy import _np_version_under1p14 +import pandas.util._testing as tm import pandas as pd from pandas.core.arrays.boolean import BooleanDtype from pandas.tests.extension import base -import pandas.util.testing as tm def make_data(): diff --git a/pandas/tests/extension/test_categorical.py b/pandas/tests/extension/test_categorical.py index dff1e58641ade..88d26dc58843a 100644 --- a/pandas/tests/extension/test_categorical.py +++ b/pandas/tests/extension/test_categorical.py @@ -18,11 +18,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, CategoricalIndex, Timestamp from pandas.api.types import CategoricalDtype from pandas.tests.extension import base -import pandas.util.testing as tm def make_data(): diff --git a/pandas/tests/extension/test_common.py b/pandas/tests/extension/test_common.py index 9b5f9d64f6b67..b7de2456539b3 100644 --- a/pandas/tests/extension/test_common.py +++ b/pandas/tests/extension/test_common.py @@ -1,12 +1,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes import dtypes from pandas.core.dtypes.common import is_extension_array_dtype import pandas as pd from pandas.core.arrays import ExtensionArray -import pandas.util.testing as tm class DummyDtype(dtypes.ExtensionDtype): diff --git a/pandas/tests/extension/test_numpy.py b/pandas/tests/extension/test_numpy.py index 55a617caf28ce..8dbaaf6f2a1c7 100644 --- a/pandas/tests/extension/test_numpy.py +++ b/pandas/tests/extension/test_numpy.py @@ -2,10 +2,10 @@ import pytest from pandas.compat.numpy import _np_version_under1p16 +import pandas.util._testing as tm import pandas as pd from pandas.core.arrays.numpy_ import PandasArray, PandasDtype -import pandas.util.testing as tm from . import base diff --git a/pandas/tests/extension/test_sparse.py b/pandas/tests/extension/test_sparse.py index 6ebe71e173ec2..2946c728c6527 100644 --- a/pandas/tests/extension/test_sparse.py +++ b/pandas/tests/extension/test_sparse.py @@ -2,11 +2,11 @@ import pytest from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import SparseArray, SparseDtype from pandas.tests.extension import base -import pandas.util.testing as tm def make_data(fill_value): diff --git a/pandas/tests/frame/conftest.py b/pandas/tests/frame/conftest.py index 915d6edcd8367..3c91d41716a2e 100644 --- a/pandas/tests/frame/conftest.py +++ b/pandas/tests/frame/conftest.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, NaT, date_range -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/indexing/test_categorical.py b/pandas/tests/frame/indexing/test_categorical.py index b595e48797d41..7be28d5021e09 100644 --- a/pandas/tests/frame/indexing/test_categorical.py +++ b/pandas/tests/frame/indexing/test_categorical.py @@ -1,11 +1,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import Categorical, DataFrame, Index, Series -import pandas.util.testing as tm class TestDataFrameIndexingCategorical: diff --git a/pandas/tests/frame/indexing/test_datetime.py b/pandas/tests/frame/indexing/test_datetime.py index bde35c04acf4f..e6449f08831e8 100644 --- a/pandas/tests/frame/indexing/test_datetime.py +++ b/pandas/tests/frame/indexing/test_datetime.py @@ -1,6 +1,7 @@ +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, date_range, notna -import pandas.util.testing as tm class TestDataFrameIndexingDatetimeWithTZ: diff --git a/pandas/tests/frame/indexing/test_indexing.py b/pandas/tests/frame/indexing/test_indexing.py index 9a53caa491970..f3adc1ca90bfc 100644 --- a/pandas/tests/frame/indexing/test_indexing.py +++ b/pandas/tests/frame/indexing/test_indexing.py @@ -5,6 +5,7 @@ import pytest from pandas._libs.tslib import iNaT +import pandas.util._testing as tm from pandas.core.dtypes.common import is_float_dtype, is_integer @@ -22,7 +23,6 @@ ) import pandas.core.common as com from pandas.core.indexing import IndexingError -import pandas.util.testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index 4fea190f28d7b..b728468b21dbd 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -3,11 +3,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_scalar import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, Timestamp, date_range, isna -import pandas.util.testing as tm class TestDataFrameIndexingWhere: diff --git a/pandas/tests/frame/methods/test_append.py b/pandas/tests/frame/methods/test_append.py index 1d6935795b0e4..17fbcd8c3bb72 100644 --- a/pandas/tests/frame/methods/test_append.py +++ b/pandas/tests/frame/methods/test_append.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp -import pandas.util.testing as tm class TestDataFrameAppend: diff --git a/pandas/tests/frame/methods/test_asof.py b/pandas/tests/frame/methods/test_asof.py index 89be3779e5748..1c94fff2635d0 100644 --- a/pandas/tests/frame/methods/test_asof.py +++ b/pandas/tests/frame/methods/test_asof.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series, Timestamp, date_range, to_datetime -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/methods/test_clip.py b/pandas/tests/frame/methods/test_clip.py index 48444e909ee01..be7f583b7394a 100644 --- a/pandas/tests/frame/methods/test_clip.py +++ b/pandas/tests/frame/methods/test_clip.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series -import pandas.util.testing as tm class TestDataFrameClip: diff --git a/pandas/tests/frame/methods/test_count.py b/pandas/tests/frame/methods/test_count.py index b5d3d60579f54..3a527bdbd810d 100644 --- a/pandas/tests/frame/methods/test_count.py +++ b/pandas/tests/frame/methods/test_count.py @@ -1,5 +1,6 @@ +import pandas.util._testing as tm + from pandas import DataFrame, Series -import pandas.util.testing as tm class TestDataFrameCount: diff --git a/pandas/tests/frame/methods/test_cov_corr.py b/pandas/tests/frame/methods/test_cov_corr.py index 209b4a800354d..85b4781cc32ec 100644 --- a/pandas/tests/frame/methods/test_cov_corr.py +++ b/pandas/tests/frame/methods/test_cov_corr.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, isna -import pandas.util.testing as tm class TestDataFrameCov: diff --git a/pandas/tests/frame/methods/test_describe.py b/pandas/tests/frame/methods/test_describe.py index 09510fc931546..99e13cf9bcc15 100644 --- a/pandas/tests/frame/methods/test_describe.py +++ b/pandas/tests/frame/methods/test_describe.py @@ -1,8 +1,9 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, DataFrame, Series, Timestamp, date_range -import pandas.util.testing as tm class TestDataFrameDescribe: diff --git a/pandas/tests/frame/methods/test_diff.py b/pandas/tests/frame/methods/test_diff.py index 9293855e79b1c..f2cba57c40355 100644 --- a/pandas/tests/frame/methods/test_diff.py +++ b/pandas/tests/frame/methods/test_diff.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range -import pandas.util.testing as tm class TestDataFrameDiff: diff --git a/pandas/tests/frame/methods/test_drop_duplicates.py b/pandas/tests/frame/methods/test_drop_duplicates.py index 29ab2e1bfd512..f7b9ecfe42235 100644 --- a/pandas/tests/frame/methods/test_drop_duplicates.py +++ b/pandas/tests/frame/methods/test_drop_duplicates.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm @pytest.mark.parametrize("subset", ["a", ["a"], ["a", "B"]]) diff --git a/pandas/tests/frame/methods/test_duplicated.py b/pandas/tests/frame/methods/test_duplicated.py index d5c28a416ffa7..fb54246cec398 100644 --- a/pandas/tests/frame/methods/test_duplicated.py +++ b/pandas/tests/frame/methods/test_duplicated.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series -import pandas.util.testing as tm @pytest.mark.parametrize("subset", ["a", ["a"], ["a", "B"]]) diff --git a/pandas/tests/frame/methods/test_explode.py b/pandas/tests/frame/methods/test_explode.py index 545a4b5f9421e..8b66ae3116219 100644 --- a/pandas/tests/frame/methods/test_explode.py +++ b/pandas/tests/frame/methods/test_explode.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm def test_error(): diff --git a/pandas/tests/frame/methods/test_isin.py b/pandas/tests/frame/methods/test_isin.py index 5d7dc5c843ec1..faaa8be3ebc63 100644 --- a/pandas/tests/frame/methods/test_isin.py +++ b/pandas/tests/frame/methods/test_isin.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, Series -import pandas.util.testing as tm class TestDataFrameIsIn: diff --git a/pandas/tests/frame/methods/test_nlargest.py b/pandas/tests/frame/methods/test_nlargest.py index 72299ad6b2bf6..5a76d6e856798 100644 --- a/pandas/tests/frame/methods/test_nlargest.py +++ b/pandas/tests/frame/methods/test_nlargest.py @@ -7,8 +7,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/methods/test_pct_change.py b/pandas/tests/frame/methods/test_pct_change.py index 0c15533c37f01..ff5107b42f4cd 100644 --- a/pandas/tests/frame/methods/test_pct_change.py +++ b/pandas/tests/frame/methods/test_pct_change.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series -import pandas.util.testing as tm class TestDataFramePctChange: diff --git a/pandas/tests/frame/methods/test_quantile.py b/pandas/tests/frame/methods/test_quantile.py index c25b24121d481..3115dc3078938 100644 --- a/pandas/tests/frame/methods/test_quantile.py +++ b/pandas/tests/frame/methods/test_quantile.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp -import pandas.util.testing as tm class TestDataFrameQuantile: diff --git a/pandas/tests/frame/methods/test_rank.py b/pandas/tests/frame/methods/test_rank.py index efb0c64a4f7ac..fae4745a69007 100644 --- a/pandas/tests/frame/methods/test_rank.py +++ b/pandas/tests/frame/methods/test_rank.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Series -import pandas.util.testing as tm class TestRank: diff --git a/pandas/tests/frame/methods/test_replace.py b/pandas/tests/frame/methods/test_replace.py index b2720f9158c6b..6d2afd9fe0c5d 100644 --- a/pandas/tests/frame/methods/test_replace.py +++ b/pandas/tests/frame/methods/test_replace.py @@ -6,9 +6,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, date_range -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/methods/test_round.py b/pandas/tests/frame/methods/test_round.py index 96ac012ce7892..486ac0a5042a3 100644 --- a/pandas/tests/frame/methods/test_round.py +++ b/pandas/tests/frame/methods/test_round.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, date_range -import pandas.util.testing as tm class TestDataFrameRound: diff --git a/pandas/tests/frame/methods/test_shift.py b/pandas/tests/frame/methods/test_shift.py index 7fb8fbbc95627..5acf66439dfd7 100644 --- a/pandas/tests/frame/methods/test_shift.py +++ b/pandas/tests/frame/methods/test_shift.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, date_range, offsets -import pandas.util.testing as tm class TestDataFrameShift: diff --git a/pandas/tests/frame/methods/test_sort_index.py b/pandas/tests/frame/methods/test_sort_index.py index 4f311bbaa8eb9..ba9c4b2eb3cfc 100644 --- a/pandas/tests/frame/methods/test_sort_index.py +++ b/pandas/tests/frame/methods/test_sort_index.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import CategoricalDtype, DataFrame, IntervalIndex, MultiIndex, Series -import pandas.util.testing as tm class TestDataFrameSortIndex: diff --git a/pandas/tests/frame/methods/test_sort_values.py b/pandas/tests/frame/methods/test_sort_values.py index e733c01e01740..88c4fb1e71a42 100644 --- a/pandas/tests/frame/methods/test_sort_values.py +++ b/pandas/tests/frame/methods/test_sort_values.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, DataFrame, NaT, Timestamp, date_range -import pandas.util.testing as tm class TestDataFrameSortValues: diff --git a/pandas/tests/frame/methods/test_to_dict.py b/pandas/tests/frame/methods/test_to_dict.py index 556d86bed8f14..d05331d45e5e7 100644 --- a/pandas/tests/frame/methods/test_to_dict.py +++ b/pandas/tests/frame/methods/test_to_dict.py @@ -5,8 +5,9 @@ import pytest import pytz +import pandas.util._testing as tm + from pandas import DataFrame, Series, Timestamp -import pandas.util.testing as tm class TestDataFrameToDict: diff --git a/pandas/tests/frame/methods/test_to_records.py b/pandas/tests/frame/methods/test_to_records.py index 18f77088677ec..308c3e3257748 100644 --- a/pandas/tests/frame/methods/test_to_records.py +++ b/pandas/tests/frame/methods/test_to_records.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import CategoricalDtype, DataFrame, MultiIndex, Series, date_range -import pandas.util.testing as tm class TestDataFrameToRecords: diff --git a/pandas/tests/frame/methods/test_transpose.py b/pandas/tests/frame/methods/test_transpose.py index 71843053cf3a8..2b0df921d87d6 100644 --- a/pandas/tests/frame/methods/test_transpose.py +++ b/pandas/tests/frame/methods/test_transpose.py @@ -1,5 +1,6 @@ +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestTranspose: diff --git a/pandas/tests/frame/methods/test_truncate.py b/pandas/tests/frame/methods/test_truncate.py index a021a99a45a5c..721e15099375b 100644 --- a/pandas/tests/frame/methods/test_truncate.py +++ b/pandas/tests/frame/methods/test_truncate.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestDataFrameTruncate: diff --git a/pandas/tests/frame/test_alter_axes.py b/pandas/tests/frame/test_alter_axes.py index 48b373d9c7901..7f1ac0bfc5457 100644 --- a/pandas/tests/frame/test_alter_axes.py +++ b/pandas/tests/frame/test_alter_axes.py @@ -5,6 +5,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import ( is_categorical_dtype, is_interval_dtype, @@ -25,7 +27,6 @@ date_range, to_datetime, ) -import pandas.util.testing as tm class TestDataFrameAlterAxes: diff --git a/pandas/tests/frame/test_analytics.py b/pandas/tests/frame/test_analytics.py index 68d49c05eaa37..c3a4f1563c639 100644 --- a/pandas/tests/frame/test_analytics.py +++ b/pandas/tests/frame/test_analytics.py @@ -6,6 +6,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -22,7 +23,6 @@ ) import pandas.core.algorithms as algorithms import pandas.core.nanops as nanops -import pandas.util.testing as tm def assert_stat_op_calc( diff --git a/pandas/tests/frame/test_api.py b/pandas/tests/frame/test_api.py index f6713d703e112..4ac503fd472e2 100644 --- a/pandas/tests/frame/test_api.py +++ b/pandas/tests/frame/test_api.py @@ -6,10 +6,10 @@ import pytest from pandas.compat import PY37 +import pandas.util._testing as tm import pandas as pd from pandas import Categorical, DataFrame, Series, compat, date_range, timedelta_range -import pandas.util.testing as tm class TestDataFrameMisc: diff --git a/pandas/tests/frame/test_apply.py b/pandas/tests/frame/test_apply.py index 93e165ad3d71e..34439078e07b4 100644 --- a/pandas/tests/frame/test_apply.py +++ b/pandas/tests/frame/test_apply.py @@ -7,6 +7,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd @@ -14,7 +16,6 @@ from pandas.conftest import _get_cython_table_params from pandas.core.apply import frame_apply from pandas.core.base import SpecificationError -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index 5ecbe21d113b5..f7ee56932bf8e 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -5,9 +5,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.tests.frame.common import _check_mixed_float, _check_mixed_int -import pandas.util.testing as tm # ------------------------------------------------------------------- # Comparisons diff --git a/pandas/tests/frame/test_axis_select_reindex.py b/pandas/tests/frame/test_axis_select_reindex.py index d6ef3a7600abb..d4e2d59e9bdb7 100644 --- a/pandas/tests/frame/test_axis_select_reindex.py +++ b/pandas/tests/frame/test_axis_select_reindex.py @@ -5,10 +5,10 @@ import pytest from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import Categorical, DataFrame, Index, MultiIndex, Series, date_range, isna -import pandas.util.testing as tm class TestDataFrameSelectReindex: diff --git a/pandas/tests/frame/test_block_internals.py b/pandas/tests/frame/test_block_internals.py index eb8febb10a646..073f546a00e74 100644 --- a/pandas/tests/frame/test_block_internals.py +++ b/pandas/tests/frame/test_block_internals.py @@ -5,6 +5,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -18,7 +20,6 @@ from pandas.core.arrays import IntervalArray, integer_array from pandas.core.internals import ObjectBlock from pandas.core.internals.blocks import IntBlock -import pandas.util.testing as tm # Segregated collection of methods that require the BlockManager internal data # structure diff --git a/pandas/tests/frame/test_combine_concat.py b/pandas/tests/frame/test_combine_concat.py index bfb691a8e75d3..8bfa4c0047dbb 100644 --- a/pandas/tests/frame/test_combine_concat.py +++ b/pandas/tests/frame/test_combine_concat.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, date_range -import pandas.util.testing as tm class TestDataFrameConcatCommon: diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py index 4e7d8c3054cf2..4e00bde7c74b1 100644 --- a/pandas/tests/frame/test_constructors.py +++ b/pandas/tests/frame/test_constructors.py @@ -9,6 +9,7 @@ import pytest from pandas.compat import is_platform_little_endian +import pandas.util._testing as tm from pandas.core.dtypes.common import is_integer_dtype @@ -27,7 +28,6 @@ ) from pandas.arrays import IntervalArray, PeriodArray from pandas.core.construction import create_series_with_explicit_dtype -import pandas.util.testing as tm MIXED_FLOAT_DTYPES = ["float16", "float32", "float64"] MIXED_INT_DTYPES = [ diff --git a/pandas/tests/frame/test_cumulative.py b/pandas/tests/frame/test_cumulative.py index 2deeeb95d057d..7d2e4b86d4344 100644 --- a/pandas/tests/frame/test_cumulative.py +++ b/pandas/tests/frame/test_cumulative.py @@ -8,8 +8,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import DataFrame, Series -import pandas.util.testing as tm class TestDataFrameCumulativeOps: diff --git a/pandas/tests/frame/test_dtypes.py b/pandas/tests/frame/test_dtypes.py index d8d56e90a2f31..cbff72a5ce8e3 100644 --- a/pandas/tests/frame/test_dtypes.py +++ b/pandas/tests/frame/test_dtypes.py @@ -4,6 +4,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype, DatetimeTZDtype, IntervalDtype import pandas as pd @@ -19,7 +21,6 @@ option_context, ) from pandas.core.arrays import integer_array -import pandas.util.testing as tm def _check_cast(df, v): diff --git a/pandas/tests/frame/test_join.py b/pandas/tests/frame/test_join.py index a0cbc1456afa4..c5cfc00923b98 100644 --- a/pandas/tests/frame/test_join.py +++ b/pandas/tests/frame/test_join.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, period_range -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/test_missing.py b/pandas/tests/frame/test_missing.py index f9a2061aa1ff4..f1d16e3882d29 100644 --- a/pandas/tests/frame/test_missing.py +++ b/pandas/tests/frame/test_missing.py @@ -5,11 +5,11 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import Categorical, DataFrame, Series, Timestamp, date_range from pandas.tests.frame.common import _check_mixed_float -import pandas.util.testing as tm class TestDataFrameMissingData: diff --git a/pandas/tests/frame/test_mutate_columns.py b/pandas/tests/frame/test_mutate_columns.py index 8c0dd67af4e7d..d4563d3228dc8 100644 --- a/pandas/tests/frame/test_mutate_columns.py +++ b/pandas/tests/frame/test_mutate_columns.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, Series -import pandas.util.testing as tm # Column add, remove, delete. diff --git a/pandas/tests/frame/test_nonunique_indexes.py b/pandas/tests/frame/test_nonunique_indexes.py index 8fed695a483f5..d27fb5c33ffe1 100644 --- a/pandas/tests/frame/test_nonunique_indexes.py +++ b/pandas/tests/frame/test_nonunique_indexes.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range -import pandas.util.testing as tm class TestDataFrameNonuniqueIndexes: diff --git a/pandas/tests/frame/test_operators.py b/pandas/tests/frame/test_operators.py index a4f1c0688b144..0f93348c34de4 100644 --- a/pandas/tests/frame/test_operators.py +++ b/pandas/tests/frame/test_operators.py @@ -4,11 +4,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, Series import pandas.core.common as com from pandas.tests.frame.common import _check_mixed_float -import pandas.util.testing as tm class TestDataFrameUnaryOperators: diff --git a/pandas/tests/frame/test_period.py b/pandas/tests/frame/test_period.py index a545db3365e36..c3ecbe48ee295 100644 --- a/pandas/tests/frame/test_period.py +++ b/pandas/tests/frame/test_period.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( DataFrame, @@ -14,7 +16,6 @@ period_range, to_datetime, ) -import pandas.util.testing as tm def _permute(obj): diff --git a/pandas/tests/frame/test_query_eval.py b/pandas/tests/frame/test_query_eval.py index d577ff7c71277..363e265966792 100644 --- a/pandas/tests/frame/test_query_eval.py +++ b/pandas/tests/frame/test_query_eval.py @@ -5,11 +5,11 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, date_range from pandas.core.computation.check import _NUMEXPR_INSTALLED -import pandas.util.testing as tm PARSERS = "python", "pandas" ENGINES = "python", pytest.param("numexpr", marks=td.skip_if_no_ne) diff --git a/pandas/tests/frame/test_repr_info.py b/pandas/tests/frame/test_repr_info.py index 60dce36312145..996d938b95976 100644 --- a/pandas/tests/frame/test_repr_info.py +++ b/pandas/tests/frame/test_repr_info.py @@ -9,6 +9,7 @@ import pytest from pandas.compat import PYPY +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -19,7 +20,6 @@ option_context, period_range, ) -import pandas.util.testing as tm import pandas.io.formats.format as fmt diff --git a/pandas/tests/frame/test_reshape.py b/pandas/tests/frame/test_reshape.py index 5acd681933914..291a526e2b9e1 100644 --- a/pandas/tests/frame/test_reshape.py +++ b/pandas/tests/frame/test_reshape.py @@ -4,9 +4,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Period, Series, Timedelta, date_range -import pandas.util.testing as tm class TestDataFrameReshape: diff --git a/pandas/tests/frame/test_sort_values_level_as_str.py b/pandas/tests/frame/test_sort_values_level_as_str.py index b0287d9180859..f7fe05c14a412 100644 --- a/pandas/tests/frame/test_sort_values_level_as_str.py +++ b/pandas/tests/frame/test_sort_values_level_as_str.py @@ -2,9 +2,9 @@ import pytest from pandas.errors import PerformanceWarning +import pandas.util._testing as tm from pandas import DataFrame -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/frame/test_subclass.py b/pandas/tests/frame/test_subclass.py index e1e546256f7cd..56ab9d3a40a14 100644 --- a/pandas/tests/frame/test_subclass.py +++ b/pandas/tests/frame/test_subclass.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series -import pandas.util.testing as tm class TestDataFrameSubclassing: diff --git a/pandas/tests/frame/test_timeseries.py b/pandas/tests/frame/test_timeseries.py index 9985468ac6cd8..cff2bcacdd59b 100644 --- a/pandas/tests/frame/test_timeseries.py +++ b/pandas/tests/frame/test_timeseries.py @@ -5,6 +5,8 @@ import pytest import pytz +import pandas.util._testing as tm + import pandas as pd from pandas import ( DataFrame, @@ -16,7 +18,6 @@ period_range, to_datetime, ) -import pandas.util.testing as tm import pandas.tseries.offsets as offsets diff --git a/pandas/tests/frame/test_timezones.py b/pandas/tests/frame/test_timezones.py index 26ab4ff0ded85..79315213ab540 100644 --- a/pandas/tests/frame/test_timezones.py +++ b/pandas/tests/frame/test_timezones.py @@ -7,12 +7,13 @@ import pytest import pytz +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import DatetimeTZDtype import pandas as pd from pandas import DataFrame, Series from pandas.core.indexes.datetimes import date_range -import pandas.util.testing as tm class TestDataFrameTimezones: diff --git a/pandas/tests/frame/test_to_csv.py b/pandas/tests/frame/test_to_csv.py index 5c39dcc1a7659..8f9f85709b16d 100644 --- a/pandas/tests/frame/test_to_csv.py +++ b/pandas/tests/frame/test_to_csv.py @@ -6,6 +6,7 @@ import pytest from pandas.errors import ParserError +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -19,7 +20,6 @@ to_datetime, ) import pandas.core.common as com -import pandas.util.testing as tm from pandas.io.common import get_handle diff --git a/pandas/tests/generic/test_frame.py b/pandas/tests/generic/test_frame.py index 54c7e450c5cd6..110eb68a84bb4 100644 --- a/pandas/tests/generic/test_frame.py +++ b/pandas/tests/generic/test_frame.py @@ -6,10 +6,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range -import pandas.util.testing as tm from .test_generic import Generic diff --git a/pandas/tests/generic/test_generic.py b/pandas/tests/generic/test_generic.py index d0c9b3e7a8f76..ab5220ee3c1a2 100644 --- a/pandas/tests/generic/test_generic.py +++ b/pandas/tests/generic/test_generic.py @@ -3,11 +3,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_scalar import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range -import pandas.util.testing as tm # ---------------------------------------------------------------------- # Generic types test cases diff --git a/pandas/tests/generic/test_series.py b/pandas/tests/generic/test_series.py index 601fc2aa64434..3a43e54215886 100644 --- a/pandas/tests/generic/test_series.py +++ b/pandas/tests/generic/test_series.py @@ -5,10 +5,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import MultiIndex, Series, date_range -import pandas.util.testing as tm from .test_generic import Generic diff --git a/pandas/tests/groupby/aggregate/test_aggregate.py b/pandas/tests/groupby/aggregate/test_aggregate.py index 0d8379407fef7..1e94e9539a2d1 100644 --- a/pandas/tests/groupby/aggregate/test_aggregate.py +++ b/pandas/tests/groupby/aggregate/test_aggregate.py @@ -6,12 +6,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, concat from pandas.core.base import SpecificationError from pandas.core.groupby.generic import _make_unique, _maybe_mangle_lambdas from pandas.core.groupby.grouper import Grouping -import pandas.util.testing as tm def test_agg_regression1(tsframe): diff --git a/pandas/tests/groupby/aggregate/test_cython.py b/pandas/tests/groupby/aggregate/test_cython.py index 5d50c044cf9f5..75fd9fd59895a 100644 --- a/pandas/tests/groupby/aggregate/test_cython.py +++ b/pandas/tests/groupby/aggregate/test_cython.py @@ -5,10 +5,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, NaT, Series, Timedelta, Timestamp, bdate_range from pandas.core.groupby.groupby import DataError -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/groupby/aggregate/test_other.py b/pandas/tests/groupby/aggregate/test_other.py index 765bc3bab5d4a..487712ddfc5d7 100644 --- a/pandas/tests/groupby/aggregate/test_other.py +++ b/pandas/tests/groupby/aggregate/test_other.py @@ -8,6 +8,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( DataFrame, @@ -19,7 +21,6 @@ period_range, ) from pandas.core.base import SpecificationError -import pandas.util.testing as tm from pandas.io.formats.printing import pprint_thing diff --git a/pandas/tests/groupby/conftest.py b/pandas/tests/groupby/conftest.py index 5b8cc86513954..f9c966681f778 100644 --- a/pandas/tests/groupby/conftest.py +++ b/pandas/tests/groupby/conftest.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex from pandas.core.groupby.base import reduction_kernels, transformation_kernels -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/groupby/test_apply.py b/pandas/tests/groupby/test_apply.py index 050b1e7c5d3b3..6138bfd788d31 100644 --- a/pandas/tests/groupby/test_apply.py +++ b/pandas/tests/groupby/test_apply.py @@ -4,9 +4,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, bdate_range -import pandas.util.testing as tm def test_apply_issues(): diff --git a/pandas/tests/groupby/test_bin_groupby.py b/pandas/tests/groupby/test_bin_groupby.py index fcdf599e4ba33..732afdab628ce 100644 --- a/pandas/tests/groupby/test_bin_groupby.py +++ b/pandas/tests/groupby/test_bin_groupby.py @@ -2,11 +2,11 @@ import pytest from pandas._libs import groupby, lib, reduction as libreduction +import pandas.util._testing as tm from pandas.core.dtypes.common import ensure_int64 from pandas import Index, Series, isna -import pandas.util.testing as tm def test_series_grouper(): diff --git a/pandas/tests/groupby/test_categorical.py b/pandas/tests/groupby/test_categorical.py index 89ffcd9ee313e..1d31bb61011ae 100644 --- a/pandas/tests/groupby/test_categorical.py +++ b/pandas/tests/groupby/test_categorical.py @@ -4,6 +4,7 @@ import pytest from pandas.compat import PY37 +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -15,7 +16,6 @@ Series, qcut, ) -import pandas.util.testing as tm def cartesian_product_for_groupers(result, args, names): diff --git a/pandas/tests/groupby/test_counting.py b/pandas/tests/groupby/test_counting.py index 8e9554085b9ee..e093bba1118e8 100644 --- a/pandas/tests/groupby/test_counting.py +++ b/pandas/tests/groupby/test_counting.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Period, Series, Timedelta, Timestamp -import pandas.util.testing as tm class TestCounting: diff --git a/pandas/tests/groupby/test_filters.py b/pandas/tests/groupby/test_filters.py index b3ee12b6691d7..3e85de738dad8 100644 --- a/pandas/tests/groupby/test_filters.py +++ b/pandas/tests/groupby/test_filters.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp -import pandas.util.testing as tm def test_filter_series(): diff --git a/pandas/tests/groupby/test_groupby.py b/pandas/tests/groupby/test_groupby.py index 242434948fc6f..11428c910a4d4 100644 --- a/pandas/tests/groupby/test_groupby.py +++ b/pandas/tests/groupby/test_groupby.py @@ -6,12 +6,12 @@ import pytest from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range, read_csv from pandas.core.base import SpecificationError import pandas.core.common as com -import pandas.util.testing as tm def test_repr(): diff --git a/pandas/tests/groupby/test_grouping.py b/pandas/tests/groupby/test_grouping.py index f2af397357e4f..447e4890c847d 100644 --- a/pandas/tests/groupby/test_grouping.py +++ b/pandas/tests/groupby/test_grouping.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( CategoricalIndex, @@ -14,7 +16,6 @@ date_range, ) from pandas.core.groupby.grouper import Grouping -import pandas.util.testing as tm # selection # -------------------------------- diff --git a/pandas/tests/groupby/test_index_as_string.py b/pandas/tests/groupby/test_index_as_string.py index f5c8873ff9417..54384a2b69b6b 100644 --- a/pandas/tests/groupby/test_index_as_string.py +++ b/pandas/tests/groupby/test_index_as_string.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm @pytest.fixture(params=[["inner"], ["inner", "outer"]]) diff --git a/pandas/tests/groupby/test_nth.py b/pandas/tests/groupby/test_nth.py index f83b284a35377..a8d96b9b059a5 100644 --- a/pandas/tests/groupby/test_nth.py +++ b/pandas/tests/groupby/test_nth.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, isna -import pandas.util.testing as tm def test_first_last_nth(df): diff --git a/pandas/tests/groupby/test_rank.py b/pandas/tests/groupby/test_rank.py index 8f0df9051fc73..8a8c91e1d7146 100644 --- a/pandas/tests/groupby/test_rank.py +++ b/pandas/tests/groupby/test_rank.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, concat from pandas.core.base import DataError -import pandas.util.testing as tm def test_rank_apply(): diff --git a/pandas/tests/groupby/test_timegrouper.py b/pandas/tests/groupby/test_timegrouper.py index 109382d97440e..7d0e4e7fc42d3 100644 --- a/pandas/tests/groupby/test_timegrouper.py +++ b/pandas/tests/groupby/test_timegrouper.py @@ -7,11 +7,12 @@ import pytest import pytz +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range from pandas.core.groupby.grouper import Grouper from pandas.core.groupby.ops import BinGrouper -import pandas.util.testing as tm class TestGroupBy: diff --git a/pandas/tests/groupby/test_transform.py b/pandas/tests/groupby/test_transform.py index 2a82b39b646c0..ac7b416fa2929 100644 --- a/pandas/tests/groupby/test_transform.py +++ b/pandas/tests/groupby/test_transform.py @@ -5,6 +5,7 @@ import pytest from pandas._libs import groupby +import pandas.util._testing as tm from pandas.core.dtypes.common import ensure_platform_int, is_timedelta64_dtype @@ -19,7 +20,6 @@ date_range, ) from pandas.core.groupby.groupby import DataError -import pandas.util.testing as tm def assert_fp_equal(a, b): diff --git a/pandas/tests/groupby/test_value_counts.py b/pandas/tests/groupby/test_value_counts.py index c76ee09f977b5..3666970dbe9a6 100644 --- a/pandas/tests/groupby/test_value_counts.py +++ b/pandas/tests/groupby/test_value_counts.py @@ -9,8 +9,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Grouper, MultiIndex, Series, date_range, to_datetime -import pandas.util.testing as tm # our starting frame diff --git a/pandas/tests/groupby/test_whitelist.py b/pandas/tests/groupby/test_whitelist.py index 48ea2646c52fc..c722654db9de2 100644 --- a/pandas/tests/groupby/test_whitelist.py +++ b/pandas/tests/groupby/test_whitelist.py @@ -8,13 +8,14 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, Series, date_range from pandas.core.groupby.base import ( groupby_other_methods, reduction_kernels, transformation_kernels, ) -import pandas.util.testing as tm AGG_FUNCTIONS = [ "sum", diff --git a/pandas/tests/indexes/categorical/test_category.py b/pandas/tests/indexes/categorical/test_category.py index 306ac84ef1832..7c546b1f597cf 100644 --- a/pandas/tests/indexes/categorical/test_category.py +++ b/pandas/tests/indexes/categorical/test_category.py @@ -4,13 +4,13 @@ import pandas._config.config as cf from pandas._libs import index as libindex +import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import Categorical, IntervalIndex from pandas.core.indexes.api import CategoricalIndex, Index -import pandas.util.testing as tm from ..common import Base diff --git a/pandas/tests/indexes/categorical/test_constructors.py b/pandas/tests/indexes/categorical/test_constructors.py index f3d580b7215c2..9aa63be398525 100644 --- a/pandas/tests/indexes/categorical/test_constructors.py +++ b/pandas/tests/indexes/categorical/test_constructors.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, CategoricalDtype, CategoricalIndex, Index -import pandas.util.testing as tm class TestCategoricalIndexConstructors: diff --git a/pandas/tests/indexes/common.py b/pandas/tests/indexes/common.py index 68cca473d6bb0..48c8e486d302b 100644 --- a/pandas/tests/indexes/common.py +++ b/pandas/tests/indexes/common.py @@ -5,6 +5,7 @@ import pytest from pandas._libs.tslib import iNaT +import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype @@ -25,7 +26,6 @@ ) from pandas.core.indexes.base import InvalidIndexError from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin -import pandas.util.testing as tm class Base: diff --git a/pandas/tests/indexes/conftest.py b/pandas/tests/indexes/conftest.py index 2a9a8bf8d824f..7c7fa9dec85a5 100644 --- a/pandas/tests/indexes/conftest.py +++ b/pandas/tests/indexes/conftest.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.core.indexes.api import Index, MultiIndex -import pandas.util.testing as tm indices_dict = { "unicode": tm.makeUnicodeIndex(100), diff --git a/pandas/tests/indexes/datetimelike.py b/pandas/tests/indexes/datetimelike.py index 6eedfca129856..77b6347417b52 100644 --- a/pandas/tests/indexes/datetimelike.py +++ b/pandas/tests/indexes/datetimelike.py @@ -2,8 +2,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from .common import Base diff --git a/pandas/tests/indexes/datetimes/test_astype.py b/pandas/tests/indexes/datetimes/test_astype.py index eabf293ae915f..8982941a35676 100644 --- a/pandas/tests/indexes/datetimes/test_astype.py +++ b/pandas/tests/indexes/datetimes/test_astype.py @@ -6,6 +6,8 @@ import pytest import pytz +import pandas.util._testing as tm + import pandas as pd from pandas import ( DatetimeIndex, @@ -17,7 +19,6 @@ Timestamp, date_range, ) -import pandas.util.testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexes/datetimes/test_constructors.py b/pandas/tests/indexes/datetimes/test_constructors.py index 18f8a9ee60167..78d81a5c0fe00 100644 --- a/pandas/tests/indexes/datetimes/test_constructors.py +++ b/pandas/tests/indexes/datetimes/test_constructors.py @@ -8,11 +8,11 @@ import pytz from pandas._libs.tslibs import OutOfBoundsDatetime, conversion +import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Index, Timestamp, date_range, offsets, to_datetime from pandas.core.arrays import DatetimeArray, period_array -import pandas.util.testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexes/datetimes/test_date_range.py b/pandas/tests/indexes/datetimes/test_date_range.py index 36cdaa8a6029b..0c4d4294a1381 100644 --- a/pandas/tests/indexes/datetimes/test_date_range.py +++ b/pandas/tests/indexes/datetimes/test_date_range.py @@ -11,10 +11,10 @@ from pandas.errors import OutOfBoundsDatetime import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Timestamp, bdate_range, date_range, offsets -import pandas.util.testing as tm from pandas.tseries.offsets import ( BDay, diff --git a/pandas/tests/indexes/datetimes/test_datetime.py b/pandas/tests/indexes/datetimes/test_datetime.py index 03b9502be2735..efa71e2330410 100644 --- a/pandas/tests/indexes/datetimes/test_datetime.py +++ b/pandas/tests/indexes/datetimes/test_datetime.py @@ -4,9 +4,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, DatetimeIndex, Index, Timestamp, date_range, offsets -import pandas.util.testing as tm randn = np.random.randn diff --git a/pandas/tests/indexes/datetimes/test_datetimelike.py b/pandas/tests/indexes/datetimes/test_datetimelike.py index 2ff6853b98929..5417c7203d520 100644 --- a/pandas/tests/indexes/datetimes/test_datetimelike.py +++ b/pandas/tests/indexes/datetimes/test_datetimelike.py @@ -1,8 +1,9 @@ """ generic tests from the Datetimelike class """ import pytest +import pandas.util._testing as tm + from pandas import DatetimeIndex, date_range -import pandas.util.testing as tm from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/datetimes/test_formats.py b/pandas/tests/indexes/datetimes/test_formats.py index 33a744cc25ca1..872028d25a5cf 100644 --- a/pandas/tests/indexes/datetimes/test_formats.py +++ b/pandas/tests/indexes/datetimes/test_formats.py @@ -5,9 +5,10 @@ import pytest import pytz +import pandas.util._testing as tm + import pandas as pd from pandas import DatetimeIndex, Series -import pandas.util.testing as tm def test_to_native_types(): diff --git a/pandas/tests/indexes/datetimes/test_indexing.py b/pandas/tests/indexes/datetimes/test_indexing.py index 02ea857550a9b..71b1534c05c38 100644 --- a/pandas/tests/indexes/datetimes/test_indexing.py +++ b/pandas/tests/indexes/datetimes/test_indexing.py @@ -4,9 +4,10 @@ import pytest import pytz +import pandas.util._testing as tm + import pandas as pd from pandas import DatetimeIndex, Index, Timestamp, date_range, notna -import pandas.util.testing as tm from pandas.tseries.offsets import BDay, CDay diff --git a/pandas/tests/indexes/datetimes/test_misc.py b/pandas/tests/indexes/datetimes/test_misc.py index afc3bed85a8d2..f1513b97e8c14 100644 --- a/pandas/tests/indexes/datetimes/test_misc.py +++ b/pandas/tests/indexes/datetimes/test_misc.py @@ -6,9 +6,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DatetimeIndex, Index, Timestamp, date_range, offsets -import pandas.util.testing as tm class TestTimeSeries: diff --git a/pandas/tests/indexes/datetimes/test_missing.py b/pandas/tests/indexes/datetimes/test_missing.py index 6d94319b33b02..42cfc37408eec 100644 --- a/pandas/tests/indexes/datetimes/test_missing.py +++ b/pandas/tests/indexes/datetimes/test_missing.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexes/datetimes/test_ops.py b/pandas/tests/indexes/datetimes/test_ops.py index fb032947143d3..7c07315dc3b5e 100644 --- a/pandas/tests/indexes/datetimes/test_ops.py +++ b/pandas/tests/indexes/datetimes/test_ops.py @@ -4,6 +4,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.generic import ABCDateOffset import pandas as pd @@ -17,7 +19,6 @@ date_range, ) from pandas.tests.base.test_ops import Ops -import pandas.util.testing as tm from pandas.tseries.offsets import BDay, BMonthEnd, CDay, Day, Hour diff --git a/pandas/tests/indexes/datetimes/test_partial_slicing.py b/pandas/tests/indexes/datetimes/test_partial_slicing.py index 8d5aa64a49cf2..c621d987953a0 100644 --- a/pandas/tests/indexes/datetimes/test_partial_slicing.py +++ b/pandas/tests/indexes/datetimes/test_partial_slicing.py @@ -6,6 +6,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( DataFrame, @@ -17,7 +19,6 @@ date_range, ) from pandas.core.indexing import IndexingError -import pandas.util.testing as tm class TestSlicing: diff --git a/pandas/tests/indexes/datetimes/test_scalar_compat.py b/pandas/tests/indexes/datetimes/test_scalar_compat.py index 62383555f6048..dd294762a3a51 100644 --- a/pandas/tests/indexes/datetimes/test_scalar_compat.py +++ b/pandas/tests/indexes/datetimes/test_scalar_compat.py @@ -7,10 +7,10 @@ import pytest from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime +import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Timestamp, date_range -import pandas.util.testing as tm from pandas.tseries.frequencies import to_offset diff --git a/pandas/tests/indexes/datetimes/test_setops.py b/pandas/tests/indexes/datetimes/test_setops.py index 3fb39b2081d83..901c3e4b4e86f 100644 --- a/pandas/tests/indexes/datetimes/test_setops.py +++ b/pandas/tests/indexes/datetimes/test_setops.py @@ -4,6 +4,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -16,7 +17,6 @@ date_range, to_datetime, ) -import pandas.util.testing as tm from pandas.tseries.offsets import BMonthEnd, Minute, MonthEnd diff --git a/pandas/tests/indexes/datetimes/test_shift.py b/pandas/tests/indexes/datetimes/test_shift.py index 6f8315debdfa9..34c277ad2c963 100644 --- a/pandas/tests/indexes/datetimes/test_shift.py +++ b/pandas/tests/indexes/datetimes/test_shift.py @@ -4,10 +4,10 @@ import pytz from pandas.errors import NullFrequencyError +import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Series, date_range -import pandas.util.testing as tm class TestDatetimeIndexShift: diff --git a/pandas/tests/indexes/datetimes/test_timezones.py b/pandas/tests/indexes/datetimes/test_timezones.py index 3f942f9b79428..5c8f0cd92aea9 100644 --- a/pandas/tests/indexes/datetimes/test_timezones.py +++ b/pandas/tests/indexes/datetimes/test_timezones.py @@ -11,6 +11,7 @@ from pandas._libs.tslibs import conversion, timezones import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -22,7 +23,6 @@ isna, to_datetime, ) -import pandas.util.testing as tm class FixedOffset(tzinfo): diff --git a/pandas/tests/indexes/datetimes/test_tools.py b/pandas/tests/indexes/datetimes/test_tools.py index 1aaacfc0949c3..fcd26492ace37 100644 --- a/pandas/tests/indexes/datetimes/test_tools.py +++ b/pandas/tests/indexes/datetimes/test_tools.py @@ -15,6 +15,7 @@ from pandas._libs.tslibs import iNaT, parsing from pandas.errors import OutOfBoundsDatetime import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.common import is_datetime64_ns_dtype @@ -32,7 +33,6 @@ ) from pandas.core.arrays import DatetimeArray from pandas.core.tools import datetimes as tools -import pandas.util.testing as tm class TestTimeConversionFormats: diff --git a/pandas/tests/indexes/interval/test_astype.py b/pandas/tests/indexes/interval/test_astype.py index 708cd8a4579e8..0982230b14de7 100644 --- a/pandas/tests/indexes/interval/test_astype.py +++ b/pandas/tests/indexes/interval/test_astype.py @@ -1,6 +1,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype, IntervalDtype from pandas import ( @@ -12,7 +14,6 @@ Timestamp, interval_range, ) -import pandas.util.testing as tm class Base: diff --git a/pandas/tests/indexes/interval/test_base.py b/pandas/tests/indexes/interval/test_base.py index 339bdaf79c690..0af0567e5542d 100644 --- a/pandas/tests/indexes/interval/test_base.py +++ b/pandas/tests/indexes/interval/test_base.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import IntervalIndex, Series, date_range from pandas.tests.indexes.common import Base -import pandas.util.testing as tm class TestBase(Base): diff --git a/pandas/tests/indexes/interval/test_constructors.py b/pandas/tests/indexes/interval/test_constructors.py index 98c1f7c6c2a8a..b3884824ef93f 100644 --- a/pandas/tests/indexes/interval/test_constructors.py +++ b/pandas/tests/indexes/interval/test_constructors.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_categorical_dtype from pandas.core.dtypes.dtypes import IntervalDtype @@ -21,7 +23,6 @@ ) from pandas.core.arrays import IntervalArray import pandas.core.common as com -import pandas.util.testing as tm @pytest.fixture(params=[None, "foo"]) diff --git a/pandas/tests/indexes/interval/test_formats.py b/pandas/tests/indexes/interval/test_formats.py index dcc0c818182ab..7365fbf232355 100644 --- a/pandas/tests/indexes/interval/test_formats.py +++ b/pandas/tests/indexes/interval/test_formats.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, IntervalIndex, Series, Timedelta, Timestamp -import pandas.util.testing as tm class TestIntervalIndexRendering: diff --git a/pandas/tests/indexes/interval/test_indexing.py b/pandas/tests/indexes/interval/test_indexing.py index 15ea9a6b62c20..e4de6c1d2870d 100644 --- a/pandas/tests/indexes/interval/test_indexing.py +++ b/pandas/tests/indexes/interval/test_indexing.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import ( CategoricalIndex, Interval, @@ -12,7 +14,6 @@ timedelta_range, ) from pandas.core.indexes.base import InvalidIndexError -import pandas.util.testing as tm class TestGetLoc: diff --git a/pandas/tests/indexes/interval/test_interval.py b/pandas/tests/indexes/interval/test_interval.py index 6ad7dfb22f2b3..7d583b8998ed0 100644 --- a/pandas/tests/indexes/interval/test_interval.py +++ b/pandas/tests/indexes/interval/test_interval.py @@ -4,6 +4,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Index, @@ -18,7 +20,6 @@ timedelta_range, ) import pandas.core.common as com -import pandas.util.testing as tm @pytest.fixture(scope="class", params=[None, "foo"]) diff --git a/pandas/tests/indexes/interval/test_interval_range.py b/pandas/tests/indexes/interval/test_interval_range.py index 7891666e6cdba..f0c1af3595793 100644 --- a/pandas/tests/indexes/interval/test_interval_range.py +++ b/pandas/tests/indexes/interval/test_interval_range.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_integer from pandas import ( @@ -15,7 +17,6 @@ interval_range, timedelta_range, ) -import pandas.util.testing as tm from pandas.tseries.offsets import Day diff --git a/pandas/tests/indexes/interval/test_interval_tree.py b/pandas/tests/indexes/interval/test_interval_tree.py index 0a92192ee6a0f..8d527ac6b51ce 100644 --- a/pandas/tests/indexes/interval/test_interval_tree.py +++ b/pandas/tests/indexes/interval/test_interval_tree.py @@ -4,9 +4,9 @@ import pytest from pandas._libs.interval import IntervalTree +import pandas.util._testing as tm from pandas import compat -import pandas.util.testing as tm def skipif_32bit(param): diff --git a/pandas/tests/indexes/interval/test_setops.py b/pandas/tests/indexes/interval/test_setops.py index 89e733c30b1e3..ca028fb475c8d 100644 --- a/pandas/tests/indexes/interval/test_setops.py +++ b/pandas/tests/indexes/interval/test_setops.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Index, IntervalIndex, Timestamp, interval_range -import pandas.util.testing as tm @pytest.fixture(scope="class", params=[None, "foo"]) diff --git a/pandas/tests/indexes/multi/test_analytics.py b/pandas/tests/indexes/multi/test_analytics.py index a6d08c845d941..0dbc9f6fb10ab 100644 --- a/pandas/tests/indexes/multi/test_analytics.py +++ b/pandas/tests/indexes/multi/test_analytics.py @@ -2,10 +2,10 @@ import pytest from pandas.compat.numpy import _np_version_under1p17 +import pandas.util._testing as tm import pandas as pd from pandas import Index, MultiIndex, date_range, period_range -import pandas.util.testing as tm def test_shift(idx): diff --git a/pandas/tests/indexes/multi/test_astype.py b/pandas/tests/indexes/multi/test_astype.py index 93fdeb10b849a..5c9668d0e137a 100644 --- a/pandas/tests/indexes/multi/test_astype.py +++ b/pandas/tests/indexes/multi/test_astype.py @@ -1,9 +1,9 @@ import numpy as np import pytest -from pandas.core.dtypes.dtypes import CategoricalDtype +import pandas.util._testing as tm -import pandas.util.testing as tm +from pandas.core.dtypes.dtypes import CategoricalDtype def test_astype(idx): diff --git a/pandas/tests/indexes/multi/test_compat.py b/pandas/tests/indexes/multi/test_compat.py index b02f87dc4aacb..1340ff21e0d17 100644 --- a/pandas/tests/indexes/multi/test_compat.py +++ b/pandas/tests/indexes/multi/test_compat.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import MultiIndex -import pandas.util.testing as tm def test_numeric_compat(idx): diff --git a/pandas/tests/indexes/multi/test_constructors.py b/pandas/tests/indexes/multi/test_constructors.py index 0e4d144c0fd34..6fd2fb3881882 100644 --- a/pandas/tests/indexes/multi/test_constructors.py +++ b/pandas/tests/indexes/multi/test_constructors.py @@ -2,12 +2,12 @@ import pytest from pandas._libs.tslib import Timestamp +import pandas.util._testing as tm from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike import pandas as pd from pandas import Index, MultiIndex, date_range -import pandas.util.testing as tm def test_constructor_single_level(): diff --git a/pandas/tests/indexes/multi/test_contains.py b/pandas/tests/indexes/multi/test_contains.py index 64d2859cd13db..42c7f166f4a68 100644 --- a/pandas/tests/indexes/multi/test_contains.py +++ b/pandas/tests/indexes/multi/test_contains.py @@ -2,10 +2,10 @@ import pytest from pandas.compat import PYPY +import pandas.util._testing as tm import pandas as pd from pandas import MultiIndex -import pandas.util.testing as tm def test_contains_top_level(): diff --git a/pandas/tests/indexes/multi/test_conversion.py b/pandas/tests/indexes/multi/test_conversion.py index fab4f72dc153b..4b9be4d55d8ff 100644 --- a/pandas/tests/indexes/multi/test_conversion.py +++ b/pandas/tests/indexes/multi/test_conversion.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, date_range -import pandas.util.testing as tm def test_tolist(idx): diff --git a/pandas/tests/indexes/multi/test_copy.py b/pandas/tests/indexes/multi/test_copy.py index 12cd0db6936f5..5ef29af72c587 100644 --- a/pandas/tests/indexes/multi/test_copy.py +++ b/pandas/tests/indexes/multi/test_copy.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + from pandas import MultiIndex -import pandas.util.testing as tm def assert_multiindex_copied(copy, original): diff --git a/pandas/tests/indexes/multi/test_drop.py b/pandas/tests/indexes/multi/test_drop.py index 364420a292ed5..c323f0e8af9e2 100644 --- a/pandas/tests/indexes/multi/test_drop.py +++ b/pandas/tests/indexes/multi/test_drop.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import Index, MultiIndex -import pandas.util.testing as tm def test_drop(idx): diff --git a/pandas/tests/indexes/multi/test_duplicates.py b/pandas/tests/indexes/multi/test_duplicates.py index ee1f068b92df1..0d1ee0f54f0e2 100644 --- a/pandas/tests/indexes/multi/test_duplicates.py +++ b/pandas/tests/indexes/multi/test_duplicates.py @@ -4,9 +4,9 @@ import pytest from pandas._libs import hashtable +import pandas.util._testing as tm from pandas import DatetimeIndex, MultiIndex -import pandas.util.testing as tm @pytest.mark.parametrize("names", [None, ["first", "second"]]) diff --git a/pandas/tests/indexes/multi/test_equivalence.py b/pandas/tests/indexes/multi/test_equivalence.py index c81af5a0c6c49..e57fd4c6cadbb 100644 --- a/pandas/tests/indexes/multi/test_equivalence.py +++ b/pandas/tests/indexes/multi/test_equivalence.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, MultiIndex, Series -import pandas.util.testing as tm def test_equals(idx): diff --git a/pandas/tests/indexes/multi/test_format.py b/pandas/tests/indexes/multi/test_format.py index 3a8063aed8d20..279e1395508d9 100644 --- a/pandas/tests/indexes/multi/test_format.py +++ b/pandas/tests/indexes/multi/test_format.py @@ -2,9 +2,10 @@ import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import MultiIndex -import pandas.util.testing as tm def test_format(idx): diff --git a/pandas/tests/indexes/multi/test_get_set.py b/pandas/tests/indexes/multi/test_get_set.py index ec3c654ecb1ed..7ebd3df1164b3 100644 --- a/pandas/tests/indexes/multi/test_get_set.py +++ b/pandas/tests/indexes/multi/test_get_set.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import CategoricalIndex, Index, MultiIndex -import pandas.util.testing as tm def assert_matching(actual, expected, check_dtype=False): diff --git a/pandas/tests/indexes/multi/test_indexing.py b/pandas/tests/indexes/multi/test_indexing.py index 9ef2a77205acc..73cef18571ebc 100644 --- a/pandas/tests/indexes/multi/test_indexing.py +++ b/pandas/tests/indexes/multi/test_indexing.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -13,7 +15,6 @@ date_range, ) from pandas.core.indexes.base import InvalidIndexError -import pandas.util.testing as tm def test_slice_locs_partial(idx): diff --git a/pandas/tests/indexes/multi/test_integrity.py b/pandas/tests/indexes/multi/test_integrity.py index a8711533e806c..f0d46f3980e75 100644 --- a/pandas/tests/indexes/multi/test_integrity.py +++ b/pandas/tests/indexes/multi/test_integrity.py @@ -3,11 +3,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike import pandas as pd from pandas import IntervalIndex, MultiIndex, RangeIndex -import pandas.util.testing as tm def test_labels_dtypes(): diff --git a/pandas/tests/indexes/multi/test_join.py b/pandas/tests/indexes/multi/test_join.py index 31ab521958342..aac57dab2799d 100644 --- a/pandas/tests/indexes/multi/test_join.py +++ b/pandas/tests/indexes/multi/test_join.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, MultiIndex -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/indexes/multi/test_missing.py b/pandas/tests/indexes/multi/test_missing.py index f053f690e1018..2e6a021065ba2 100644 --- a/pandas/tests/indexes/multi/test_missing.py +++ b/pandas/tests/indexes/multi/test_missing.py @@ -2,11 +2,11 @@ import pytest from pandas._libs.tslib import iNaT +import pandas.util._testing as tm import pandas as pd from pandas import Int64Index, MultiIndex, PeriodIndex, UInt64Index from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin -import pandas.util.testing as tm def test_fillna(idx): diff --git a/pandas/tests/indexes/multi/test_names.py b/pandas/tests/indexes/multi/test_names.py index 5c3a48c9dd481..12cc7c668b974 100644 --- a/pandas/tests/indexes/multi/test_names.py +++ b/pandas/tests/indexes/multi/test_names.py @@ -1,8 +1,9 @@ import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import MultiIndex -import pandas.util.testing as tm def check_level_names(index, names): diff --git a/pandas/tests/indexes/multi/test_partial_indexing.py b/pandas/tests/indexes/multi/test_partial_indexing.py index 5db1296d828ca..be0e837746d0d 100644 --- a/pandas/tests/indexes/multi/test_partial_indexing.py +++ b/pandas/tests/indexes/multi/test_partial_indexing.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, date_range -import pandas.util.testing as tm def test_partial_string_timestamp_multiindex(): diff --git a/pandas/tests/indexes/multi/test_reindex.py b/pandas/tests/indexes/multi/test_reindex.py index 513efa8941de8..e2dd6cb6449f3 100644 --- a/pandas/tests/indexes/multi/test_reindex.py +++ b/pandas/tests/indexes/multi/test_reindex.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, MultiIndex -import pandas.util.testing as tm def test_reindex(idx): diff --git a/pandas/tests/indexes/multi/test_reshape.py b/pandas/tests/indexes/multi/test_reshape.py index 37df420e9ea2e..a4563db010a5c 100644 --- a/pandas/tests/indexes/multi/test_reshape.py +++ b/pandas/tests/indexes/multi/test_reshape.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, MultiIndex -import pandas.util.testing as tm def test_insert(idx): diff --git a/pandas/tests/indexes/multi/test_setops.py b/pandas/tests/indexes/multi/test_setops.py index 835784054261e..c23b33323a324 100644 --- a/pandas/tests/indexes/multi/test_setops.py +++ b/pandas/tests/indexes/multi/test_setops.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import MultiIndex, Series -import pandas.util.testing as tm @pytest.mark.parametrize("case", [0.5, "xxx"]) diff --git a/pandas/tests/indexes/multi/test_sorting.py b/pandas/tests/indexes/multi/test_sorting.py index 3dee1dbecf3ba..fcf88983c37eb 100644 --- a/pandas/tests/indexes/multi/test_sorting.py +++ b/pandas/tests/indexes/multi/test_sorting.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import PerformanceWarning, UnsortedIndexError +import pandas.util._testing as tm import pandas as pd from pandas import CategoricalIndex, DataFrame, Index, MultiIndex, RangeIndex -import pandas.util.testing as tm def test_sortlevel(idx): diff --git a/pandas/tests/indexes/period/test_asfreq.py b/pandas/tests/indexes/period/test_asfreq.py index fd6013ab5ae08..7fa2fb11b9e64 100644 --- a/pandas/tests/indexes/period/test_asfreq.py +++ b/pandas/tests/indexes/period/test_asfreq.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, PeriodIndex, Series, period_range -import pandas.util.testing as tm class TestPeriodIndex: diff --git a/pandas/tests/indexes/period/test_astype.py b/pandas/tests/indexes/period/test_astype.py index fa57ec2b1f7ca..d79bd7cada386 100644 --- a/pandas/tests/indexes/period/test_astype.py +++ b/pandas/tests/indexes/period/test_astype.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, Int64Index, NaT, Period, PeriodIndex, period_range -import pandas.util.testing as tm class TestPeriodIndexAsType: diff --git a/pandas/tests/indexes/period/test_constructors.py b/pandas/tests/indexes/period/test_constructors.py index 2adce0b7f8b44..877e7fe954d0d 100644 --- a/pandas/tests/indexes/period/test_constructors.py +++ b/pandas/tests/indexes/period/test_constructors.py @@ -2,13 +2,13 @@ import pytest from pandas._libs.tslibs.period import IncompatibleFrequency +import pandas.util._testing as tm from pandas.core.dtypes.dtypes import PeriodDtype import pandas as pd from pandas import Index, Period, PeriodIndex, Series, date_range, offsets, period_range import pandas.core.indexes.period as period -import pandas.util.testing as tm class TestPeriodIndex: diff --git a/pandas/tests/indexes/period/test_formats.py b/pandas/tests/indexes/period/test_formats.py index 2a88b79f381c4..f708612b0af0a 100644 --- a/pandas/tests/indexes/period/test_formats.py +++ b/pandas/tests/indexes/period/test_formats.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import PeriodIndex -import pandas.util.testing as tm def test_to_native_types(): diff --git a/pandas/tests/indexes/period/test_indexing.py b/pandas/tests/indexes/period/test_indexing.py index e17f0af24760c..27e1e24668270 100644 --- a/pandas/tests/indexes/period/test_indexing.py +++ b/pandas/tests/indexes/period/test_indexing.py @@ -4,10 +4,10 @@ import pytest from pandas._libs.tslibs import period as libperiod +import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Period, PeriodIndex, Series, notna, period_range -import pandas.util.testing as tm class TestGetItem: diff --git a/pandas/tests/indexes/period/test_ops.py b/pandas/tests/indexes/period/test_ops.py index 962e674fa607f..7fdf42c45be2f 100644 --- a/pandas/tests/indexes/period/test_ops.py +++ b/pandas/tests/indexes/period/test_ops.py @@ -1,11 +1,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DatetimeIndex, Index, NaT, PeriodIndex, Series from pandas.core.arrays import PeriodArray from pandas.tests.base.test_ops import Ops -import pandas.util.testing as tm class TestPeriodIndexOps(Ops): diff --git a/pandas/tests/indexes/period/test_partial_slicing.py b/pandas/tests/indexes/period/test_partial_slicing.py index 501c2a4d8edcc..b03e3f35fd00b 100644 --- a/pandas/tests/indexes/period/test_partial_slicing.py +++ b/pandas/tests/indexes/period/test_partial_slicing.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Period, Series, period_range -import pandas.util.testing as tm class TestPeriodIndex: diff --git a/pandas/tests/indexes/period/test_period.py b/pandas/tests/indexes/period/test_period.py index da2f04d45fdac..0c8b785252edb 100644 --- a/pandas/tests/indexes/period/test_period.py +++ b/pandas/tests/indexes/period/test_period.py @@ -3,6 +3,7 @@ from pandas._libs.tslibs.period import IncompatibleFrequency import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -17,7 +18,6 @@ offsets, period_range, ) -import pandas.util.testing as tm from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 828fab08daceb..875c6c2f8171a 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + from pandas import NaT, Period, PeriodIndex, date_range, period_range -import pandas.util.testing as tm class TestPeriodRange: diff --git a/pandas/tests/indexes/period/test_scalar_compat.py b/pandas/tests/indexes/period/test_scalar_compat.py index 7956b9f26e6ef..b680ce7162d60 100644 --- a/pandas/tests/indexes/period/test_scalar_compat.py +++ b/pandas/tests/indexes/period/test_scalar_compat.py @@ -1,7 +1,8 @@ """Tests for PeriodIndex behaving like a vectorized Period scalar""" +import pandas.util._testing as tm + from pandas import Timedelta, date_range, period_range -import pandas.util.testing as tm class TestPeriodIndexOps: diff --git a/pandas/tests/indexes/period/test_setops.py b/pandas/tests/indexes/period/test_setops.py index 173d61849b126..6affad5fbbb3b 100644 --- a/pandas/tests/indexes/period/test_setops.py +++ b/pandas/tests/indexes/period/test_setops.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, PeriodIndex, date_range, period_range import pandas.core.indexes.period as period -import pandas.util.testing as tm def _permute(obj): diff --git a/pandas/tests/indexes/period/test_shift.py b/pandas/tests/indexes/period/test_shift.py index 7543f85c6d138..927f23160b28b 100644 --- a/pandas/tests/indexes/period/test_shift.py +++ b/pandas/tests/indexes/period/test_shift.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import PeriodIndex, period_range -import pandas.util.testing as tm class TestPeriodIndexShift: diff --git a/pandas/tests/indexes/period/test_tools.py b/pandas/tests/indexes/period/test_tools.py index a9c0ecd1a3041..159b707b1958d 100644 --- a/pandas/tests/indexes/period/test_tools.py +++ b/pandas/tests/indexes/period/test_tools.py @@ -4,6 +4,7 @@ import pytest from pandas._libs.tslibs.ccalendar import MONTHS +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -18,7 +19,6 @@ to_datetime, ) import pandas.core.indexes.period as period -import pandas.util.testing as tm class TestPeriodRepresentation: diff --git a/pandas/tests/indexes/ranges/test_constructors.py b/pandas/tests/indexes/ranges/test_constructors.py index 5067b6c74871b..02343cdefa6c0 100644 --- a/pandas/tests/indexes/ranges/test_constructors.py +++ b/pandas/tests/indexes/ranges/test_constructors.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Index, RangeIndex, Series -import pandas.util.testing as tm class TestRangeIndexConstructors: diff --git a/pandas/tests/indexes/ranges/test_range.py b/pandas/tests/indexes/ranges/test_range.py index f7abdf53e0975..d13b648d4ea8a 100644 --- a/pandas/tests/indexes/ranges/test_range.py +++ b/pandas/tests/indexes/ranges/test_range.py @@ -1,11 +1,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import ensure_platform_int import pandas as pd from pandas import Float64Index, Index, Int64Index, RangeIndex -import pandas.util.testing as tm from ..test_numeric import Numeric diff --git a/pandas/tests/indexes/ranges/test_setops.py b/pandas/tests/indexes/ranges/test_setops.py index 5c1e461c9fcf0..a5bb4212a5fcb 100644 --- a/pandas/tests/indexes/ranges/test_setops.py +++ b/pandas/tests/indexes/ranges/test_setops.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Index, Int64Index, RangeIndex -import pandas.util.testing as tm class TestRangeIndexSetOps: diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py index 6ec35a32d74ce..a675585e58127 100644 --- a/pandas/tests/indexes/test_base.py +++ b/pandas/tests/indexes/test_base.py @@ -12,6 +12,7 @@ from pandas._libs.tslib import Timestamp from pandas.compat.numpy import np_datetime64_compat +import pandas.util._testing as tm from pandas.core.dtypes.common import is_unsigned_integer_dtype from pandas.core.dtypes.generic import ABCIndex @@ -42,7 +43,6 @@ ) from pandas.tests.indexes.common import Base from pandas.tests.indexes.conftest import indices_dict -import pandas.util.testing as tm class TestIndex(Base): diff --git a/pandas/tests/indexes/test_common.py b/pandas/tests/indexes/test_common.py index 82ef71efa70d0..4a2c9a0ecd75a 100644 --- a/pandas/tests/indexes/test_common.py +++ b/pandas/tests/indexes/test_common.py @@ -9,12 +9,12 @@ import pytest from pandas._libs.tslibs import iNaT +import pandas.util._testing as tm from pandas.core.dtypes.common import needs_i8_conversion import pandas as pd from pandas import CategoricalIndex, MultiIndex, RangeIndex -import pandas.util.testing as tm class TestCommon: diff --git a/pandas/tests/indexes/test_numeric.py b/pandas/tests/indexes/test_numeric.py index 7187733fc91c3..fa52e388b5746 100644 --- a/pandas/tests/indexes/test_numeric.py +++ b/pandas/tests/indexes/test_numeric.py @@ -5,12 +5,12 @@ import pytest from pandas._libs.tslibs import Timestamp +import pandas.util._testing as tm import pandas as pd from pandas import Float64Index, Index, Int64Index, Series, UInt64Index from pandas.api.types import pandas_dtype from pandas.tests.indexes.common import Base -import pandas.util.testing as tm class Numeric(Base): diff --git a/pandas/tests/indexes/test_numpy_compat.py b/pandas/tests/indexes/test_numpy_compat.py index 3d24c70afdda2..9cbaeb89cf45f 100644 --- a/pandas/tests/indexes/test_numpy_compat.py +++ b/pandas/tests/indexes/test_numpy_compat.py @@ -1,6 +1,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import ( DatetimeIndex, Float64Index, @@ -13,7 +15,6 @@ _np_version_under1p18, ) from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/indexes/test_setops.py b/pandas/tests/indexes/test_setops.py index a7e2363ec422e..ae74b62e71474 100644 --- a/pandas/tests/indexes/test_setops.py +++ b/pandas/tests/indexes/test_setops.py @@ -7,13 +7,14 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_dtype_equal import pandas as pd from pandas import Float64Index, Int64Index, RangeIndex, UInt64Index from pandas.api.types import pandas_dtype from pandas.tests.indexes.conftest import indices_dict -import pandas.util.testing as tm COMPATIBLE_INCONSISTENT_PAIRS = { (Int64Index, RangeIndex): (tm.makeIntIndex, tm.makeRangeIndex), diff --git a/pandas/tests/indexes/timedeltas/test_astype.py b/pandas/tests/indexes/timedeltas/test_astype.py index e479d93af2902..3c9b43da68bf9 100644 --- a/pandas/tests/indexes/timedeltas/test_astype.py +++ b/pandas/tests/indexes/timedeltas/test_astype.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Float64Index, @@ -13,7 +15,6 @@ TimedeltaIndex, timedelta_range, ) -import pandas.util.testing as tm class TestTimedeltaIndex: diff --git a/pandas/tests/indexes/timedeltas/test_constructors.py b/pandas/tests/indexes/timedeltas/test_constructors.py index ff6ee051755bb..720dbb0de5b6a 100644 --- a/pandas/tests/indexes/timedeltas/test_constructors.py +++ b/pandas/tests/indexes/timedeltas/test_constructors.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Timedelta, TimedeltaIndex, timedelta_range, to_timedelta from pandas.core.arrays import TimedeltaArray -import pandas.util.testing as tm class TestTimedeltaIndex: diff --git a/pandas/tests/indexes/timedeltas/test_indexing.py b/pandas/tests/indexes/timedeltas/test_indexing.py index 17ab85033acfb..7f47ec25f69ce 100644 --- a/pandas/tests/indexes/timedeltas/test_indexing.py +++ b/pandas/tests/indexes/timedeltas/test_indexing.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, Timedelta, TimedeltaIndex, timedelta_range -import pandas.util.testing as tm class TestGetItem: diff --git a/pandas/tests/indexes/timedeltas/test_ops.py b/pandas/tests/indexes/timedeltas/test_ops.py index 56043cf3edb2d..bc9a01d114a95 100644 --- a/pandas/tests/indexes/timedeltas/test_ops.py +++ b/pandas/tests/indexes/timedeltas/test_ops.py @@ -3,12 +3,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.generic import ABCDateOffset import pandas as pd from pandas import Series, TimedeltaIndex, timedelta_range from pandas.tests.base.test_ops import Ops -import pandas.util.testing as tm from pandas.tseries.offsets import Day, Hour diff --git a/pandas/tests/indexes/timedeltas/test_partial_slicing.py b/pandas/tests/indexes/timedeltas/test_partial_slicing.py index 4448b5e39684b..ab534ef4fa1a1 100644 --- a/pandas/tests/indexes/timedeltas/test_partial_slicing.py +++ b/pandas/tests/indexes/timedeltas/test_partial_slicing.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series, Timedelta, timedelta_range -import pandas.util.testing as tm class TestSlicing: diff --git a/pandas/tests/indexes/timedeltas/test_scalar_compat.py b/pandas/tests/indexes/timedeltas/test_scalar_compat.py index 38f1d2c7d4a1b..3ef04819d940a 100644 --- a/pandas/tests/indexes/timedeltas/test_scalar_compat.py +++ b/pandas/tests/indexes/timedeltas/test_scalar_compat.py @@ -5,9 +5,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Index, Series, Timedelta, TimedeltaIndex, timedelta_range -import pandas.util.testing as tm class TestVectorizedTimedelta: diff --git a/pandas/tests/indexes/timedeltas/test_setops.py b/pandas/tests/indexes/timedeltas/test_setops.py index 34db7ed419ddb..03519626531f7 100644 --- a/pandas/tests/indexes/timedeltas/test_setops.py +++ b/pandas/tests/indexes/timedeltas/test_setops.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Int64Index, TimedeltaIndex, timedelta_range -import pandas.util.testing as tm from pandas.tseries.offsets import Hour diff --git a/pandas/tests/indexes/timedeltas/test_shift.py b/pandas/tests/indexes/timedeltas/test_shift.py index 048b29c0da501..39617a9704332 100644 --- a/pandas/tests/indexes/timedeltas/test_shift.py +++ b/pandas/tests/indexes/timedeltas/test_shift.py @@ -1,10 +1,10 @@ import pytest from pandas.errors import NullFrequencyError +import pandas.util._testing as tm import pandas as pd from pandas import TimedeltaIndex -import pandas.util.testing as tm class TestTimedeltaIndexShift: diff --git a/pandas/tests/indexes/timedeltas/test_timedelta.py b/pandas/tests/indexes/timedeltas/test_timedelta.py index fa74ff2d30368..0ea49736d0ae0 100644 --- a/pandas/tests/indexes/timedeltas/test_timedelta.py +++ b/pandas/tests/indexes/timedeltas/test_timedelta.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( DataFrame, @@ -14,7 +16,6 @@ date_range, timedelta_range, ) -import pandas.util.testing as tm from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/timedeltas/test_timedelta_range.py b/pandas/tests/indexes/timedeltas/test_timedelta_range.py index 1c1d0f1a735cf..4a0048c47029c 100644 --- a/pandas/tests/indexes/timedeltas/test_timedelta_range.py +++ b/pandas/tests/indexes/timedeltas/test_timedelta_range.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import timedelta_range, to_timedelta -import pandas.util.testing as tm from pandas.tseries.offsets import Day, Second diff --git a/pandas/tests/indexes/timedeltas/test_tools.py b/pandas/tests/indexes/timedeltas/test_tools.py index 5bd7a2a583b84..8ae472282c3ce 100644 --- a/pandas/tests/indexes/timedeltas/test_tools.py +++ b/pandas/tests/indexes/timedeltas/test_tools.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series, TimedeltaIndex, isna, to_timedelta -import pandas.util.testing as tm class TestTimedeltas: diff --git a/pandas/tests/indexing/common.py b/pandas/tests/indexing/common.py index 08e8dbad4e102..54578ebab3aad 100644 --- a/pandas/tests/indexing/common.py +++ b/pandas/tests/indexing/common.py @@ -4,10 +4,11 @@ import numpy as np +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_scalar from pandas import DataFrame, Float64Index, MultiIndex, Series, UInt64Index, date_range -import pandas.util.testing as tm def _mklbl(prefix, n): diff --git a/pandas/tests/indexing/interval/test_interval.py b/pandas/tests/indexing/interval/test_interval.py index 5d23236207f94..f99e982aebaa0 100644 --- a/pandas/tests/indexing/interval/test_interval.py +++ b/pandas/tests/indexing/interval/test_interval.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, IntervalIndex, Series -import pandas.util.testing as tm class TestIntervalIndex: diff --git a/pandas/tests/indexing/interval/test_interval_new.py b/pandas/tests/indexing/interval/test_interval_new.py index a86a9d16d3f9f..5a4d8e4a43042 100644 --- a/pandas/tests/indexing/interval/test_interval_new.py +++ b/pandas/tests/indexing/interval/test_interval_new.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Interval, IntervalIndex, Series -import pandas.util.testing as tm class TestIntervalIndex: diff --git a/pandas/tests/indexing/multiindex/conftest.py b/pandas/tests/indexing/multiindex/conftest.py index e58e6ed0d5d83..d72ada6339548 100644 --- a/pandas/tests/indexing/multiindex/conftest.py +++ b/pandas/tests/indexing/multiindex/conftest.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py index e0206c8e7f6aa..d71a04dcfa3db 100644 --- a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py +++ b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series import pandas.core.common as com -import pandas.util.testing as tm def test_detect_chained_assignment(): diff --git a/pandas/tests/indexing/multiindex/test_getitem.py b/pandas/tests/indexing/multiindex/test_getitem.py index 519a1eb5b16d8..83c72baafd7f1 100644 --- a/pandas/tests/indexing/multiindex/test_getitem.py +++ b/pandas/tests/indexing/multiindex/test_getitem.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, Series from pandas.core.indexing import IndexingError -import pandas.util.testing as tm # ---------------------------------------------------------------------------- # test indexing of Series with multi-level Index diff --git a/pandas/tests/indexing/multiindex/test_iloc.py b/pandas/tests/indexing/multiindex/test_iloc.py index 2c2e4d06f1ae3..96502aa7498db 100644 --- a/pandas/tests/indexing/multiindex/test_iloc.py +++ b/pandas/tests/indexing/multiindex/test_iloc.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/indexing/multiindex/test_indexing_slow.py b/pandas/tests/indexing/multiindex/test_indexing_slow.py index aab44daf8d17f..5432846b8f6ed 100644 --- a/pandas/tests/indexing/multiindex/test_indexing_slow.py +++ b/pandas/tests/indexing/multiindex/test_indexing_slow.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, Series -import pandas.util.testing as tm @pytest.mark.slow diff --git a/pandas/tests/indexing/multiindex/test_ix.py b/pandas/tests/indexing/multiindex/test_ix.py index 35f3137dac059..da8441bb05c3d 100644 --- a/pandas/tests/indexing/multiindex/test_ix.py +++ b/pandas/tests/indexing/multiindex/test_ix.py @@ -2,9 +2,9 @@ import pytest from pandas.errors import PerformanceWarning +import pandas.util._testing as tm from pandas import DataFrame, MultiIndex -import pandas.util.testing as tm class TestMultiIndex: diff --git a/pandas/tests/indexing/multiindex/test_loc.py b/pandas/tests/indexing/multiindex/test_loc.py index da7d89a15125b..ef65c1222beaa 100644 --- a/pandas/tests/indexing/multiindex/test_loc.py +++ b/pandas/tests/indexing/multiindex/test_loc.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series from pandas.core.indexing import IndexingError -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/indexing/multiindex/test_multiindex.py b/pandas/tests/indexing/multiindex/test_multiindex.py index 8c6afef1234da..780a8c3a2387a 100644 --- a/pandas/tests/indexing/multiindex/test_multiindex.py +++ b/pandas/tests/indexing/multiindex/test_multiindex.py @@ -3,10 +3,10 @@ import pandas._libs.index as _index from pandas.errors import PerformanceWarning +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series -import pandas.util.testing as tm class TestMultiIndexBasic: diff --git a/pandas/tests/indexing/multiindex/test_partial.py b/pandas/tests/indexing/multiindex/test_partial.py index 05ea949721b65..f04ab0cab746f 100644 --- a/pandas/tests/indexing/multiindex/test_partial.py +++ b/pandas/tests/indexing/multiindex/test_partial.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex -import pandas.util.testing as tm class TestMultiIndexPartial: diff --git a/pandas/tests/indexing/multiindex/test_set_ops.py b/pandas/tests/indexing/multiindex/test_set_ops.py index 66cb0d0d46380..d7d46503edd4b 100644 --- a/pandas/tests/indexing/multiindex/test_set_ops.py +++ b/pandas/tests/indexing/multiindex/test_set_ops.py @@ -1,7 +1,8 @@ from numpy.random import randn +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series -import pandas.util.testing as tm class TestMultiIndexSetOps: diff --git a/pandas/tests/indexing/multiindex/test_setitem.py b/pandas/tests/indexing/multiindex/test_setitem.py index 7fc95ba62a888..2d17e31149b89 100644 --- a/pandas/tests/indexing/multiindex/test_setitem.py +++ b/pandas/tests/indexing/multiindex/test_setitem.py @@ -2,10 +2,11 @@ from numpy.random import randn import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range, isna, notna import pandas.core.common as com -import pandas.util.testing as tm class TestMultiIndexSetItem: diff --git a/pandas/tests/indexing/multiindex/test_slice.py b/pandas/tests/indexing/multiindex/test_slice.py index ee0f160b33cf1..b93fcf22cbb42 100644 --- a/pandas/tests/indexing/multiindex/test_slice.py +++ b/pandas/tests/indexing/multiindex/test_slice.py @@ -2,12 +2,12 @@ import pytest from pandas.errors import UnsortedIndexError +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp from pandas.core.indexing import _non_reducing_slice from pandas.tests.indexing.common import _mklbl -import pandas.util.testing as tm class TestMultiIndexSlicers: diff --git a/pandas/tests/indexing/multiindex/test_sorted.py b/pandas/tests/indexing/multiindex/test_sorted.py index 5b8300827609a..f649d20c42f4b 100644 --- a/pandas/tests/indexing/multiindex/test_sorted.py +++ b/pandas/tests/indexing/multiindex/test_sorted.py @@ -1,8 +1,9 @@ import numpy as np from numpy.random import randn +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series -import pandas.util.testing as tm class TestMultiIndexSorted: diff --git a/pandas/tests/indexing/multiindex/test_xs.py b/pandas/tests/indexing/multiindex/test_xs.py index ffbe1bb785cda..46b762dbd4daf 100644 --- a/pandas/tests/indexing/multiindex/test_xs.py +++ b/pandas/tests/indexing/multiindex/test_xs.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, Series, concat, date_range import pandas.core.common as com -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/indexing/test_callable.py b/pandas/tests/indexing/test_callable.py index 81dedfdc74409..995f9f0bb64ee 100644 --- a/pandas/tests/indexing/test_callable.py +++ b/pandas/tests/indexing/test_callable.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestIndexingCallable: diff --git a/pandas/tests/indexing/test_categorical.py b/pandas/tests/indexing/test_categorical.py index 40fd6575abf44..2c4cbd404599c 100644 --- a/pandas/tests/indexing/test_categorical.py +++ b/pandas/tests/indexing/test_categorical.py @@ -1,6 +1,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_categorical_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -17,7 +19,6 @@ conftest, ) from pandas.api.types import CategoricalDtype as CDT -import pandas.util.testing as tm class TestCategoricalIndex: diff --git a/pandas/tests/indexing/test_chaining_and_caching.py b/pandas/tests/indexing/test_chaining_and_caching.py index 760bb655534b2..3969d8840e20d 100644 --- a/pandas/tests/indexing/test_chaining_and_caching.py +++ b/pandas/tests/indexing/test_chaining_and_caching.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range, option_context import pandas.core.common as com -import pandas.util.testing as tm class TestCaching: diff --git a/pandas/tests/indexing/test_coercion.py b/pandas/tests/indexing/test_coercion.py index 256aaef8eb5a7..579ffeef88e32 100644 --- a/pandas/tests/indexing/test_coercion.py +++ b/pandas/tests/indexing/test_coercion.py @@ -5,9 +5,9 @@ import pytest import pandas.compat as compat +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm ############################################################### # Index / Series common tests which may trigger dtype coercions diff --git a/pandas/tests/indexing/test_datetime.py b/pandas/tests/indexing/test_datetime.py index f2e3f7f6b3723..9c3a863f78bdc 100644 --- a/pandas/tests/indexing/test_datetime.py +++ b/pandas/tests/indexing/test_datetime.py @@ -4,9 +4,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, date_range -import pandas.util.testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexing/test_floats.py b/pandas/tests/indexing/test_floats.py index 52d0e30f0bcad..c12c9c4bcd6a8 100644 --- a/pandas/tests/indexing/test_floats.py +++ b/pandas/tests/indexing/test_floats.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Float64Index, Index, Int64Index, RangeIndex, Series -import pandas.util.testing as tm class TestFloatIndexers: diff --git a/pandas/tests/indexing/test_iloc.py b/pandas/tests/indexing/test_iloc.py index d4731bcdc5b46..284482e067fc4 100644 --- a/pandas/tests/indexing/test_iloc.py +++ b/pandas/tests/indexing/test_iloc.py @@ -6,12 +6,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, concat, date_range, isna from pandas.api.types import is_scalar from pandas.core.indexing import IndexingError from pandas.tests.indexing.common import Base -import pandas.util.testing as tm class TestiLoc(Base): diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index ea003a72490f9..cf86ec32b3559 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -8,6 +8,7 @@ import pytest from pandas.errors import AbstractMethodError +import pandas.util._testing as tm from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype @@ -17,7 +18,6 @@ from pandas.core.indexers import validate_indices from pandas.core.indexing import _maybe_numeric_slice, _non_reducing_slice from pandas.tests.indexing.common import Base, _mklbl -import pandas.util.testing as tm # ------------------------------------------------------------------------ # Indexing test cases diff --git a/pandas/tests/indexing/test_indexing_engines.py b/pandas/tests/indexing/test_indexing_engines.py index 7303c1ff3d111..c21188d6d982c 100644 --- a/pandas/tests/indexing/test_indexing_engines.py +++ b/pandas/tests/indexing/test_indexing_engines.py @@ -1,8 +1,7 @@ import numpy as np from pandas._libs import algos as libalgos, index as libindex - -import pandas.util.testing as tm +import pandas.util._testing as tm class TestNumericEngine: diff --git a/pandas/tests/indexing/test_indexing_slow.py b/pandas/tests/indexing/test_indexing_slow.py index bf8c6afd00561..8c47eec7a7628 100644 --- a/pandas/tests/indexing/test_indexing_slow.py +++ b/pandas/tests/indexing/test_indexing_slow.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm class TestIndexingSlow: diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index 9119ca0a4511b..88f2a75f4ded1 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -5,11 +5,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range from pandas.api.types import is_scalar from pandas.tests.indexing.common import Base -import pandas.util.testing as tm class TestLoc(Base): diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index 15c65be37e0d9..bc7fa0f14bd45 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -7,9 +7,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, date_range -import pandas.util.testing as tm class TestPartialSetting: diff --git a/pandas/tests/indexing/test_scalar.py b/pandas/tests/indexing/test_scalar.py index ddaea5b597d6d..114e969d6f065 100644 --- a/pandas/tests/indexing/test_scalar.py +++ b/pandas/tests/indexing/test_scalar.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series, Timedelta, Timestamp, date_range from pandas.tests.indexing.common import Base -import pandas.util.testing as tm class TestScalar(Base): diff --git a/pandas/tests/indexing/test_timedelta.py b/pandas/tests/indexing/test_timedelta.py index 5c9865ddc7090..bcd5cc3d90345 100644 --- a/pandas/tests/indexing/test_timedelta.py +++ b/pandas/tests/indexing/test_timedelta.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestTimedeltaIndexing: diff --git a/pandas/tests/internals/test_internals.py b/pandas/tests/internals/test_internals.py index 551782d0b363a..6ee23be24b1c9 100644 --- a/pandas/tests/internals/test_internals.py +++ b/pandas/tests/internals/test_internals.py @@ -8,6 +8,7 @@ import pytest from pandas._libs.internals import BlockPlacement +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -22,7 +23,6 @@ import pandas.core.algorithms as algos from pandas.core.arrays import DatetimeArray, TimedeltaArray from pandas.core.internals import BlockManager, SingleBlockManager, make_block -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/io/conftest.py b/pandas/tests/io/conftest.py index 3f034107ef24f..1bdf04aeb6670 100644 --- a/pandas/tests/io/conftest.py +++ b/pandas/tests/io/conftest.py @@ -2,7 +2,7 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/excel/conftest.py b/pandas/tests/io/excel/conftest.py index 4495ba9b80b67..b169a0c164d6b 100644 --- a/pandas/tests/io/excel/conftest.py +++ b/pandas/tests/io/excel/conftest.py @@ -1,8 +1,7 @@ import pytest import pandas.util._test_decorators as td - -import pandas.util.testing as tm +import pandas.util._testing as tm from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/excel/test_odf.py b/pandas/tests/io/excel/test_odf.py index 6e5610f4f5838..bf898a5e7ff4a 100644 --- a/pandas/tests/io/excel/test_odf.py +++ b/pandas/tests/io/excel/test_odf.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm pytest.importorskip("odf") diff --git a/pandas/tests/io/excel/test_openpyxl.py b/pandas/tests/io/excel/test_openpyxl.py index e8c60870e2a85..a0056729e5220 100644 --- a/pandas/tests/io/excel/test_openpyxl.py +++ b/pandas/tests/io/excel/test_openpyxl.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame -import pandas.util.testing as tm from pandas.io.excel import ExcelWriter, _OpenpyxlWriter diff --git a/pandas/tests/io/excel/test_readers.py b/pandas/tests/io/excel/test_readers.py index 6add99858da68..17a43349b8475 100644 --- a/pandas/tests/io/excel/test_readers.py +++ b/pandas/tests/io/excel/test_readers.py @@ -10,10 +10,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series -import pandas.util.testing as tm @contextlib.contextmanager diff --git a/pandas/tests/io/excel/test_style.py b/pandas/tests/io/excel/test_style.py index 41363bf13ed4e..8b49c335357a2 100644 --- a/pandas/tests/io/excel/test_style.py +++ b/pandas/tests/io/excel/test_style.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm from pandas.io.excel import ExcelWriter from pandas.io.formats.excel import ExcelFormatter diff --git a/pandas/tests/io/excel/test_writers.py b/pandas/tests/io/excel/test_writers.py index c394bc87c99e7..0599e0953a5e5 100644 --- a/pandas/tests/io/excel/test_writers.py +++ b/pandas/tests/io/excel/test_writers.py @@ -7,10 +7,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, get_option, set_option -import pandas.util.testing as tm from pandas.io.excel import ( ExcelFile, diff --git a/pandas/tests/io/excel/test_xlrd.py b/pandas/tests/io/excel/test_xlrd.py index e04dfc97d4968..5d7d12e00a20f 100644 --- a/pandas/tests/io/excel/test_xlrd.py +++ b/pandas/tests/io/excel/test_xlrd.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from pandas.io.excel import ExcelFile diff --git a/pandas/tests/io/excel/test_xlsxwriter.py b/pandas/tests/io/excel/test_xlsxwriter.py index deb72cc230669..3a16d940da9fb 100644 --- a/pandas/tests/io/excel/test_xlsxwriter.py +++ b/pandas/tests/io/excel/test_xlsxwriter.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm from pandas.io.excel import ExcelWriter diff --git a/pandas/tests/io/excel/test_xlwt.py b/pandas/tests/io/excel/test_xlwt.py index c6af78c2704d8..bad301084dc99 100644 --- a/pandas/tests/io/excel/test_xlwt.py +++ b/pandas/tests/io/excel/test_xlwt.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, MultiIndex -import pandas.util.testing as tm from pandas.io.excel import ExcelWriter, _XlwtWriter diff --git a/pandas/tests/io/formats/test_css.py b/pandas/tests/io/formats/test_css.py index a6ad5d5edbf5f..e55475d3d94aa 100644 --- a/pandas/tests/io/formats/test_css.py +++ b/pandas/tests/io/formats/test_css.py @@ -1,6 +1,6 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm from pandas.io.formats.css import CSSResolver, CSSWarning diff --git a/pandas/tests/io/formats/test_eng_formatting.py b/pandas/tests/io/formats/test_eng_formatting.py index 2edbff3766c9d..0c3bfa2e6b158 100644 --- a/pandas/tests/io/formats/test_eng_formatting.py +++ b/pandas/tests/io/formats/test_eng_formatting.py @@ -1,8 +1,9 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame -import pandas.util.testing as tm import pandas.io.formats.format as fmt diff --git a/pandas/tests/io/formats/test_format.py b/pandas/tests/io/formats/test_format.py index f51dd2918efff..5a706a483c700 100644 --- a/pandas/tests/io/formats/test_format.py +++ b/pandas/tests/io/formats/test_format.py @@ -19,6 +19,7 @@ import pytz from pandas.compat import is_platform_32bit, is_platform_windows +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -35,7 +36,6 @@ reset_option, set_option, ) -import pandas.util.testing as tm import pandas.io.formats.format as fmt import pandas.io.formats.printing as printing diff --git a/pandas/tests/io/formats/test_style.py b/pandas/tests/io/formats/test_style.py index 5a3afb5025e51..bbcf2fc6f1a6b 100644 --- a/pandas/tests/io/formats/test_style.py +++ b/pandas/tests/io/formats/test_style.py @@ -6,10 +6,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame -import pandas.util.testing as tm jinja2 = pytest.importorskip("jinja2") from pandas.io.formats.style import Styler, _get_level_lengths # noqa # isort:skip diff --git a/pandas/tests/io/formats/test_to_csv.py b/pandas/tests/io/formats/test_to_csv.py index 469f8df0cbc39..426d6f0e77c67 100644 --- a/pandas/tests/io/formats/test_to_csv.py +++ b/pandas/tests/io/formats/test_to_csv.py @@ -5,9 +5,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, compat -import pandas.util.testing as tm class TestToCSV: diff --git a/pandas/tests/io/formats/test_to_excel.py b/pandas/tests/io/formats/test_to_excel.py index 4d8edec7c7f14..58b30085d97b3 100644 --- a/pandas/tests/io/formats/test_to_excel.py +++ b/pandas/tests/io/formats/test_to_excel.py @@ -5,7 +5,7 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm from pandas.io.formats.css import CSSWarning from pandas.io.formats.excel import CSSToExcelConverter diff --git a/pandas/tests/io/formats/test_to_html.py b/pandas/tests/io/formats/test_to_html.py index a2a577a0753f7..669d8bb4fb55a 100644 --- a/pandas/tests/io/formats/test_to_html.py +++ b/pandas/tests/io/formats/test_to_html.py @@ -5,9 +5,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, option_context -import pandas.util.testing as tm import pandas.io.formats.format as fmt diff --git a/pandas/tests/io/formats/test_to_latex.py b/pandas/tests/io/formats/test_to_latex.py index ea8688517bd93..d7e3815990314 100644 --- a/pandas/tests/io/formats/test_to_latex.py +++ b/pandas/tests/io/formats/test_to_latex.py @@ -3,9 +3,10 @@ import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series -import pandas.util.testing as tm class TestToLatex: diff --git a/pandas/tests/io/json/test_compression.py b/pandas/tests/io/json/test_compression.py index 5c5c04c35d6b7..a6f463004aab5 100644 --- a/pandas/tests/io/json/test_compression.py +++ b/pandas/tests/io/json/test_compression.py @@ -1,9 +1,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm def test_compression_roundtrip(compression): diff --git a/pandas/tests/io/json/test_json_table_schema.py b/pandas/tests/io/json/test_json_table_schema.py index fba74d8ebcf97..5251fa779dc01 100644 --- a/pandas/tests/io/json/test_json_table_schema.py +++ b/pandas/tests/io/json/test_json_table_schema.py @@ -5,11 +5,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype, DatetimeTZDtype, PeriodDtype import pandas as pd from pandas import DataFrame -import pandas.util.testing as tm from pandas.io.json._table_schema import ( as_json_table_type, diff --git a/pandas/tests/io/json/test_normalize.py b/pandas/tests/io/json/test_normalize.py index 46dd1e94aa739..0b895d921c811 100644 --- a/pandas/tests/io/json/test_normalize.py +++ b/pandas/tests/io/json/test_normalize.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, json_normalize -import pandas.util.testing as tm from pandas.io.json._normalize import nested_to_record diff --git a/pandas/tests/io/json/test_pandas.py b/pandas/tests/io/json/test_pandas.py index 532d5215be902..516d2861d6341 100644 --- a/pandas/tests/io/json/test_pandas.py +++ b/pandas/tests/io/json/test_pandas.py @@ -9,10 +9,10 @@ from pandas.compat import is_platform_32bit, is_platform_windows import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, Timestamp, read_json -import pandas.util.testing as tm _seriesd = tm.getSeriesData() _tsd = tm.getTimeSeriesData() diff --git a/pandas/tests/io/json/test_readlines.py b/pandas/tests/io/json/test_readlines.py index 90da175855c34..e12d48e0320f3 100644 --- a/pandas/tests/io/json/test_readlines.py +++ b/pandas/tests/io/json/test_readlines.py @@ -2,9 +2,10 @@ import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, read_json -import pandas.util.testing as tm from pandas.io.json._json import JsonReader diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index dab2882499634..e3cdae7cb3204 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -15,9 +15,9 @@ import pandas._libs.json as ujson from pandas._libs.tslib import Timestamp import pandas.compat as compat +import pandas.util._testing as tm from pandas import DataFrame, DatetimeIndex, Index, NaT, Series, date_range -import pandas.util.testing as tm def _clean_dict(d): diff --git a/pandas/tests/io/parser/test_c_parser_only.py b/pandas/tests/io/parser/test_c_parser_only.py index 77b52eb90d61f..5fd34a6a28f64 100644 --- a/pandas/tests/io/parser/test_c_parser_only.py +++ b/pandas/tests/io/parser/test_c_parser_only.py @@ -15,9 +15,9 @@ from pandas.errors import ParserError import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, concat -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/io/parser/test_comment.py b/pandas/tests/io/parser/test_comment.py index e1d422142ab0b..505b33cf0933d 100644 --- a/pandas/tests/io/parser/test_comment.py +++ b/pandas/tests/io/parser/test_comment.py @@ -7,8 +7,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm @pytest.mark.parametrize("na_values", [None, ["NaN"]]) diff --git a/pandas/tests/io/parser/test_common.py b/pandas/tests/io/parser/test_common.py index c431cbc2171ca..1a2012d142054 100644 --- a/pandas/tests/io/parser/test_common.py +++ b/pandas/tests/io/parser/test_common.py @@ -16,9 +16,9 @@ from pandas._libs.tslib import Timestamp from pandas.errors import DtypeWarning, EmptyDataError, ParserError +import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex, Series, compat, concat -import pandas.util.testing as tm from pandas.io.parsers import CParserWrapper, TextFileReader, TextParser diff --git a/pandas/tests/io/parser/test_compression.py b/pandas/tests/io/parser/test_compression.py index 9d0eab0b9a907..5922034bb9218 100644 --- a/pandas/tests/io/parser/test_compression.py +++ b/pandas/tests/io/parser/test_compression.py @@ -8,8 +8,9 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/io/parser/test_converters.py b/pandas/tests/io/parser/test_converters.py index 2a3b1dc82fc59..31e4cb45eb35b 100644 --- a/pandas/tests/io/parser/test_converters.py +++ b/pandas/tests/io/parser/test_converters.py @@ -8,9 +8,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index -import pandas.util.testing as tm def test_converters_type_must_be_dict(all_parsers): diff --git a/pandas/tests/io/parser/test_dialect.py b/pandas/tests/io/parser/test_dialect.py index dc10352bc6460..29ef1fb2fb3ea 100644 --- a/pandas/tests/io/parser/test_dialect.py +++ b/pandas/tests/io/parser/test_dialect.py @@ -9,9 +9,9 @@ import pytest from pandas.errors import ParserWarning +import pandas.util._testing as tm from pandas import DataFrame -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/io/parser/test_dtypes.py b/pandas/tests/io/parser/test_dtypes.py index a68d46e8a6c15..b1c0209c1c9df 100644 --- a/pandas/tests/io/parser/test_dtypes.py +++ b/pandas/tests/io/parser/test_dtypes.py @@ -9,12 +9,12 @@ import pytest from pandas.errors import ParserWarning +import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import Categorical, DataFrame, Index, MultiIndex, Series, Timestamp, concat -import pandas.util.testing as tm @pytest.mark.parametrize("dtype", [str, object]) diff --git a/pandas/tests/io/parser/test_header.py b/pandas/tests/io/parser/test_header.py index 214b93b6f0628..8c31c20eca1cd 100644 --- a/pandas/tests/io/parser/test_header.py +++ b/pandas/tests/io/parser/test_header.py @@ -10,9 +10,9 @@ import pytest from pandas.errors import ParserError +import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex -import pandas.util.testing as tm def test_read_with_bad_header(all_parsers): diff --git a/pandas/tests/io/parser/test_index_col.py b/pandas/tests/io/parser/test_index_col.py index 66e00f4eb6c1c..34c0677cf0739 100644 --- a/pandas/tests/io/parser/test_index_col.py +++ b/pandas/tests/io/parser/test_index_col.py @@ -7,8 +7,9 @@ import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex -import pandas.util.testing as tm @pytest.mark.parametrize("with_header", [True, False]) diff --git a/pandas/tests/io/parser/test_mangle_dupes.py b/pandas/tests/io/parser/test_mangle_dupes.py index d144421090274..dd1720806a811 100644 --- a/pandas/tests/io/parser/test_mangle_dupes.py +++ b/pandas/tests/io/parser/test_mangle_dupes.py @@ -7,8 +7,9 @@ import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm @pytest.mark.parametrize("kwargs", [dict(), dict(mangle_dupe_cols=True)]) diff --git a/pandas/tests/io/parser/test_multi_thread.py b/pandas/tests/io/parser/test_multi_thread.py index c94adf9da0bf3..7241961e73ddc 100644 --- a/pandas/tests/io/parser/test_multi_thread.py +++ b/pandas/tests/io/parser/test_multi_thread.py @@ -7,9 +7,10 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame -import pandas.util.testing as tm def _construct_dataframe(num_rows): diff --git a/pandas/tests/io/parser/test_na_values.py b/pandas/tests/io/parser/test_na_values.py index 353d309a84823..87dfd80efceff 100644 --- a/pandas/tests/io/parser/test_na_values.py +++ b/pandas/tests/io/parser/test_na_values.py @@ -8,9 +8,9 @@ import pytest from pandas._libs.parsers import STR_NA_VALUES +import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex -import pandas.util.testing as tm def test_string_nas(all_parsers): diff --git a/pandas/tests/io/parser/test_network.py b/pandas/tests/io/parser/test_network.py index 57e2950b06ce8..cd780ba1e02a0 100644 --- a/pandas/tests/io/parser/test_network.py +++ b/pandas/tests/io/parser/test_network.py @@ -9,9 +9,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame -import pandas.util.testing as tm from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/parser/test_parse_dates.py b/pandas/tests/io/parser/test_parse_dates.py index 36391e19a102e..fc5cdc458c54e 100644 --- a/pandas/tests/io/parser/test_parse_dates.py +++ b/pandas/tests/io/parser/test_parse_dates.py @@ -17,11 +17,11 @@ from pandas._libs.tslibs.parsing import parse_datetime_string from pandas.compat import is_platform_windows from pandas.compat.numpy import np_array_datetime64_compat +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, Index, MultiIndex, Series from pandas.core.indexes.datetimes import date_range -import pandas.util.testing as tm import pandas.io.date_converters as conv diff --git a/pandas/tests/io/parser/test_python_parser_only.py b/pandas/tests/io/parser/test_python_parser_only.py index 5b381e43e3e19..fca4c06cd6e20 100644 --- a/pandas/tests/io/parser/test_python_parser_only.py +++ b/pandas/tests/io/parser/test_python_parser_only.py @@ -11,9 +11,9 @@ import pytest from pandas.errors import ParserError +import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex -import pandas.util.testing as tm def test_default_separator(python_parser_only): diff --git a/pandas/tests/io/parser/test_quoting.py b/pandas/tests/io/parser/test_quoting.py index 94858226d0b44..5f23edf2c6705 100644 --- a/pandas/tests/io/parser/test_quoting.py +++ b/pandas/tests/io/parser/test_quoting.py @@ -9,9 +9,9 @@ import pytest from pandas.errors import ParserError +import pandas.util._testing as tm from pandas import DataFrame -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/io/parser/test_read_fwf.py b/pandas/tests/io/parser/test_read_fwf.py index 9ddaccc4d38b7..35ab8351ce53b 100644 --- a/pandas/tests/io/parser/test_read_fwf.py +++ b/pandas/tests/io/parser/test_read_fwf.py @@ -10,9 +10,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, DatetimeIndex -import pandas.util.testing as tm from pandas.io.parsers import EmptyDataError, read_csv, read_fwf diff --git a/pandas/tests/io/parser/test_skiprows.py b/pandas/tests/io/parser/test_skiprows.py index d4f219d13ac53..ca38d930e727e 100644 --- a/pandas/tests/io/parser/test_skiprows.py +++ b/pandas/tests/io/parser/test_skiprows.py @@ -10,9 +10,9 @@ import pytest from pandas.errors import EmptyDataError +import pandas.util._testing as tm from pandas import DataFrame, Index -import pandas.util.testing as tm @pytest.mark.parametrize("skiprows", [list(range(6)), 6]) diff --git a/pandas/tests/io/parser/test_textreader.py b/pandas/tests/io/parser/test_textreader.py index e34f1010d690e..3928e3b7ffa4d 100644 --- a/pandas/tests/io/parser/test_textreader.py +++ b/pandas/tests/io/parser/test_textreader.py @@ -10,9 +10,9 @@ import pandas._libs.parsers as parser from pandas._libs.parsers import TextReader +import pandas.util._testing as tm from pandas import DataFrame -import pandas.util.testing as tm from pandas.io.parsers import TextFileReader, read_csv diff --git a/pandas/tests/io/parser/test_unsupported.py b/pandas/tests/io/parser/test_unsupported.py index 07ab41b47bf27..cc6e2bcb00620 100644 --- a/pandas/tests/io/parser/test_unsupported.py +++ b/pandas/tests/io/parser/test_unsupported.py @@ -11,8 +11,7 @@ import pytest from pandas.errors import ParserError - -import pandas.util.testing as tm +import pandas.util._testing as tm import pandas.io.parsers as parsers from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/parser/test_usecols.py b/pandas/tests/io/parser/test_usecols.py index 539fdf2470c51..ca3c9ec64bfdb 100644 --- a/pandas/tests/io/parser/test_usecols.py +++ b/pandas/tests/io/parser/test_usecols.py @@ -8,9 +8,9 @@ import pytest from pandas._libs.tslib import Timestamp +import pandas.util._testing as tm from pandas import DataFrame, Index -import pandas.util.testing as tm _msg_validate_usecols_arg = ( "'usecols' must either be list-like " diff --git a/pandas/tests/io/pytables/conftest.py b/pandas/tests/io/pytables/conftest.py index 6164f5d0722cc..91193b4097c8b 100644 --- a/pandas/tests/io/pytables/conftest.py +++ b/pandas/tests/io/pytables/conftest.py @@ -1,6 +1,6 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm @pytest.fixture diff --git a/pandas/tests/io/pytables/test_compat.py b/pandas/tests/io/pytables/test_compat.py index a82e21532eddb..ad3d9399b1534 100644 --- a/pandas/tests/io/pytables/test_compat.py +++ b/pandas/tests/io/pytables/test_compat.py @@ -1,8 +1,9 @@ import pytest +import pandas.util._testing as tm + import pandas as pd from pandas.tests.io.pytables.common import ensure_clean_path -import pandas.util.testing as tm tables = pytest.importorskip("tables") diff --git a/pandas/tests/io/pytables/test_complex.py b/pandas/tests/io/pytables/test_complex.py index 91ee1061a5ef1..702004c0fd8d8 100644 --- a/pandas/tests/io/pytables/test_complex.py +++ b/pandas/tests/io/pytables/test_complex.py @@ -4,11 +4,11 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series from pandas.tests.io.pytables.common import ensure_clean_path, ensure_clean_store -import pandas.util.testing as tm from pandas.io.pytables import read_hdf diff --git a/pandas/tests/io/pytables/test_pytables_missing.py b/pandas/tests/io/pytables/test_pytables_missing.py index 4ceb80889c989..2a0ae3d9a8e08 100644 --- a/pandas/tests/io/pytables/test_pytables_missing.py +++ b/pandas/tests/io/pytables/test_pytables_missing.py @@ -1,9 +1,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm @td.skip_if_installed("tables") diff --git a/pandas/tests/io/pytables/test_store.py b/pandas/tests/io/pytables/test_store.py index c8a8e738faa9c..57b601193667b 100644 --- a/pandas/tests/io/pytables/test_store.py +++ b/pandas/tests/io/pytables/test_store.py @@ -12,6 +12,7 @@ from pandas.compat import is_platform_little_endian, is_platform_windows import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.common import is_categorical_dtype @@ -42,7 +43,6 @@ safe_remove, tables, ) -import pandas.util.testing as tm from pandas.io.pytables import ( ClosedFileError, diff --git a/pandas/tests/io/pytables/test_timezones.py b/pandas/tests/io/pytables/test_timezones.py index 1acb0ac6e06d2..f5c8e602b1ba4 100644 --- a/pandas/tests/io/pytables/test_timezones.py +++ b/pandas/tests/io/pytables/test_timezones.py @@ -4,6 +4,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, Timestamp, date_range @@ -12,7 +13,6 @@ ensure_clean_path, ensure_clean_store, ) -import pandas.util.testing as tm def _compare_with_tz(a, b): diff --git a/pandas/tests/io/sas/test_sas.py b/pandas/tests/io/sas/test_sas.py index fcd2e0e35ad9e..fb4c6b856b7dc 100644 --- a/pandas/tests/io/sas/test_sas.py +++ b/pandas/tests/io/sas/test_sas.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + from pandas import read_sas -import pandas.util.testing as tm class TestSas: diff --git a/pandas/tests/io/sas/test_sas7bdat.py b/pandas/tests/io/sas/test_sas7bdat.py index c89342627f796..e58bb4b83b4a3 100644 --- a/pandas/tests/io/sas/test_sas7bdat.py +++ b/pandas/tests/io/sas/test_sas7bdat.py @@ -8,9 +8,9 @@ from pandas.errors import EmptyDataError import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm # https://github.com/cython/cython/issues/1720 diff --git a/pandas/tests/io/sas/test_xport.py b/pandas/tests/io/sas/test_xport.py index a52b22122ba81..ce4e0edef1643 100644 --- a/pandas/tests/io/sas/test_xport.py +++ b/pandas/tests/io/sas/test_xport.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from pandas.io.sas.sasreader import read_sas diff --git a/pandas/tests/io/test_clipboard.py b/pandas/tests/io/test_clipboard.py index 666dfd245acaa..8c4d26393a588 100644 --- a/pandas/tests/io/test_clipboard.py +++ b/pandas/tests/io/test_clipboard.py @@ -4,9 +4,10 @@ from numpy.random import randint import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, get_option, read_clipboard -import pandas.util.testing as tm from pandas.io.clipboard import PyperclipException, clipboard_get, clipboard_set diff --git a/pandas/tests/io/test_common.py b/pandas/tests/io/test_common.py index 59d7f6f904337..72b636ee12d1d 100644 --- a/pandas/tests/io/test_common.py +++ b/pandas/tests/io/test_common.py @@ -10,9 +10,9 @@ from pandas.compat import is_platform_windows import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm import pandas.io.common as icom diff --git a/pandas/tests/io/test_compression.py b/pandas/tests/io/test_compression.py index e17a32cbc8b68..3cf43a933bec7 100644 --- a/pandas/tests/io/test_compression.py +++ b/pandas/tests/io/test_compression.py @@ -5,8 +5,9 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm import pandas.io.common as icom diff --git a/pandas/tests/io/test_date_converters.py b/pandas/tests/io/test_date_converters.py index 2fa5e3b30d6af..514484e34eec7 100644 --- a/pandas/tests/io/test_date_converters.py +++ b/pandas/tests/io/test_date_converters.py @@ -2,7 +2,7 @@ import numpy as np -import pandas.util.testing as tm +import pandas.util._testing as tm import pandas.io.date_converters as conv diff --git a/pandas/tests/io/test_feather.py b/pandas/tests/io/test_feather.py index e06f2c31a2870..e3bc2be0c596e 100644 --- a/pandas/tests/io/test_feather.py +++ b/pandas/tests/io/test_feather.py @@ -4,8 +4,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from pandas.io.feather_format import read_feather, to_feather # noqa: E402 isort:skip diff --git a/pandas/tests/io/test_gcs.py b/pandas/tests/io/test_gcs.py index 85ac56c8193a6..96f77f2e4a569 100644 --- a/pandas/tests/io/test_gcs.py +++ b/pandas/tests/io/test_gcs.py @@ -4,9 +4,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, date_range, read_csv from pandas.util import _test_decorators as td -import pandas.util.testing as tm from pandas.io.common import is_gcs_url diff --git a/pandas/tests/io/test_html.py b/pandas/tests/io/test_html.py index 2bb412cf6eab5..2ccf34c7fca91 100644 --- a/pandas/tests/io/test_html.py +++ b/pandas/tests/io/test_html.py @@ -13,9 +13,9 @@ from pandas.compat import is_platform_windows from pandas.errors import ParserError import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range, read_csv -import pandas.util.testing as tm from pandas.io.common import file_path_to_url import pandas.io.html diff --git a/pandas/tests/io/test_orc.py b/pandas/tests/io/test_orc.py index 9f3ec274007d0..944785cf767f1 100644 --- a/pandas/tests/io/test_orc.py +++ b/pandas/tests/io/test_orc.py @@ -5,9 +5,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import read_orc -import pandas.util.testing as tm pytest.importorskip("pyarrow", minversion="0.13.0") pytest.importorskip("pyarrow.orc") diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py index fc3d55e110d69..6a2ada2dbf4ef 100644 --- a/pandas/tests/io/test_parquet.py +++ b/pandas/tests/io/test_parquet.py @@ -8,9 +8,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd -import pandas.util.testing as tm from pandas.io.parquet import ( FastParquetImpl, diff --git a/pandas/tests/io/test_pickle.py b/pandas/tests/io/test_pickle.py index 3be966edef080..e835f50406dab 100644 --- a/pandas/tests/io/test_pickle.py +++ b/pandas/tests/io/test_pickle.py @@ -22,10 +22,10 @@ import pytest from pandas.compat import _get_lzma_file, _import_lzma, is_platform_little_endian +import pandas.util._testing as tm import pandas as pd from pandas import Index -import pandas.util.testing as tm from pandas.tseries.offsets import Day, MonthEnd diff --git a/pandas/tests/io/test_spss.py b/pandas/tests/io/test_spss.py index ccf3167d49371..6aeb6dc1fcd3b 100644 --- a/pandas/tests/io/test_spss.py +++ b/pandas/tests/io/test_spss.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm pyreadstat = pytest.importorskip("pyreadstat") diff --git a/pandas/tests/io/test_sql.py b/pandas/tests/io/test_sql.py index d5c2b368a3c6a..0c6da4bf603e1 100644 --- a/pandas/tests/io/test_sql.py +++ b/pandas/tests/io/test_sql.py @@ -26,6 +26,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_datetime64_dtype, is_datetime64tz_dtype import pandas as pd @@ -41,7 +43,6 @@ to_datetime, to_timedelta, ) -import pandas.util.testing as tm import pandas.io.sql as sql from pandas.io.sql import read_sql_query, read_sql_table diff --git a/pandas/tests/io/test_stata.py b/pandas/tests/io/test_stata.py index e8bc7f480fb1d..a758b763d7b59 100644 --- a/pandas/tests/io/test_stata.py +++ b/pandas/tests/io/test_stata.py @@ -9,11 +9,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_categorical_dtype import pandas as pd from pandas.core.frame import DataFrame, Series -import pandas.util.testing as tm from pandas.io.parsers import read_csv from pandas.io.stata import ( diff --git a/pandas/tests/plotting/common.py b/pandas/tests/plotting/common.py index 86cb7fc57b225..8eb308550859b 100644 --- a/pandas/tests/plotting/common.py +++ b/pandas/tests/plotting/common.py @@ -9,12 +9,12 @@ from pandas.util._decorators import cache_readonly import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.api import is_list_like import pandas as pd from pandas import DataFrame, Series -import pandas.util.testing as tm """ diff --git a/pandas/tests/plotting/test_boxplot_method.py b/pandas/tests/plotting/test_boxplot_method.py index 116d924f5a596..195ce0b0825be 100644 --- a/pandas/tests/plotting/test_boxplot_method.py +++ b/pandas/tests/plotting/test_boxplot_method.py @@ -8,10 +8,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, MultiIndex, Series, date_range, timedelta_range from pandas.tests.plotting.common import TestPlotBase, _check_plot_works -import pandas.util.testing as tm import pandas.plotting as plotting diff --git a/pandas/tests/plotting/test_converter.py b/pandas/tests/plotting/test_converter.py index 71a186dc2f3b0..e3a2dc848fb39 100644 --- a/pandas/tests/plotting/test_converter.py +++ b/pandas/tests/plotting/test_converter.py @@ -8,9 +8,9 @@ import pandas._config.config as cf from pandas.compat.numpy import np_datetime64_compat +import pandas.util._testing as tm from pandas import Index, Period, Series, Timestamp, date_range -import pandas.util.testing as tm from pandas.plotting import ( deregister_matplotlib_converters, diff --git a/pandas/tests/plotting/test_datetimelike.py b/pandas/tests/plotting/test_datetimelike.py index 8456f095e5868..972d8ab7184df 100644 --- a/pandas/tests/plotting/test_datetimelike.py +++ b/pandas/tests/plotting/test_datetimelike.py @@ -7,6 +7,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Index, NaT, Series, isna from pandas.core.indexes.datetimes import bdate_range, date_range @@ -14,7 +15,6 @@ from pandas.core.indexes.timedeltas import timedelta_range from pandas.core.resample import DatetimeIndex from pandas.tests.plotting.common import TestPlotBase -import pandas.util.testing as tm from pandas.tseries.offsets import DateOffset diff --git a/pandas/tests/plotting/test_frame.py b/pandas/tests/plotting/test_frame.py index c2a289b2772ba..d115cd56d4928 100644 --- a/pandas/tests/plotting/test_frame.py +++ b/pandas/tests/plotting/test_frame.py @@ -12,6 +12,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.api import is_list_like @@ -19,7 +20,6 @@ from pandas import DataFrame, MultiIndex, PeriodIndex, Series, bdate_range, date_range from pandas.core.arrays import integer_array from pandas.tests.plotting.common import TestPlotBase, _check_plot_works -import pandas.util.testing as tm from pandas.io.formats.printing import pprint_thing import pandas.plotting as plotting diff --git a/pandas/tests/plotting/test_groupby.py b/pandas/tests/plotting/test_groupby.py index bb1747710fe18..208ca5c65db79 100644 --- a/pandas/tests/plotting/test_groupby.py +++ b/pandas/tests/plotting/test_groupby.py @@ -6,10 +6,10 @@ import numpy as np import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Series from pandas.tests.plotting.common import TestPlotBase -import pandas.util.testing as tm @td.skip_if_no_mpl diff --git a/pandas/tests/plotting/test_hist_method.py b/pandas/tests/plotting/test_hist_method.py index 74d48c10ad9a0..4c5e8faa03927 100644 --- a/pandas/tests/plotting/test_hist_method.py +++ b/pandas/tests/plotting/test_hist_method.py @@ -7,10 +7,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Series from pandas.tests.plotting.common import TestPlotBase, _check_plot_works -import pandas.util.testing as tm @td.skip_if_no_mpl diff --git a/pandas/tests/plotting/test_misc.py b/pandas/tests/plotting/test_misc.py index eadcc12d8428c..d28051e587af2 100644 --- a/pandas/tests/plotting/test_misc.py +++ b/pandas/tests/plotting/test_misc.py @@ -8,10 +8,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Series from pandas.tests.plotting.common import TestPlotBase, _check_plot_works -import pandas.util.testing as tm import pandas.plotting as plotting diff --git a/pandas/tests/plotting/test_series.py b/pandas/tests/plotting/test_series.py index 61722d726b28b..a58687ab33fb0 100644 --- a/pandas/tests/plotting/test_series.py +++ b/pandas/tests/plotting/test_series.py @@ -11,11 +11,11 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, date_range from pandas.tests.plotting.common import TestPlotBase, _check_plot_works -import pandas.util.testing as tm import pandas.plotting as plotting diff --git a/pandas/tests/reductions/test_reductions.py b/pandas/tests/reductions/test_reductions.py index d66472b1c2054..20ae67eac838e 100644 --- a/pandas/tests/reductions/test_reductions.py +++ b/pandas/tests/reductions/test_reductions.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -22,7 +24,6 @@ to_timedelta, ) from pandas.core import nanops -import pandas.util.testing as tm def get_objs(): diff --git a/pandas/tests/reductions/test_stat_reductions.py b/pandas/tests/reductions/test_stat_reductions.py index 432811b5a8264..d92083107589f 100644 --- a/pandas/tests/reductions/test_stat_reductions.py +++ b/pandas/tests/reductions/test_stat_reductions.py @@ -7,11 +7,11 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series from pandas.core.arrays import DatetimeArray, PeriodArray, TimedeltaArray -import pandas.util.testing as tm class TestDatetimeLikeStatReductions: diff --git a/pandas/tests/resample/test_base.py b/pandas/tests/resample/test_base.py index 02203f476af8e..23a9d3c55294f 100644 --- a/pandas/tests/resample/test_base.py +++ b/pandas/tests/resample/test_base.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series from pandas.core.groupby.groupby import DataError @@ -10,7 +12,6 @@ from pandas.core.indexes.datetimes import date_range from pandas.core.indexes.period import PeriodIndex, period_range from pandas.core.indexes.timedeltas import TimedeltaIndex, timedelta_range -import pandas.util.testing as tm # a fixture value can be overridden by the test parameter value. Note that the # value of the fixture can be overridden this way even if the test doesn't use diff --git a/pandas/tests/resample/test_datetime_index.py b/pandas/tests/resample/test_datetime_index.py index bcd7081d5b1a5..b479a8bc30b78 100644 --- a/pandas/tests/resample/test_datetime_index.py +++ b/pandas/tests/resample/test_datetime_index.py @@ -7,6 +7,7 @@ import pytz from pandas.errors import UnsupportedFunctionCall +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, Timedelta, Timestamp, isna, notna @@ -14,7 +15,6 @@ from pandas.core.indexes.datetimes import date_range from pandas.core.indexes.period import Period, period_range from pandas.core.resample import DatetimeIndex, _get_timestamp_range_edges -import pandas.util.testing as tm import pandas.tseries.offsets as offsets from pandas.tseries.offsets import BDay, Minute diff --git a/pandas/tests/resample/test_period_index.py b/pandas/tests/resample/test_period_index.py index 0ed0bf18a82ee..a29d50a269a8c 100644 --- a/pandas/tests/resample/test_period_index.py +++ b/pandas/tests/resample/test_period_index.py @@ -7,6 +7,7 @@ from pandas._libs.tslibs.ccalendar import DAYS, MONTHS from pandas._libs.tslibs.period import IncompatibleFrequency +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, Timestamp @@ -14,7 +15,6 @@ from pandas.core.indexes.datetimes import date_range from pandas.core.indexes.period import Period, PeriodIndex, period_range from pandas.core.resample import _get_period_range_edges -import pandas.util.testing as tm import pandas.tseries.offsets as offsets diff --git a/pandas/tests/resample/test_resample_api.py b/pandas/tests/resample/test_resample_api.py index 7852afcdbfea9..f63b316341fae 100644 --- a/pandas/tests/resample/test_resample_api.py +++ b/pandas/tests/resample/test_resample_api.py @@ -4,10 +4,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series from pandas.core.indexes.datetimes import date_range -import pandas.util.testing as tm dti = date_range(start=datetime(2005, 1, 1), end=datetime(2005, 1, 10), freq="Min") diff --git a/pandas/tests/resample/test_resampler_grouper.py b/pandas/tests/resample/test_resampler_grouper.py index 7efc6b0d466b9..f446800c94ff1 100644 --- a/pandas/tests/resample/test_resampler_grouper.py +++ b/pandas/tests/resample/test_resampler_grouper.py @@ -2,10 +2,11 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, Timestamp from pandas.core.indexes.datetimes import date_range -import pandas.util.testing as tm test_frame = DataFrame( {"A": [1] * 20 + [2] * 12 + [3] * 8, "B": np.arange(40)}, @@ -18,7 +19,7 @@ def test_tab_complete_ipython6_warning(ip): code = dedent( """\ - import pandas.util.testing as tm + import pandas.util._testing as tm s = tm.makeTimeSeries() rs = s.resample("D") """ diff --git a/pandas/tests/resample/test_time_grouper.py b/pandas/tests/resample/test_time_grouper.py index 4c27d48cff6fd..c6ad995f25eb7 100644 --- a/pandas/tests/resample/test_time_grouper.py +++ b/pandas/tests/resample/test_time_grouper.py @@ -4,11 +4,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series from pandas.core.groupby.grouper import Grouper from pandas.core.indexes.datetimes import date_range -import pandas.util.testing as tm test_series = Series(np.random.randn(1000), index=date_range("1/1/2000", periods=1000)) diff --git a/pandas/tests/resample/test_timedelta.py b/pandas/tests/resample/test_timedelta.py index 7a6ebf826ca4d..199fd64e9cad4 100644 --- a/pandas/tests/resample/test_timedelta.py +++ b/pandas/tests/resample/test_timedelta.py @@ -2,10 +2,11 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series from pandas.core.indexes.timedeltas import timedelta_range -import pandas.util.testing as tm def test_asfreq_bug(): diff --git a/pandas/tests/reshape/merge/test_join.py b/pandas/tests/reshape/merge/test_join.py index 091bdd8de2995..75a94f71d08f5 100644 --- a/pandas/tests/reshape/merge/test_join.py +++ b/pandas/tests/reshape/merge/test_join.py @@ -3,11 +3,11 @@ import pytest from pandas._libs import join as libjoin +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, concat, merge from pandas.tests.reshape.merge.test_merge import NGROUPS, N, get_test_data -import pandas.util.testing as tm a_ = np.array diff --git a/pandas/tests/reshape/merge/test_merge.py b/pandas/tests/reshape/merge/test_merge.py index e191bf67c51ca..b8597dab4009b 100644 --- a/pandas/tests/reshape/merge/test_merge.py +++ b/pandas/tests/reshape/merge/test_merge.py @@ -6,6 +6,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_categorical_dtype, is_object_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -28,7 +30,6 @@ from pandas.api.types import CategoricalDtype as CDT from pandas.core.reshape.concat import concat from pandas.core.reshape.merge import MergeError, merge -import pandas.util.testing as tm N = 50 NGROUPS = 8 diff --git a/pandas/tests/reshape/merge/test_merge_asof.py b/pandas/tests/reshape/merge/test_merge_asof.py index b2e764c5463fa..f582a83bf7667 100644 --- a/pandas/tests/reshape/merge/test_merge_asof.py +++ b/pandas/tests/reshape/merge/test_merge_asof.py @@ -4,10 +4,11 @@ import pytest import pytz +import pandas.util._testing as tm + import pandas as pd from pandas import Timedelta, merge_asof, read_csv, to_datetime from pandas.core.reshape.merge import MergeError -import pandas.util.testing as tm class TestAsOfMerge: diff --git a/pandas/tests/reshape/merge/test_merge_index_as_string.py b/pandas/tests/reshape/merge/test_merge_index_as_string.py index 4e0f570567c07..605eedf594b18 100644 --- a/pandas/tests/reshape/merge/test_merge_index_as_string.py +++ b/pandas/tests/reshape/merge/test_merge_index_as_string.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/reshape/merge/test_merge_ordered.py b/pandas/tests/reshape/merge/test_merge_ordered.py index 6d6429fb4e6b5..78bccc67d9259 100644 --- a/pandas/tests/reshape/merge/test_merge_ordered.py +++ b/pandas/tests/reshape/merge/test_merge_ordered.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, merge_ordered -import pandas.util.testing as tm class TestMergeOrdered: diff --git a/pandas/tests/reshape/merge/test_multi.py b/pandas/tests/reshape/merge/test_multi.py index 8d5c18b71e7c2..415d0eb37725d 100644 --- a/pandas/tests/reshape/merge/test_multi.py +++ b/pandas/tests/reshape/merge/test_multi.py @@ -2,11 +2,12 @@ from numpy.random import randn import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series from pandas.core.reshape.concat import concat from pandas.core.reshape.merge import merge -import pandas.util.testing as tm @pytest.fixture diff --git a/pandas/tests/reshape/test_concat.py b/pandas/tests/reshape/test_concat.py index 05193c00f0649..4d4aeca21e24d 100644 --- a/pandas/tests/reshape/test_concat.py +++ b/pandas/tests/reshape/test_concat.py @@ -11,6 +11,8 @@ from numpy.random import randn import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd @@ -29,7 +31,6 @@ ) from pandas.core.construction import create_series_with_explicit_dtype from pandas.tests.extension.decimal import to_decimal -import pandas.util.testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/reshape/test_cut.py b/pandas/tests/reshape/test_cut.py index 611c3272c123f..4b5e74dff96e7 100644 --- a/pandas/tests/reshape/test_cut.py +++ b/pandas/tests/reshape/test_cut.py @@ -1,6 +1,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -21,7 +23,6 @@ ) from pandas.api.types import CategoricalDtype as CDT import pandas.core.reshape.tile as tmod -import pandas.util.testing as tm def test_simple(): diff --git a/pandas/tests/reshape/test_melt.py b/pandas/tests/reshape/test_melt.py index 2c03c48209fea..5701adc2bcd53 100644 --- a/pandas/tests/reshape/test_melt.py +++ b/pandas/tests/reshape/test_melt.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, lreshape, melt, wide_to_long -import pandas.util.testing as tm class TestMelt: diff --git a/pandas/tests/reshape/test_pivot.py b/pandas/tests/reshape/test_pivot.py index 43da011ed7100..73c35727bdc3f 100644 --- a/pandas/tests/reshape/test_pivot.py +++ b/pandas/tests/reshape/test_pivot.py @@ -4,6 +4,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -17,7 +19,6 @@ ) from pandas.api.types import CategoricalDtype as CDT from pandas.core.reshape.pivot import crosstab, pivot_table -import pandas.util.testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/reshape/test_qcut.py b/pandas/tests/reshape/test_qcut.py index eca9b11bd4364..84227d6088b83 100644 --- a/pandas/tests/reshape/test_qcut.py +++ b/pandas/tests/reshape/test_qcut.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import ( Categorical, DatetimeIndex, @@ -20,7 +22,6 @@ ) from pandas.api.types import CategoricalDtype as CDT from pandas.core.algorithms import quantile -import pandas.util.testing as tm from pandas.tseries.offsets import Day, Nano diff --git a/pandas/tests/reshape/test_reshape.py b/pandas/tests/reshape/test_reshape.py index b695b05c7c7db..1b2f428c1975c 100644 --- a/pandas/tests/reshape/test_reshape.py +++ b/pandas/tests/reshape/test_reshape.py @@ -3,12 +3,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_integer_dtype import pandas as pd from pandas import Categorical, DataFrame, Index, Series, get_dummies from pandas.core.arrays.sparse import SparseArray, SparseDtype -import pandas.util.testing as tm class TestGetDummies: diff --git a/pandas/tests/reshape/test_union_categoricals.py b/pandas/tests/reshape/test_union_categoricals.py index 9b56c4df6d7de..24ea86185b8ee 100644 --- a/pandas/tests/reshape/test_union_categoricals.py +++ b/pandas/tests/reshape/test_union_categoricals.py @@ -1,11 +1,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.concat import union_categoricals import pandas as pd from pandas import Categorical, CategoricalIndex, Series -import pandas.util.testing as tm class TestUnionCategoricals: diff --git a/pandas/tests/reshape/test_util.py b/pandas/tests/reshape/test_util.py index 60c6d7ec3017b..25719f68807f8 100644 --- a/pandas/tests/reshape/test_util.py +++ b/pandas/tests/reshape/test_util.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Index, date_range from pandas.core.reshape.util import cartesian_product -import pandas.util.testing as tm class TestCartesianProduct: diff --git a/pandas/tests/scalar/period/test_period.py b/pandas/tests/scalar/period/test_period.py index 73371c48f9370..4b570d51d89aa 100644 --- a/pandas/tests/scalar/period/test_period.py +++ b/pandas/tests/scalar/period/test_period.py @@ -13,10 +13,10 @@ from pandas._libs.tslibs.period import IncompatibleFrequency from pandas._libs.tslibs.timezones import dateutil_gettz, maybe_get_tz from pandas.compat.numpy import np_datetime64_compat +import pandas.util._testing as tm import pandas as pd from pandas import NaT, Period, Timedelta, Timestamp, offsets -import pandas.util.testing as tm class TestPeriodConstruction: diff --git a/pandas/tests/scalar/test_na_scalar.py b/pandas/tests/scalar/test_na_scalar.py index 82d5b097733f1..135a8bb86913c 100644 --- a/pandas/tests/scalar/test_na_scalar.py +++ b/pandas/tests/scalar/test_na_scalar.py @@ -2,11 +2,11 @@ import pytest from pandas._libs.missing import NA +import pandas.util._testing as tm from pandas.core.dtypes.common import is_scalar import pandas as pd -import pandas.util.testing as tm def test_singleton(): diff --git a/pandas/tests/scalar/test_nat.py b/pandas/tests/scalar/test_nat.py index e709db980b721..ea5301a65ed95 100644 --- a/pandas/tests/scalar/test_nat.py +++ b/pandas/tests/scalar/test_nat.py @@ -7,6 +7,7 @@ from pandas._libs.tslibs import iNaT import pandas.compat as compat +import pandas.util._testing as tm from pandas.core.dtypes.common import is_datetime64_any_dtype @@ -23,7 +24,6 @@ ) from pandas.core.arrays import DatetimeArray, PeriodArray, TimedeltaArray from pandas.core.ops import roperator -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/scalar/timedelta/test_arithmetic.py b/pandas/tests/scalar/timedelta/test_arithmetic.py index fed613b910c55..c2a3810d64d31 100644 --- a/pandas/tests/scalar/timedelta/test_arithmetic.py +++ b/pandas/tests/scalar/timedelta/test_arithmetic.py @@ -7,10 +7,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import NaT, Timedelta, Timestamp, offsets from pandas.core import ops -import pandas.util.testing as tm class TestTimedeltaAdditionSubtraction: diff --git a/pandas/tests/scalar/timedelta/test_timedelta.py b/pandas/tests/scalar/timedelta/test_timedelta.py index b988a72fd2684..f7170ea98e4dd 100644 --- a/pandas/tests/scalar/timedelta/test_timedelta.py +++ b/pandas/tests/scalar/timedelta/test_timedelta.py @@ -5,10 +5,10 @@ import pytest from pandas._libs.tslibs import NaT, Timestamp, iNaT +import pandas.util._testing as tm import pandas as pd from pandas import Series, Timedelta, TimedeltaIndex, timedelta_range, to_timedelta -import pandas.util.testing as tm class TestTimedeltaArithmetic: diff --git a/pandas/tests/scalar/timestamp/test_timestamp.py b/pandas/tests/scalar/timestamp/test_timestamp.py index 25609cb852ed4..a84b1ed97ad31 100644 --- a/pandas/tests/scalar/timestamp/test_timestamp.py +++ b/pandas/tests/scalar/timestamp/test_timestamp.py @@ -17,9 +17,9 @@ from pandas.compat.numpy import np_datetime64_compat from pandas.errors import OutOfBoundsDatetime import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import NaT, Period, Timedelta, Timestamp -import pandas.util.testing as tm from pandas.tseries import offsets diff --git a/pandas/tests/scalar/timestamp/test_unary_ops.py b/pandas/tests/scalar/timestamp/test_unary_ops.py index db63e0bf9cd30..bac7df8727264 100644 --- a/pandas/tests/scalar/timestamp/test_unary_ops.py +++ b/pandas/tests/scalar/timestamp/test_unary_ops.py @@ -8,9 +8,9 @@ from pandas._libs.tslibs import conversion from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import NaT, Timestamp -import pandas.util.testing as tm from pandas.tseries.frequencies import to_offset diff --git a/pandas/tests/series/conftest.py b/pandas/tests/series/conftest.py index 18d3c87a01f87..e131b5307aea1 100644 --- a/pandas/tests/series/conftest.py +++ b/pandas/tests/series/conftest.py @@ -1,6 +1,6 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm @pytest.fixture diff --git a/pandas/tests/series/indexing/test_alter_index.py b/pandas/tests/series/indexing/test_alter_index.py index c47b99fa38989..fd7916e60644c 100644 --- a/pandas/tests/series/indexing/test_alter_index.py +++ b/pandas/tests/series/indexing/test_alter_index.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, Series, date_range, isna -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/series/indexing/test_boolean.py b/pandas/tests/series/indexing/test_boolean.py index c2912cf3ce53f..ca7b9125c7ebd 100644 --- a/pandas/tests/series/indexing/test_boolean.py +++ b/pandas/tests/series/indexing/test_boolean.py @@ -1,12 +1,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_integer import pandas as pd from pandas import Index, Series, Timestamp, date_range, isna from pandas.core.indexing import IndexingError -import pandas.util.testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/indexing/test_callable.py b/pandas/tests/series/indexing/test_callable.py index 2d879eed967e5..ab0d4f87fa779 100644 --- a/pandas/tests/series/indexing/test_callable.py +++ b/pandas/tests/series/indexing/test_callable.py @@ -1,5 +1,6 @@ +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm def test_getitem_callable(): diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 83c1c0ff16f4c..791fcb24e48f9 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -5,10 +5,10 @@ from pandas._libs import iNaT import pandas._libs.index as _index +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, NaT, Series, Timestamp, date_range -import pandas.util.testing as tm """ diff --git a/pandas/tests/series/indexing/test_iloc.py b/pandas/tests/series/indexing/test_iloc.py index eef4d89af3832..914037571ba7c 100644 --- a/pandas/tests/series/indexing/test_iloc.py +++ b/pandas/tests/series/indexing/test_iloc.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import Series -import pandas.util.testing as tm def test_iloc(): diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py index 5bebd480ce8d4..4f287ef0ec8e5 100644 --- a/pandas/tests/series/indexing/test_indexing.py +++ b/pandas/tests/series/indexing/test_indexing.py @@ -5,11 +5,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_scalar import pandas as pd from pandas import Categorical, DataFrame, MultiIndex, Series, Timedelta, Timestamp -import pandas.util.testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/indexing/test_loc.py b/pandas/tests/series/indexing/test_loc.py index e6b5b5df2b000..0a1276ba09ab9 100644 --- a/pandas/tests/series/indexing/test_loc.py +++ b/pandas/tests/series/indexing/test_loc.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series, Timestamp -import pandas.util.testing as tm @pytest.mark.parametrize("val,expected", [(2 ** 63 - 1, 3), (2 ** 63, 4)]) diff --git a/pandas/tests/series/indexing/test_numeric.py b/pandas/tests/series/indexing/test_numeric.py index a641b47f2e690..144635a35ea58 100644 --- a/pandas/tests/series/indexing/test_numeric.py +++ b/pandas/tests/series/indexing/test_numeric.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series -import pandas.util.testing as tm def test_get(): diff --git a/pandas/tests/series/methods/test_append.py b/pandas/tests/series/methods/test_append.py index ec357786f18fb..9a554e49e96bf 100644 --- a/pandas/tests/series/methods/test_append.py +++ b/pandas/tests/series/methods/test_append.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, date_range -import pandas.util.testing as tm class TestSeriesAppend: diff --git a/pandas/tests/series/methods/test_argsort.py b/pandas/tests/series/methods/test_argsort.py index 9dd3045ad86d9..2abab4b6f8a79 100644 --- a/pandas/tests/series/methods/test_argsort.py +++ b/pandas/tests/series/methods/test_argsort.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Series, Timestamp, isna -import pandas.util.testing as tm class TestSeriesArgsort: diff --git a/pandas/tests/series/methods/test_asof.py b/pandas/tests/series/methods/test_asof.py index 8bc9e9c38d83a..e832ca471a146 100644 --- a/pandas/tests/series/methods/test_asof.py +++ b/pandas/tests/series/methods/test_asof.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Series, Timestamp, date_range, isna, notna, offsets -import pandas.util.testing as tm class TestSeriesAsof: diff --git a/pandas/tests/series/methods/test_clip.py b/pandas/tests/series/methods/test_clip.py index c2bec2744583a..99252fc2f76db 100644 --- a/pandas/tests/series/methods/test_clip.py +++ b/pandas/tests/series/methods/test_clip.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series, Timestamp, isna, notna -import pandas.util.testing as tm class TestSeriesClip: diff --git a/pandas/tests/series/methods/test_count.py b/pandas/tests/series/methods/test_count.py index 9cf776c0d9f1a..74bf29a8f83b1 100644 --- a/pandas/tests/series/methods/test_count.py +++ b/pandas/tests/series/methods/test_count.py @@ -1,8 +1,9 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, MultiIndex, Series -import pandas.util.testing as tm class TestSeriesCount: diff --git a/pandas/tests/series/methods/test_cov_corr.py b/pandas/tests/series/methods/test_cov_corr.py index f7dae87018419..41f198671db3a 100644 --- a/pandas/tests/series/methods/test_cov_corr.py +++ b/pandas/tests/series/methods/test_cov_corr.py @@ -2,10 +2,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import Series, isna -import pandas.util.testing as tm class TestSeriesCov: diff --git a/pandas/tests/series/methods/test_describe.py b/pandas/tests/series/methods/test_describe.py index ed412e7da3d43..f8f207eb4d049 100644 --- a/pandas/tests/series/methods/test_describe.py +++ b/pandas/tests/series/methods/test_describe.py @@ -1,7 +1,8 @@ import numpy as np +import pandas.util._testing as tm + from pandas import Series, Timestamp, date_range -import pandas.util.testing as tm class TestSeriesDescribe: diff --git a/pandas/tests/series/methods/test_diff.py b/pandas/tests/series/methods/test_diff.py index 9cb4ec827a271..b4d97a57eb94b 100644 --- a/pandas/tests/series/methods/test_diff.py +++ b/pandas/tests/series/methods/test_diff.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Series, TimedeltaIndex, date_range -import pandas.util.testing as tm class TestSeriesDiff: diff --git a/pandas/tests/series/methods/test_drop_duplicates.py b/pandas/tests/series/methods/test_drop_duplicates.py index 2c5dcd2c45171..7626738145667 100644 --- a/pandas/tests/series/methods/test_drop_duplicates.py +++ b/pandas/tests/series/methods/test_drop_duplicates.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, Series -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/series/methods/test_duplicated.py b/pandas/tests/series/methods/test_duplicated.py index 36b3b559477a6..d391c92f4274b 100644 --- a/pandas/tests/series/methods/test_duplicated.py +++ b/pandas/tests/series/methods/test_duplicated.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Series -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/series/methods/test_explode.py b/pandas/tests/series/methods/test_explode.py index e79d3c0556cf1..41904d3612d74 100644 --- a/pandas/tests/series/methods/test_explode.py +++ b/pandas/tests/series/methods/test_explode.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm def test_basic(): diff --git a/pandas/tests/series/methods/test_isin.py b/pandas/tests/series/methods/test_isin.py index 69b2f896aec52..c4ca7cca1f9e3 100644 --- a/pandas/tests/series/methods/test_isin.py +++ b/pandas/tests/series/methods/test_isin.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series, date_range -import pandas.util.testing as tm class TestSeriesIsIn: diff --git a/pandas/tests/series/methods/test_nlargest.py b/pandas/tests/series/methods/test_nlargest.py index 423b4ad78a78a..32ebbc6315c13 100644 --- a/pandas/tests/series/methods/test_nlargest.py +++ b/pandas/tests/series/methods/test_nlargest.py @@ -7,9 +7,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series -import pandas.util.testing as tm main_dtypes = [ "datetime", diff --git a/pandas/tests/series/methods/test_pct_change.py b/pandas/tests/series/methods/test_pct_change.py index abc5c498813ef..5c2a282965e9d 100644 --- a/pandas/tests/series/methods/test_pct_change.py +++ b/pandas/tests/series/methods/test_pct_change.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Series, date_range -import pandas.util.testing as tm class TestSeriesPctChange: diff --git a/pandas/tests/series/methods/test_quantile.py b/pandas/tests/series/methods/test_quantile.py index 4eb275d63e878..b44ef5028fb45 100644 --- a/pandas/tests/series/methods/test_quantile.py +++ b/pandas/tests/series/methods/test_quantile.py @@ -1,12 +1,13 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_integer import pandas as pd from pandas import Index, Series from pandas.core.indexes.datetimes import Timestamp -import pandas.util.testing as tm class TestSeriesQuantile: diff --git a/pandas/tests/series/methods/test_rank.py b/pandas/tests/series/methods/test_rank.py index 793e8b7da4965..a33cadc30b7e2 100644 --- a/pandas/tests/series/methods/test_rank.py +++ b/pandas/tests/series/methods/test_rank.py @@ -6,10 +6,10 @@ from pandas._libs.algos import Infinity, NegInfinity from pandas._libs.tslib import iNaT import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import NaT, Series, Timestamp, date_range from pandas.api.types import CategoricalDtype -import pandas.util.testing as tm class TestSeriesRank: diff --git a/pandas/tests/series/methods/test_replace.py b/pandas/tests/series/methods/test_replace.py index 4125b5816422a..135e93fe35557 100644 --- a/pandas/tests/series/methods/test_replace.py +++ b/pandas/tests/series/methods/test_replace.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm class TestSeriesReplace: diff --git a/pandas/tests/series/methods/test_round.py b/pandas/tests/series/methods/test_round.py index 1776468ef5a83..e20aa32e26710 100644 --- a/pandas/tests/series/methods/test_round.py +++ b/pandas/tests/series/methods/test_round.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Series -import pandas.util.testing as tm class TestSeriesRound: diff --git a/pandas/tests/series/methods/test_searchsorted.py b/pandas/tests/series/methods/test_searchsorted.py index 0d6e9635579f0..90754586851ba 100644 --- a/pandas/tests/series/methods/test_searchsorted.py +++ b/pandas/tests/series/methods/test_searchsorted.py @@ -1,8 +1,9 @@ import numpy as np +import pandas.util._testing as tm + from pandas import Series, Timestamp, date_range from pandas.api.types import is_scalar -import pandas.util.testing as tm class TestSeriesSearchSorted: diff --git a/pandas/tests/series/methods/test_shift.py b/pandas/tests/series/methods/test_shift.py index 2cf847c928862..a965a62c7b9b2 100644 --- a/pandas/tests/series/methods/test_shift.py +++ b/pandas/tests/series/methods/test_shift.py @@ -2,6 +2,7 @@ import pytest from pandas.errors import NullFrequencyError +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -13,7 +14,6 @@ date_range, offsets, ) -import pandas.util.testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/methods/test_sort_index.py b/pandas/tests/series/methods/test_sort_index.py index ab15b8c814029..091d9f1b0f456 100644 --- a/pandas/tests/series/methods/test_sort_index.py +++ b/pandas/tests/series/methods/test_sort_index.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import IntervalIndex, MultiIndex, Series -import pandas.util.testing as tm class TestSeriesSortIndex: diff --git a/pandas/tests/series/methods/test_sort_values.py b/pandas/tests/series/methods/test_sort_values.py index 2cea6f061de76..a100672aae73f 100644 --- a/pandas/tests/series/methods/test_sort_values.py +++ b/pandas/tests/series/methods/test_sort_values.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, DataFrame, Series -import pandas.util.testing as tm class TestSeriesSortValues: diff --git a/pandas/tests/series/methods/test_to_dict.py b/pandas/tests/series/methods/test_to_dict.py index 0f1359f99e594..51aeb2245d07a 100644 --- a/pandas/tests/series/methods/test_to_dict.py +++ b/pandas/tests/series/methods/test_to_dict.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + from pandas import Series -import pandas.util.testing as tm class TestSeriesToDict: diff --git a/pandas/tests/series/methods/test_truncate.py b/pandas/tests/series/methods/test_truncate.py index b2bf5e854fbcc..02b4033dcb5b0 100644 --- a/pandas/tests/series/methods/test_truncate.py +++ b/pandas/tests/series/methods/test_truncate.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/methods/test_value_counts.py b/pandas/tests/series/methods/test_value_counts.py index 15d895f44c7b2..1cacfac84d19b 100644 --- a/pandas/tests/series/methods/test_value_counts.py +++ b/pandas/tests/series/methods/test_value_counts.py @@ -1,8 +1,9 @@ import numpy as np +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, CategoricalIndex, Series -import pandas.util.testing as tm class TestSeriesValueCounts: diff --git a/pandas/tests/series/test_alter_axes.py b/pandas/tests/series/test_alter_axes.py index 9e1bae8469138..a7af095f8367e 100644 --- a/pandas/tests/series/test_alter_axes.py +++ b/pandas/tests/series/test_alter_axes.py @@ -3,8 +3,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, RangeIndex, Series -import pandas.util.testing as tm class TestSeriesAlterAxes: diff --git a/pandas/tests/series/test_analytics.py b/pandas/tests/series/test_analytics.py index a88043c7777c4..a6f964af9683e 100644 --- a/pandas/tests/series/test_analytics.py +++ b/pandas/tests/series/test_analytics.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, MultiIndex, Series -import pandas.util.testing as tm class TestSeriesAnalytics: diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index 89a60d371770a..0c495e580dc5e 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -5,6 +5,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -20,7 +22,6 @@ timedelta_range, ) from pandas.core.arrays import PeriodArray -import pandas.util.testing as tm import pandas.io.formats.printing as printing diff --git a/pandas/tests/series/test_apply.py b/pandas/tests/series/test_apply.py index 37bedc1ab7508..5033f9130c769 100644 --- a/pandas/tests/series/test_apply.py +++ b/pandas/tests/series/test_apply.py @@ -4,11 +4,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, isna from pandas.conftest import _get_cython_table_params from pandas.core.base import SpecificationError -import pandas.util.testing as tm class TestSeriesApply: diff --git a/pandas/tests/series/test_arithmetic.py b/pandas/tests/series/test_arithmetic.py index 68d6169fa4f34..582d19148fe47 100644 --- a/pandas/tests/series/test_arithmetic.py +++ b/pandas/tests/series/test_arithmetic.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Series from pandas.core.indexes.period import IncompatibleFrequency -import pandas.util.testing as tm def _permute(obj): diff --git a/pandas/tests/series/test_combine_concat.py b/pandas/tests/series/test_combine_concat.py index 238a413af7a31..dd2a61a0b6f84 100644 --- a/pandas/tests/series/test_combine_concat.py +++ b/pandas/tests/series/test_combine_concat.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series -import pandas.util.testing as tm class TestSeriesCombine: diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index 1c3f1404215d3..3cfef79c3a3f2 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -7,6 +7,7 @@ from pandas._libs import lib from pandas._libs.tslib import iNaT +import pandas.util._testing as tm from pandas.core.dtypes.common import is_categorical_dtype, is_datetime64tz_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -27,7 +28,6 @@ timedelta_range, ) from pandas.core.arrays import period_array -import pandas.util.testing as tm class TestSeriesConstructors: diff --git a/pandas/tests/series/test_cumulative.py b/pandas/tests/series/test_cumulative.py index f72206e42403c..1582480b9c536 100644 --- a/pandas/tests/series/test_cumulative.py +++ b/pandas/tests/series/test_cumulative.py @@ -10,8 +10,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm def _check_accum_op(name, series, check_dtype=True): diff --git a/pandas/tests/series/test_datetime_values.py b/pandas/tests/series/test_datetime_values.py index aa56131f05570..f810495cde4f1 100644 --- a/pandas/tests/series/test_datetime_values.py +++ b/pandas/tests/series/test_datetime_values.py @@ -8,6 +8,7 @@ import pytz from pandas._libs.tslibs.timezones import maybe_get_tz +import pandas.util._testing as tm from pandas.core.dtypes.common import is_integer_dtype, is_list_like @@ -26,7 +27,6 @@ ) from pandas.core.arrays import PeriodArray import pandas.core.common as com -import pandas.util.testing as tm class TestSeriesDatetimeValues: diff --git a/pandas/tests/series/test_dtypes.py b/pandas/tests/series/test_dtypes.py index 69e34a4d97006..b3a5594b664cb 100644 --- a/pandas/tests/series/test_dtypes.py +++ b/pandas/tests/series/test_dtypes.py @@ -7,6 +7,7 @@ import pytest from pandas._libs.tslibs import iNaT +import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype @@ -20,7 +21,6 @@ Timestamp, date_range, ) -import pandas.util.testing as tm class TestSeriesDtypes: diff --git a/pandas/tests/series/test_duplicates.py b/pandas/tests/series/test_duplicates.py index 57d919ccb89ec..9888ee2b9bfe0 100644 --- a/pandas/tests/series/test_duplicates.py +++ b/pandas/tests/series/test_duplicates.py @@ -1,9 +1,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, Series from pandas.core.construction import create_series_with_explicit_dtype -import pandas.util.testing as tm def test_nunique(): diff --git a/pandas/tests/series/test_internals.py b/pandas/tests/series/test_internals.py index efcb500a0b79f..5aab3d05d350c 100644 --- a/pandas/tests/series/test_internals.py +++ b/pandas/tests/series/test_internals.py @@ -3,10 +3,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import NaT, Series, Timestamp from pandas.core.internals.blocks import IntBlock -import pandas.util.testing as tm class TestSeriesInternals: diff --git a/pandas/tests/series/test_io.py b/pandas/tests/series/test_io.py index f53081ac53b01..a790808e5d2c5 100644 --- a/pandas/tests/series/test_io.py +++ b/pandas/tests/series/test_io.py @@ -4,9 +4,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series -import pandas.util.testing as tm from pandas.io.common import get_handle diff --git a/pandas/tests/series/test_missing.py b/pandas/tests/series/test_missing.py index c49cd6930781e..5d5fc7f05404e 100644 --- a/pandas/tests/series/test_missing.py +++ b/pandas/tests/series/test_missing.py @@ -6,6 +6,7 @@ from pandas._libs.tslib import iNaT import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -21,7 +22,6 @@ date_range, isna, ) -import pandas.util.testing as tm def _simple_ts(start, end, freq="D"): diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index 06fe64d69fb6b..b2555e4f07949 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -4,11 +4,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import Categorical, DataFrame, Index, Series, bdate_range, date_range, isna from pandas.core import ops import pandas.core.nanops as nanops -import pandas.util.testing as tm class TestSeriesLogicalOps: diff --git a/pandas/tests/series/test_period.py b/pandas/tests/series/test_period.py index 4aeb211170d8f..7cdaedf991620 100644 --- a/pandas/tests/series/test_period.py +++ b/pandas/tests/series/test_period.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Period, Series, period_range from pandas.core.arrays import PeriodArray -import pandas.util.testing as tm class TestSeriesPeriod: diff --git a/pandas/tests/series/test_repr.py b/pandas/tests/series/test_repr.py index 008ae50e4cde5..2b3d56e064ac9 100644 --- a/pandas/tests/series/test_repr.py +++ b/pandas/tests/series/test_repr.py @@ -3,6 +3,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import ( Categorical, @@ -15,7 +17,6 @@ period_range, timedelta_range, ) -import pandas.util.testing as tm class TestSeriesRepr: diff --git a/pandas/tests/series/test_subclass.py b/pandas/tests/series/test_subclass.py index 5e2d23a70e5be..06b38bd3c5058 100644 --- a/pandas/tests/series/test_subclass.py +++ b/pandas/tests/series/test_subclass.py @@ -1,4 +1,4 @@ -import pandas.util.testing as tm +import pandas.util._testing as tm class TestSeriesSubclassing: diff --git a/pandas/tests/series/test_timeseries.py b/pandas/tests/series/test_timeseries.py index c3e5e8b975cda..2cdd5d102fca9 100644 --- a/pandas/tests/series/test_timeseries.py +++ b/pandas/tests/series/test_timeseries.py @@ -8,6 +8,7 @@ from pandas._libs.tslib import iNaT from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -21,7 +22,6 @@ timedelta_range, to_datetime, ) -import pandas.util.testing as tm from pandas.tseries.offsets import BDay, BMonthEnd diff --git a/pandas/tests/series/test_timezones.py b/pandas/tests/series/test_timezones.py index 5e255e7cd5dcd..22ebfb681de18 100644 --- a/pandas/tests/series/test_timezones.py +++ b/pandas/tests/series/test_timezones.py @@ -9,10 +9,10 @@ import pytz from pandas._libs.tslibs import conversion, timezones +import pandas.util._testing as tm from pandas import DatetimeIndex, Index, NaT, Series, Timestamp from pandas.core.indexes.datetimes import date_range -import pandas.util.testing as tm class TestSeriesTimezones: diff --git a/pandas/tests/series/test_ufunc.py b/pandas/tests/series/test_ufunc.py index 120eaeaf785b0..0eded2c2195e4 100644 --- a/pandas/tests/series/test_ufunc.py +++ b/pandas/tests/series/test_ufunc.py @@ -4,8 +4,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm UNARY_UFUNCS = [np.positive, np.floor, np.exp] BINARY_UFUNCS = [np.add, np.logaddexp] # dunder op diff --git a/pandas/tests/test_algos.py b/pandas/tests/test_algos.py index 82f647c9385b2..b20d430146e68 100644 --- a/pandas/tests/test_algos.py +++ b/pandas/tests/test_algos.py @@ -9,6 +9,7 @@ from pandas._libs import algos as libalgos, groupby as libgroupby, hashtable as ht from pandas.compat.numpy import np_array_datetime64_compat import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.common import ( is_bool_dtype, @@ -34,7 +35,6 @@ import pandas.core.algorithms as algos from pandas.core.arrays import DatetimeArray import pandas.core.common as com -import pandas.util.testing as tm class TestFactorize: diff --git a/pandas/tests/test_downstream.py b/pandas/tests/test_downstream.py index 12d834131f71b..91ff2a9f5cccd 100644 --- a/pandas/tests/test_downstream.py +++ b/pandas/tests/test_downstream.py @@ -8,8 +8,9 @@ import numpy as np # noqa import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series -import pandas.util.testing as tm def import_module(name): diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py index 9808c3d78b436..d694eb3463416 100644 --- a/pandas/tests/test_expressions.py +++ b/pandas/tests/test_expressions.py @@ -5,9 +5,10 @@ from numpy.random import randn import pytest +import pandas.util._testing as tm + from pandas.core.api import DataFrame from pandas.core.computation import expressions as expr -import pandas.util.testing as tm _frame = DataFrame(randn(10000, 4), columns=list("ABCD"), dtype="float64") _frame2 = DataFrame(randn(100, 4), columns=list("ABCD"), dtype="float64") diff --git a/pandas/tests/test_join.py b/pandas/tests/test_join.py index 8940a82b33777..053305ee882d6 100644 --- a/pandas/tests/test_join.py +++ b/pandas/tests/test_join.py @@ -2,9 +2,9 @@ import pytest from pandas._libs import join as _join +import pandas.util._testing as tm from pandas import Categorical, DataFrame, Index, merge -import pandas.util.testing as tm class TestIndexer: diff --git a/pandas/tests/test_lib.py b/pandas/tests/test_lib.py index 77841f0bb9f0d..fa79c1f5cc0fd 100644 --- a/pandas/tests/test_lib.py +++ b/pandas/tests/test_lib.py @@ -2,9 +2,9 @@ import pytest from pandas._libs import lib, writers as libwriters +import pandas.util._testing as tm from pandas import Index -import pandas.util.testing as tm class TestMisc: diff --git a/pandas/tests/test_multilevel.py b/pandas/tests/test_multilevel.py index 39c122addd8b1..a315760dce213 100644 --- a/pandas/tests/test_multilevel.py +++ b/pandas/tests/test_multilevel.py @@ -8,11 +8,12 @@ import pytest import pytz +import pandas.util._testing as tm + from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, isna -import pandas.util.testing as tm AGG_FUNCTIONS = [ "sum", diff --git a/pandas/tests/test_nanops.py b/pandas/tests/test_nanops.py index c207c803510ca..410e3484a6640 100644 --- a/pandas/tests/test_nanops.py +++ b/pandas/tests/test_nanops.py @@ -6,6 +6,7 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas.core.dtypes.common import is_integer_dtype @@ -13,7 +14,6 @@ from pandas import Series, isna from pandas.core.arrays import DatetimeArray import pandas.core.nanops as nanops -import pandas.util.testing as tm use_bn = nanops._USE_BOTTLENECK has_c16 = hasattr(np, "complex128") diff --git a/pandas/tests/test_optional_dependency.py b/pandas/tests/test_optional_dependency.py index cd154ed5fe570..41435b8839c07 100644 --- a/pandas/tests/test_optional_dependency.py +++ b/pandas/tests/test_optional_dependency.py @@ -4,8 +4,7 @@ import pytest from pandas.compat._optional import VERSIONS, import_optional_dependency - -import pandas.util.testing as tm +import pandas.util._testing as tm def test_import_optional(): diff --git a/pandas/tests/test_register_accessor.py b/pandas/tests/test_register_accessor.py index 6b40ff8b3fa1e..dffc7a031d547 100644 --- a/pandas/tests/test_register_accessor.py +++ b/pandas/tests/test_register_accessor.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + import pandas as pd -import pandas.util.testing as tm @contextlib.contextmanager diff --git a/pandas/tests/test_sorting.py b/pandas/tests/test_sorting.py index 90cd9cc3e006d..7c277d945627d 100644 --- a/pandas/tests/test_sorting.py +++ b/pandas/tests/test_sorting.py @@ -5,6 +5,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, MultiIndex, Series, array, concat, merge from pandas.core.algorithms import safe_sort import pandas.core.common as com @@ -15,7 +17,6 @@ lexsort_indexer, nargsort, ) -import pandas.util.testing as tm class TestSorting: diff --git a/pandas/tests/test_strings.py b/pandas/tests/test_strings.py index ae7ab6addc3fb..796f7aeb31946 100644 --- a/pandas/tests/test_strings.py +++ b/pandas/tests/test_strings.py @@ -6,10 +6,10 @@ import pytest from pandas._libs import lib +import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex, Series, concat, isna, notna import pandas.core.strings as strings -import pandas.util.testing as tm def assert_series_or_index_equal(left, right): diff --git a/pandas/tests/test_take.py b/pandas/tests/test_take.py index d2a9e1dc94bb5..4511637055627 100644 --- a/pandas/tests/test_take.py +++ b/pandas/tests/test_take.py @@ -5,9 +5,9 @@ import pytest from pandas._libs.tslib import iNaT +import pandas.util._testing as tm import pandas.core.algorithms as algos -import pandas.util.testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/tools/test_numeric.py b/pandas/tests/tools/test_numeric.py index 082277796e602..bc46bde8779e0 100644 --- a/pandas/tests/tools/test_numeric.py +++ b/pandas/tests/tools/test_numeric.py @@ -4,9 +4,10 @@ from numpy import iinfo import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, Series, to_numeric -import pandas.util.testing as tm @pytest.fixture(params=[None, "ignore", "raise", "coerce"]) diff --git a/pandas/tests/tseries/frequencies/test_inference.py b/pandas/tests/tseries/frequencies/test_inference.py index 250c37cdadbe4..babd9117e3be1 100644 --- a/pandas/tests/tseries/frequencies/test_inference.py +++ b/pandas/tests/tseries/frequencies/test_inference.py @@ -6,10 +6,10 @@ from pandas._libs.tslibs.ccalendar import DAYS, MONTHS from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG from pandas.compat import is_platform_windows +import pandas.util._testing as tm from pandas import DatetimeIndex, Index, Series, Timestamp, date_range, period_range from pandas.core.tools.datetimes import to_datetime -import pandas.util.testing as tm import pandas.tseries.frequencies as frequencies import pandas.tseries.offsets as offsets diff --git a/pandas/tests/tseries/holiday/test_calendar.py b/pandas/tests/tseries/holiday/test_calendar.py index c122f92ed228c..becb7ce8cf414 100644 --- a/pandas/tests/tseries/holiday/test_calendar.py +++ b/pandas/tests/tseries/holiday/test_calendar.py @@ -2,8 +2,9 @@ import pytest +import pandas.util._testing as tm + from pandas import DatetimeIndex, offsets, to_datetime -import pandas.util.testing as tm from pandas.tseries.holiday import ( AbstractHolidayCalendar, diff --git a/pandas/tests/tseries/holiday/test_holiday.py b/pandas/tests/tseries/holiday/test_holiday.py index 7748b965f8962..927266a3efc2a 100644 --- a/pandas/tests/tseries/holiday/test_holiday.py +++ b/pandas/tests/tseries/holiday/test_holiday.py @@ -3,7 +3,7 @@ import pytest from pytz import utc -import pandas.util.testing as tm +import pandas.util._testing as tm from pandas.tseries.holiday import ( MO, diff --git a/pandas/tests/tseries/offsets/test_fiscal.py b/pandas/tests/tseries/offsets/test_fiscal.py index 9ab722b866c76..ae083ddfe7b60 100644 --- a/pandas/tests/tseries/offsets/test_fiscal.py +++ b/pandas/tests/tseries/offsets/test_fiscal.py @@ -7,9 +7,9 @@ import pytest from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG +import pandas.util._testing as tm from pandas import Timestamp -import pandas.util.testing as tm from pandas.tseries.frequencies import get_offset from pandas.tseries.offsets import FY5253, FY5253Quarter diff --git a/pandas/tests/tseries/offsets/test_offsets.py b/pandas/tests/tseries/offsets/test_offsets.py index fcabc0bee85b6..3e54cd01d6f58 100644 --- a/pandas/tests/tseries/offsets/test_offsets.py +++ b/pandas/tests/tseries/offsets/test_offsets.py @@ -21,10 +21,10 @@ import pandas.compat as compat from pandas.compat.numpy import np_datetime64_compat from pandas.errors import PerformanceWarning +import pandas.util._testing as tm from pandas.core.indexes.datetimes import DatetimeIndex, _to_M8, date_range from pandas.core.series import Series -import pandas.util.testing as tm from pandas.io.pickle import read_pickle from pandas.tseries.frequencies import _get_offset, _offset_map diff --git a/pandas/tests/tseries/offsets/test_ticks.py b/pandas/tests/tseries/offsets/test_ticks.py index 2914d4ddf0da0..993737b2c50d9 100644 --- a/pandas/tests/tseries/offsets/test_ticks.py +++ b/pandas/tests/tseries/offsets/test_ticks.py @@ -7,8 +7,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Timedelta, Timestamp -import pandas.util.testing as tm from pandas.tseries import offsets from pandas.tseries.offsets import Hour, Micro, Milli, Minute, Nano, Second diff --git a/pandas/tests/tslibs/test_array_to_datetime.py b/pandas/tests/tslibs/test_array_to_datetime.py index 5cf2165993cd7..30743c349b187 100644 --- a/pandas/tests/tslibs/test_array_to_datetime.py +++ b/pandas/tests/tslibs/test_array_to_datetime.py @@ -7,9 +7,9 @@ from pandas._libs import iNaT, tslib from pandas.compat.numpy import np_array_datetime64_compat +import pandas.util._testing as tm from pandas import Timestamp -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/tslibs/test_conversion.py b/pandas/tests/tslibs/test_conversion.py index 6c30e2b6c7a1c..cd6bbf512218e 100644 --- a/pandas/tests/tslibs/test_conversion.py +++ b/pandas/tests/tslibs/test_conversion.py @@ -6,9 +6,9 @@ from pandas._libs.tslib import iNaT from pandas._libs.tslibs import conversion, timezones, tzconversion +import pandas.util._testing as tm from pandas import Timestamp, date_range -import pandas.util.testing as tm def _compare_utc_to_local(tz_didx): diff --git a/pandas/tests/tslibs/test_fields.py b/pandas/tests/tslibs/test_fields.py index cd729956a027c..92497c0506afd 100644 --- a/pandas/tests/tslibs/test_fields.py +++ b/pandas/tests/tslibs/test_fields.py @@ -1,8 +1,7 @@ import numpy as np from pandas._libs.tslibs import fields - -import pandas.util.testing as tm +import pandas.util._testing as tm def test_fields_readonly(): diff --git a/pandas/tests/tslibs/test_parsing.py b/pandas/tests/tslibs/test_parsing.py index 0bc30347b3fa9..85f5b12563a61 100644 --- a/pandas/tests/tslibs/test_parsing.py +++ b/pandas/tests/tslibs/test_parsing.py @@ -10,8 +10,7 @@ from pandas._libs.tslibs import parsing from pandas._libs.tslibs.parsing import parse_time_string import pandas.util._test_decorators as td - -import pandas.util.testing as tm +import pandas.util._testing as tm def test_parse_time_string(): diff --git a/pandas/tests/util/test_assert_almost_equal.py b/pandas/tests/util/test_assert_almost_equal.py index f430e2893ca33..e43fed6aac3d7 100644 --- a/pandas/tests/util/test_assert_almost_equal.py +++ b/pandas/tests/util/test_assert_almost_equal.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, Series, Timestamp -import pandas.util.testing as tm def _assert_almost_equal_both(a, b, **kwargs): diff --git a/pandas/tests/util/test_assert_categorical_equal.py b/pandas/tests/util/test_assert_categorical_equal.py index 44400498ddc64..7d939c3d9a76d 100644 --- a/pandas/tests/util/test_assert_categorical_equal.py +++ b/pandas/tests/util/test_assert_categorical_equal.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + from pandas import Categorical -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/util/test_assert_extension_array_equal.py b/pandas/tests/util/test_assert_extension_array_equal.py index cecf9273004d7..c9da990be6360 100644 --- a/pandas/tests/util/test_assert_extension_array_equal.py +++ b/pandas/tests/util/test_assert_extension_array_equal.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas.core.arrays.sparse import SparseArray -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/util/test_assert_frame_equal.py b/pandas/tests/util/test_assert_frame_equal.py index b46a8460a28b2..ad98dfa361282 100644 --- a/pandas/tests/util/test_assert_frame_equal.py +++ b/pandas/tests/util/test_assert_frame_equal.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + from pandas import DataFrame -import pandas.util.testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/util/test_assert_index_equal.py b/pandas/tests/util/test_assert_index_equal.py index 8c3f242f0c96b..282b1552e369e 100644 --- a/pandas/tests/util/test_assert_index_equal.py +++ b/pandas/tests/util/test_assert_index_equal.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Categorical, Index, MultiIndex, NaT -import pandas.util.testing as tm def test_index_equal_levels_mismatch(): diff --git a/pandas/tests/util/test_assert_interval_array_equal.py b/pandas/tests/util/test_assert_interval_array_equal.py index b264b484a04ab..580a44ed2a70e 100644 --- a/pandas/tests/util/test_assert_interval_array_equal.py +++ b/pandas/tests/util/test_assert_interval_array_equal.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + from pandas import interval_range -import pandas.util.testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/util/test_assert_numpy_array_equal.py b/pandas/tests/util/test_assert_numpy_array_equal.py index 53bcedf3a16f1..b8639dd96f799 100644 --- a/pandas/tests/util/test_assert_numpy_array_equal.py +++ b/pandas/tests/util/test_assert_numpy_array_equal.py @@ -1,8 +1,9 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import Timestamp -import pandas.util.testing as tm def test_assert_numpy_array_equal_shape_mismatch(): diff --git a/pandas/tests/util/test_assert_produces_warning.py b/pandas/tests/util/test_assert_produces_warning.py index c681817896903..95a2c401dcd3f 100644 --- a/pandas/tests/util/test_assert_produces_warning.py +++ b/pandas/tests/util/test_assert_produces_warning.py @@ -2,7 +2,7 @@ import pytest -import pandas.util.testing as tm +import pandas.util._testing as tm def f(): diff --git a/pandas/tests/util/test_assert_series_equal.py b/pandas/tests/util/test_assert_series_equal.py index 0a6047c4662ba..8699ecdb4c7b9 100644 --- a/pandas/tests/util/test_assert_series_equal.py +++ b/pandas/tests/util/test_assert_series_equal.py @@ -1,7 +1,8 @@ import pytest +import pandas.util._testing as tm + from pandas import Categorical, DataFrame, Series -import pandas.util.testing as tm def _assert_series_equal_both(a, b, **kwargs): diff --git a/pandas/tests/util/test_deprecate.py b/pandas/tests/util/test_deprecate.py index 8fbc8037ed7c5..21b00809956e1 100644 --- a/pandas/tests/util/test_deprecate.py +++ b/pandas/tests/util/test_deprecate.py @@ -3,8 +3,7 @@ import pytest from pandas.util._decorators import deprecate - -import pandas.util.testing as tm +import pandas.util._testing as tm def new_func(): diff --git a/pandas/tests/util/test_deprecate_kwarg.py b/pandas/tests/util/test_deprecate_kwarg.py index c17c48197ccf7..ebdaaaacc537c 100644 --- a/pandas/tests/util/test_deprecate_kwarg.py +++ b/pandas/tests/util/test_deprecate_kwarg.py @@ -1,8 +1,7 @@ import pytest from pandas.util._decorators import deprecate_kwarg - -import pandas.util.testing as tm +import pandas.util._testing as tm @deprecate_kwarg("old", "new") diff --git a/pandas/tests/util/test_hashing.py b/pandas/tests/util/test_hashing.py index ee9c4ed12bd92..dcdaff984c7ca 100644 --- a/pandas/tests/util/test_hashing.py +++ b/pandas/tests/util/test_hashing.py @@ -3,11 +3,12 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series from pandas.core.util.hashing import _hash_scalar, hash_tuple, hash_tuples from pandas.util import hash_array, hash_pandas_object -import pandas.util.testing as tm @pytest.fixture( diff --git a/pandas/tests/util/test_util.py b/pandas/tests/util/test_util.py index 60124c8e943ad..1659bffcfc5fe 100644 --- a/pandas/tests/util/test_util.py +++ b/pandas/tests/util/test_util.py @@ -3,8 +3,7 @@ import pytest import pandas.compat as compat - -import pandas.util.testing as tm +import pandas.util._testing as tm def test_rands(): diff --git a/pandas/tests/window/common.py b/pandas/tests/window/common.py index 77f59bf919168..1194d792abe86 100644 --- a/pandas/tests/window/common.py +++ b/pandas/tests/window/common.py @@ -3,8 +3,9 @@ import numpy as np from numpy.random import randn +import pandas.util._testing as tm + from pandas import DataFrame, Series, bdate_range, notna -import pandas.util.testing as tm N, K = 100, 10 diff --git a/pandas/tests/window/moments/test_moments_ewm.py b/pandas/tests/window/moments/test_moments_ewm.py index 489c1ff14ecfd..1fd3e60c7c936 100644 --- a/pandas/tests/window/moments/test_moments_ewm.py +++ b/pandas/tests/window/moments/test_moments_ewm.py @@ -2,10 +2,11 @@ from numpy.random import randn import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series, concat from pandas.tests.window.common import Base, ConsistencyBase -import pandas.util.testing as tm @pytest.mark.filterwarnings("ignore:can't resolve package:ImportWarning") diff --git a/pandas/tests/window/moments/test_moments_expanding.py b/pandas/tests/window/moments/test_moments_expanding.py index 507fd2e2fb3ba..41654056930b2 100644 --- a/pandas/tests/window/moments/test_moments_expanding.py +++ b/pandas/tests/window/moments/test_moments_expanding.py @@ -4,9 +4,10 @@ from numpy.random import randn import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Index, MultiIndex, Series, isna, notna from pandas.tests.window.common import ConsistencyBase -import pandas.util.testing as tm class TestExpandingMomentsConsistency(ConsistencyBase): diff --git a/pandas/tests/window/moments/test_moments_rolling.py b/pandas/tests/window/moments/test_moments_rolling.py index c110ed172ecb9..4eeb3e4ce32bb 100644 --- a/pandas/tests/window/moments/test_moments_rolling.py +++ b/pandas/tests/window/moments/test_moments_rolling.py @@ -7,12 +7,12 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series, isna, notna from pandas.core.window.common import _flex_binary_moment from pandas.tests.window.common import Base, ConsistencyBase -import pandas.util.testing as tm import pandas.tseries.offsets as offsets diff --git a/pandas/tests/window/test_api.py b/pandas/tests/window/test_api.py index 5085576cc96f0..09265245c9ca0 100644 --- a/pandas/tests/window/test_api.py +++ b/pandas/tests/window/test_api.py @@ -4,12 +4,12 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, concat from pandas.core.base import SpecificationError from pandas.tests.window.common import Base -import pandas.util.testing as tm class TestApi(Base): diff --git a/pandas/tests/window/test_apply.py b/pandas/tests/window/test_apply.py index 4b56cbd48c388..a8dc2d72ee156 100644 --- a/pandas/tests/window/test_apply.py +++ b/pandas/tests/window/test_apply.py @@ -2,9 +2,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import DataFrame, Series, Timestamp, date_range -import pandas.util.testing as tm @pytest.mark.parametrize("bad_raw", [None, 1, 0]) diff --git a/pandas/tests/window/test_base_indexer.py b/pandas/tests/window/test_base_indexer.py index 6a3f2c19babdc..ada15c652dad0 100644 --- a/pandas/tests/window/test_base_indexer.py +++ b/pandas/tests/window/test_base_indexer.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series from pandas.api.indexers import BaseIndexer from pandas.core.window.indexers import ExpandingIndexer -import pandas.util.testing as tm def test_bad_get_window_bounds_signature(): diff --git a/pandas/tests/window/test_dtypes.py b/pandas/tests/window/test_dtypes.py index 9d023034c570a..cb9234525c5bc 100644 --- a/pandas/tests/window/test_dtypes.py +++ b/pandas/tests/window/test_dtypes.py @@ -3,9 +3,10 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series from pandas.core.base import DataError -import pandas.util.testing as tm # gh-12373 : rolling functions error on float32 data # make sure rolling functions works for different dtypes diff --git a/pandas/tests/window/test_expanding.py b/pandas/tests/window/test_expanding.py index 098acdff93ac6..60c227d03a569 100644 --- a/pandas/tests/window/test_expanding.py +++ b/pandas/tests/window/test_expanding.py @@ -2,12 +2,12 @@ import pytest from pandas.errors import UnsupportedFunctionCall +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series from pandas.core.window import Expanding from pandas.tests.window.common import Base -import pandas.util.testing as tm class TestExpanding(Base): diff --git a/pandas/tests/window/test_grouper.py b/pandas/tests/window/test_grouper.py index 189942bc07d2a..353516733480e 100644 --- a/pandas/tests/window/test_grouper.py +++ b/pandas/tests/window/test_grouper.py @@ -1,10 +1,11 @@ import numpy as np import pytest +import pandas.util._testing as tm + import pandas as pd from pandas import DataFrame, Series from pandas.core.groupby.groupby import get_groupby -import pandas.util.testing as tm class TestGrouperGrouping: diff --git a/pandas/tests/window/test_numba.py b/pandas/tests/window/test_numba.py index 2fbf05f678431..52dabc948502e 100644 --- a/pandas/tests/window/test_numba.py +++ b/pandas/tests/window/test_numba.py @@ -2,9 +2,9 @@ import pytest import pandas.util._test_decorators as td +import pandas.util._testing as tm from pandas import Series -import pandas.util.testing as tm @td.skip_if_no("numba", "0.46.0") diff --git a/pandas/tests/window/test_pairwise.py b/pandas/tests/window/test_pairwise.py index 6f6d4c09526ff..f1237d9c0863a 100644 --- a/pandas/tests/window/test_pairwise.py +++ b/pandas/tests/window/test_pairwise.py @@ -2,9 +2,10 @@ import pytest +import pandas.util._testing as tm + from pandas import DataFrame, Series from pandas.core.algorithms import safe_sort -import pandas.util.testing as tm class TestPairwise: diff --git a/pandas/tests/window/test_rolling.py b/pandas/tests/window/test_rolling.py index 227055eb222f8..2dae4e938db03 100644 --- a/pandas/tests/window/test_rolling.py +++ b/pandas/tests/window/test_rolling.py @@ -5,12 +5,12 @@ from pandas.errors import UnsupportedFunctionCall import pandas.util._test_decorators as td +import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series from pandas.core.window import Rolling from pandas.tests.window.common import Base -import pandas.util.testing as tm class TestRolling(Base): diff --git a/pandas/tests/window/test_timeseries_window.py b/pandas/tests/window/test_timeseries_window.py index c0d47fc2ca624..36e3b9f703a14 100644 --- a/pandas/tests/window/test_timeseries_window.py +++ b/pandas/tests/window/test_timeseries_window.py @@ -1,6 +1,8 @@ import numpy as np import pytest +import pandas.util._testing as tm + from pandas import ( DataFrame, Index, @@ -10,7 +12,6 @@ date_range, to_datetime, ) -import pandas.util.testing as tm import pandas.tseries.offsets as offsets diff --git a/pandas/util/_testing.py b/pandas/util/_testing.py index 2e201339d4d77..1d207670d52ce 100644 --- a/pandas/util/_testing.py +++ b/pandas/util/_testing.py @@ -1273,7 +1273,7 @@ def assert_frame_equal( This example shows comparing two DataFrames that are equal but with columns of differing dtypes. - >>> from pandas.util.testing import assert_frame_equal + >>> from pandas.util._testing import assert_frame_equal >>> df1 = pd.DataFrame({'a': [1, 2], 'b': [3, 4]}) >>> df2 = pd.DataFrame({'a': [1, 2], 'b': [3.0, 4.0]}) @@ -2281,7 +2281,7 @@ def network( Tests decorated with @network will fail if it's possible to make a network connection to another URL (defaults to google.com):: - >>> from pandas.util.testing import network + >>> from pandas.util._testing import network >>> from pandas.io.common import urlopen >>> @network ... def test_network(): diff --git a/scripts/list_future_warnings.sh b/scripts/list_future_warnings.sh index 0c4046bbb5f49..3f6c311c412fe 100755 --- a/scripts/list_future_warnings.sh +++ b/scripts/list_future_warnings.sh @@ -25,7 +25,7 @@ EXCLUDE="^pandas/tests/|" # tests validate that FutureWarnings are raised EXCLUDE+="^pandas/util/_decorators.py$|" # generic deprecate function that raises warning EXCLUDE+="^pandas/util/_depr_module.py$|" # generic deprecate module that raises warnings -EXCLUDE+="^pandas/util/testing.py$|" # contains function to evaluate if warning is raised +EXCLUDE+="^pandas.util._testing.py$|" # contains function to evaluate if warning is raised EXCLUDE+="^pandas/io/parsers.py$" # implements generic deprecation system in io reading BASE_DIR="$(dirname $0)/.." diff --git a/setup.cfg b/setup.cfg index 96af78c77feb8..d0f9c7ac881d9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -340,5 +340,5 @@ check_untyped_defs=False [mypy-pandas.tseries.offsets] check_untyped_defs=False -[mypy-pandas.util.testing] +[mypy-pandas.util._testing] check_untyped_defs=False From 12218a08cc878f55aae9e83a05023dc11ceaaff8 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 11:09:20 -0600 Subject: [PATCH 03/17] Deprecate --- pandas/testing.py | 28 +++++- pandas/util/__init__.py | 1 + pandas/util/testing/__init__.py | 145 ++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 pandas/util/testing/__init__.py diff --git a/pandas/testing.py b/pandas/testing.py index 25cb4ad104e9c..59a20933baf92 100644 --- a/pandas/testing.py +++ b/pandas/testing.py @@ -1,11 +1,35 @@ -# flake8: noqa - """ Public testing utility functions. """ from pandas.util._testing import ( + assert_almost_equal, + assert_categorical_equal, + assert_datetime_array_equal, + assert_equal, + assert_extension_array_equal, assert_frame_equal, assert_index_equal, + assert_interval_array_equal, + assert_numpy_array_equal, + assert_period_array_equal, assert_series_equal, + assert_sp_array_equal, + assert_timedelta_array_equal, ) + +__all__ = [ + "assert_frame_equal", + "assert_series_equal", + "assert_index_equal", + "assert_equal", + "assert_almost_equal", + "assert_categorical_equal", + "assert_datetime_array_equal", + "assert_extension_array_equal", + "assert_interval_array_equal", + "assert_numpy_array_equal", + "assert_period_array_equal", + "assert_sp_array_equal", + "assert_timedelta_array_equal", +] diff --git a/pandas/util/__init__.py b/pandas/util/__init__.py index d906c0371d207..231a23e247650 100644 --- a/pandas/util/__init__.py +++ b/pandas/util/__init__.py @@ -1,3 +1,4 @@ from pandas.util._decorators import Appender, Substitution, cache_readonly # noqa from pandas.core.util.hashing import hash_array, hash_pandas_object # noqa +from pandas.util.testing import testing # noqa: F401 diff --git a/pandas/util/testing/__init__.py b/pandas/util/testing/__init__.py new file mode 100644 index 0000000000000..201ef28757191 --- /dev/null +++ b/pandas/util/testing/__init__.py @@ -0,0 +1,145 @@ +from pandas.util._depr_module import _DeprecatedModule + +_removals = [ + "Categorical", + "CategoricalIndex", + "Counter", + "DataFrame", + "DatetimeArray", + "DatetimeIndex", + "ExtensionArray", + "FrameOrSeries", + "Index", + "IntervalArray", + "IntervalIndex", + "K", + "List", + "MultiIndex", + "N", + "Optional", + "PeriodArray", + "RANDS_CHARS", + "RANDU_CHARS", + "RNGContext", + "RangeIndex", + "Series", + "SubclassedCategorical", + "SubclassedDataFrame", + "SubclassedSeries", + "TimedeltaArray", + "Union", + "all_index_generator", + "all_timeseries_index_generator", + "array_equivalent", + "assert_attr_equal", + "assert_class_equal", + "assert_contains_all", + "assert_copy", + "assert_dict_equal", + "assert_is_sorted", + "assert_is_valid_plot_return_object", + "assert_period_array_equal", + "assert_produces_warning", + "bdate_range", + "box_expected", + "bz2", + "can_connect", + "can_set_locale", + "cast", + "close", + "contextmanager", + "convert_rows_list_to_csv_str", + "datetime", + "decompress_file", + "ensure_clean", + "ensure_clean_dir", + "ensure_safe_environment_variables", + "equalContents", + "getCols", + "getMixedTypeDict", + "getPeriodData", + "getSeriesData", + "getTimeSeriesData", + "get_locales", + "gzip", + "index_subclass_makers_generator", + "is_bool", + "is_categorical_dtype", + "is_datetime64_dtype", + "is_datetime64tz_dtype", + "is_extension_array_dtype", + "is_interval_dtype", + "is_list_like", + "is_number", + "is_period_dtype", + "is_sequence", + "is_timedelta64_dtype", + "isiterable", + "lzma", + "makeBoolIndex", + "makeCategoricalIndex", + "makeCustomDataframe", + "makeCustomIndex", + "makeDataFrame", + "makeDateIndex", + "makeFloatIndex", + "makeFloatSeries", + "makeIntIndex", + "makeIntervalIndex", + "makeMissingCustomDataframe", + "makeMissingDataframe", + "makeMixedDataFrame", + "makeMultiIndex", + "makeObjectSeries", + "makePeriodFrame", + "makePeriodIndex", + "makePeriodSeries", + "makeRangeIndex", + "makeStringIndex", + "makeStringSeries", + "makeTimeDataFrame", + "makeTimeSeries", + "makeTimedeltaIndex", + "makeUIntIndex", + "makeUnicodeIndex", + "needs_i8_conversion", + "network", + "np", + "optional_args", + "os", + "pd", + "period_array", + "pprint_thing", + "raise_assert_detail", + "rand", + "randbool", + "randn", + "rands", + "rands_array", + "randu", + "randu_array", + "reset_display_options", + "reset_testing_mode", + "rmtree", + "round_trip_localpath", + "round_trip_pathlib", + "round_trip_pickle", + "set_locale", + "set_testing_mode", + "set_timezone", + "string", + "take_1d", + "tempfile", + "test_parallel", + "to_array", + "urlopen", + "use_numexpr", + "warnings", + "with_connectivity_check", + "with_csv_dialect", + "wraps", + "write_to_compressed", + "zipfile", +] + +testing = _DeprecatedModule("pandas.util._testing", "pandas.testing", _removals) From d06428704dbd3616adc16f9331c76f8b5dd20bfa Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 11:16:44 -0600 Subject: [PATCH 04/17] update --- pandas/tests/api/test_api.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index ebf37ed7a1ced..33822bd52e666 100644 --- a/pandas/tests/api/test_api.py +++ b/pandas/tests/api/test_api.py @@ -267,7 +267,21 @@ def test_api(self): class TestTesting(Base): - funcs = ["assert_frame_equal", "assert_series_equal", "assert_index_equal"] + funcs = [ + "assert_frame_equal", + "assert_series_equal", + "assert_index_equal", + "assert_equal", + "assert_almost_equal", + "assert_categorical_equal", + "assert_datetime_array_equal", + "assert_extension_array_equal", + "assert_interval_array_equal", + "assert_numpy_array_equal", + "assert_period_array_equal", + "assert_sp_array_equal", + "assert_timedelta_array_equal", + ] def test_testing(self): from pandas import testing From fa7f52f1a6975e7360837dc5cb16add7c4a16c4c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 11:21:25 -0600 Subject: [PATCH 05/17] test --- pandas/tests/api/test_api.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index 33822bd52e666..2d0bc410bd43c 100644 --- a/pandas/tests/api/test_api.py +++ b/pandas/tests/api/test_api.py @@ -287,3 +287,16 @@ def test_testing(self): from pandas import testing self.check(testing, self.funcs) + + def test_util_testing_deprecated(self): + s = pd.Series([], dtype="object") + with tm.assert_produces_warning(FutureWarning) as m: + import pandas.util.testing as tm2 + + tm2.assert_series_equal(s, s) + + assert "pandas.testing.assert_series_equal" in str(m[0].message) + + with tm.assert_produces_warning(FutureWarning) as m: + tm2.DataFrame + assert "removed" in str(m[0].message) From 5fad441a06e547f0ca086038e646055328554602 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 11:23:11 -0600 Subject: [PATCH 06/17] doc --- doc/source/reference/general_utility_functions.rst | 12 ++++++++++++ doc/source/whatsnew/v1.0.0.rst | 1 + 2 files changed, 13 insertions(+) diff --git a/doc/source/reference/general_utility_functions.rst b/doc/source/reference/general_utility_functions.rst index 0961acc43f301..e2e47d9f87960 100644 --- a/doc/source/reference/general_utility_functions.rst +++ b/doc/source/reference/general_utility_functions.rst @@ -18,6 +18,8 @@ Working with options set_option option_context +.. _api.general.testing: + Testing functions ----------------- .. autosummary:: @@ -26,6 +28,16 @@ Testing functions testing.assert_frame_equal testing.assert_series_equal testing.assert_index_equal + testing.assert_equal + testing.assert_almost_equal + testing.assert_categorical_equal + testing.assert_datetime_array_equal + testing.assert_extension_array_equal + testing.assert_interval_array_equal + testing.assert_numpy_array_equal + testing.assert_period_array_equal + testing.assert_sp_array_equal + testing.assert_timedelta_array_equal Exceptions and warnings ----------------------- diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index 1cd082374a440..d5fcf648ab511 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -586,6 +586,7 @@ Deprecations it is recommended to use ``json_normalize`` as :func:`pandas.json_normalize` instead (:issue:`27586`). - :meth:`DataFrame.to_stata`, :meth:`DataFrame.to_feather`, and :meth:`DataFrame.to_parquet` argument "fname" is deprecated, use "path" instead (:issue:`23574`) - The deprecated internal attributes ``_start``, ``_stop`` and ``_step`` of :class:`RangeIndex` now raise a ``FutureWarning`` instead of a ``DeprecationWarning`` (:issue:`26581`) +- The ``pandas.util.testing`` module has been deprecated. Use the public API in ``pandas.testing`` documented at :ref:`api.general.testing` (:issue:`16232`). .. _whatsnew_1000.prior_deprecations: From 7dd925e9df28203351d545c2cd9c2a9a48bd7cec Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 11:58:14 -0600 Subject: [PATCH 07/17] update --- pandas/tests/groupby/test_function.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/groupby/test_function.py b/pandas/tests/groupby/test_function.py index c41c9b4db053a..81765eb898f2a 100644 --- a/pandas/tests/groupby/test_function.py +++ b/pandas/tests/groupby/test_function.py @@ -21,7 +21,7 @@ isna, ) import pandas.core.nanops as nanops -from pandas.util import _test_decorators as td, testing as tm +from pandas.util import _test_decorators as td, _testing as tm @pytest.mark.parametrize("agg_func", ["any", "all"]) From 3fb55612c49c797b71156a604ceb14975a599a68 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 13:29:36 -0600 Subject: [PATCH 08/17] update --- pandas/util/_testing.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pandas/util/_testing.py b/pandas/util/_testing.py index 1d207670d52ce..a098b4604292a 100644 --- a/pandas/util/_testing.py +++ b/pandas/util/_testing.py @@ -921,23 +921,24 @@ def assert_numpy_array_equal( check_same=None, obj="numpy array", ): - """ Checks that 'np.ndarray' is equivalent + """ + Check that 'np.ndarray' is equivalent. Parameters ---------- - left : np.ndarray or iterable - right : np.ndarray or iterable + left, right : numpy.ndarray or iterable + The two arrays to be compared. strict_nan : bool, default False If True, consider NaN and None to be different. - check_dtype: bool, default True - check dtype if both a and b are np.ndarray + check_dtype : bool, default True + Check dtype if both a and b are np.ndarray. err_msg : str, default None - If provided, used as assertion message + If provided, used as assertion message. check_same : None|'copy'|'same', default None - Ensure left and right refer/do not refer to the same memory area + Ensure left and right refer/do not refer to the same memory area. obj : str, default 'numpy array' Specify object name being compared, internally used to show appropriate - assertion message + assertion message. """ __tracebackhide__ = True @@ -1375,9 +1376,10 @@ def assert_equal(left, right, **kwargs): Parameters ---------- - left : Index, Series, DataFrame, ExtensionArray, or np.ndarray - right : Index, Series, DataFrame, ExtensionArray, or np.ndarray + left, right : Index, Series, DataFrame, ExtensionArray, or np.ndarray + The two items to be compared. **kwargs + All keyword arguments are passed through to the underlying assert method. """ __tracebackhide__ = True @@ -1401,7 +1403,7 @@ def assert_equal(left, right, **kwargs): assert_numpy_array_equal(left, right, **kwargs) elif isinstance(left, str): assert kwargs == {} - return left == right + assert left == right else: raise NotImplementedError(type(left)) From b8559355ed58fa1f192021f22ccb5a8f2fa97f41 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 14:17:37 -0600 Subject: [PATCH 09/17] update --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b34f5dfdd1a83..88548f6c2f678 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: language: python_venv additional_dependencies: [flake8-comprehensions>=3.1.0] - repo: https://github.com/pre-commit/mirrors-isort - rev: v4.3.20 + rev: v4.3.21 hooks: - id: isort language: python_venv From 6cc9fbe484e69e5dbd33e8defc7f9905eeeb3a22 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 14:19:06 -0600 Subject: [PATCH 10/17] update --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index d0f9c7ac881d9..2694f25fd20ae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -109,7 +109,7 @@ known_dtypes = pandas.core.dtypes known_post_core = pandas.tseries,pandas.io,pandas.plotting sections = FUTURE,STDLIB,THIRDPARTY,PRE_LIBS,PRE_CORE,DTYPES,FIRSTPARTY,POST_CORE,LOCALFOLDER known_first_party = pandas -known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,validate_docstrings,yaml +known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,validate_docstrings,yaml,odf multi_line_output = 3 include_trailing_comma = True force_grid_wrap = 0 From ec8938b3359970e856234b53ff52b7674d727f21 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 14:19:27 -0600 Subject: [PATCH 11/17] wip --- asv_bench/benchmarks/io/excel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/asv_bench/benchmarks/io/excel.py b/asv_bench/benchmarks/io/excel.py index c1f8936316dcd..9f4b4ff46644b 100644 --- a/asv_bench/benchmarks/io/excel.py +++ b/asv_bench/benchmarks/io/excel.py @@ -1,12 +1,12 @@ from io import BytesIO import numpy as np - -import pandas.util._testing as tm - from odf.opendocument import OpenDocumentSpreadsheet from odf.table import Table, TableCell, TableRow from odf.text import P + +import pandas.util._testing as tm + from pandas import DataFrame, ExcelWriter, date_range, read_excel From 35466e916900a1b0e3520f4d26297cca9200ec62 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 14:49:59 -0600 Subject: [PATCH 12/17] move again --- pandas/{util => }/_testing.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pandas/{util => }/_testing.py (100%) diff --git a/pandas/util/_testing.py b/pandas/_testing.py similarity index 100% rename from pandas/util/_testing.py rename to pandas/_testing.py From ab892ee63cb8648e5739b2a3c48a249c9acea646 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 14:54:09 -0600 Subject: [PATCH 13/17] move again --- asv_bench/benchmarks/categoricals.py | 3 +-- asv_bench/benchmarks/ctors.py | 3 +-- asv_bench/benchmarks/frame_ctor.py | 3 +-- asv_bench/benchmarks/frame_methods.py | 3 +-- asv_bench/benchmarks/gil.py | 5 ++--- asv_bench/benchmarks/groupby.py | 3 +-- asv_bench/benchmarks/index_object.py | 3 +-- asv_bench/benchmarks/indexing.py | 3 +-- asv_bench/benchmarks/inference.py | 3 +-- asv_bench/benchmarks/io/csv.py | 3 +-- asv_bench/benchmarks/io/excel.py | 3 +-- asv_bench/benchmarks/io/hdf.py | 3 +-- asv_bench/benchmarks/io/json.py | 3 +-- asv_bench/benchmarks/io/pickle.py | 3 +-- asv_bench/benchmarks/io/sql.py | 3 +-- asv_bench/benchmarks/io/stata.py | 3 +-- asv_bench/benchmarks/join_merge.py | 3 +-- asv_bench/benchmarks/multiindex_object.py | 3 +-- asv_bench/benchmarks/reindex.py | 3 +-- asv_bench/benchmarks/series_methods.py | 3 +-- asv_bench/benchmarks/strings.py | 3 +-- ci/code_checks.sh | 4 ++-- doc/source/development/contributing.rst | 4 ++-- doc/source/user_guide/io.rst | 2 +- doc/source/user_guide/reshaping.rst | 4 ++-- doc/source/user_guide/scale.rst | 2 +- doc/source/whatsnew/v0.12.0.rst | 2 +- doc/source/whatsnew/v0.13.1.rst | 2 +- doc/source/whatsnew/v0.18.0.rst | 2 +- doc/source/whatsnew/v0.20.0.rst | 2 +- doc/source/whatsnew/v0.21.0.rst | 2 +- doc/source/whatsnew/v0.23.0.rst | 2 +- doc/source/whatsnew/v1.0.0.rst | 2 +- pandas/_libs/testing.pyx | 12 ++++++------ pandas/_testing.py | 4 ++-- pandas/conftest.py | 2 +- pandas/testing.py | 2 +- pandas/tests/api/test_api.py | 3 +-- pandas/tests/api/test_types.py | 3 +-- pandas/tests/arithmetic/common.py | 3 +-- pandas/tests/arithmetic/conftest.py | 3 +-- pandas/tests/arithmetic/test_datetime64.py | 2 +- pandas/tests/arithmetic/test_numeric.py | 3 +-- pandas/tests/arithmetic/test_object.py | 3 +-- pandas/tests/arithmetic/test_period.py | 2 +- pandas/tests/arithmetic/test_timedelta64.py | 2 +- pandas/tests/arrays/categorical/test_algos.py | 3 +-- pandas/tests/arrays/categorical/test_analytics.py | 2 +- pandas/tests/arrays/categorical/test_api.py | 3 +-- pandas/tests/arrays/categorical/test_constructors.py | 2 +- pandas/tests/arrays/categorical/test_dtypes.py | 3 +-- pandas/tests/arrays/categorical/test_indexing.py | 3 +-- pandas/tests/arrays/categorical/test_missing.py | 3 +-- pandas/tests/arrays/categorical/test_operators.py | 3 +-- pandas/tests/arrays/categorical/test_sorting.py | 3 +-- pandas/tests/arrays/categorical/test_subclass.py | 3 +-- pandas/tests/arrays/categorical/test_warnings.py | 2 +- pandas/tests/arrays/interval/test_interval.py | 3 +-- pandas/tests/arrays/interval/test_ops.py | 3 +-- pandas/tests/arrays/sparse/test_accessor.py | 2 +- pandas/tests/arrays/sparse/test_arithmetics.py | 3 +-- pandas/tests/arrays/sparse/test_array.py | 2 +- pandas/tests/arrays/sparse/test_combine_concat.py | 3 +-- pandas/tests/arrays/sparse/test_libsparse.py | 2 +- pandas/tests/arrays/string_/test_string.py | 2 +- pandas/tests/arrays/test_array.py | 3 +-- pandas/tests/arrays/test_boolean.py | 2 +- pandas/tests/arrays/test_datetimelike.py | 2 +- pandas/tests/arrays/test_datetimes.py | 3 +-- pandas/tests/arrays/test_integer.py | 2 +- pandas/tests/arrays/test_numpy.py | 3 +-- pandas/tests/arrays/test_period.py | 2 +- pandas/tests/arrays/test_timedeltas.py | 3 +-- pandas/tests/base/test_constructors.py | 2 +- pandas/tests/base/test_conversion.py | 3 +-- pandas/tests/base/test_ops.py | 2 +- pandas/tests/computation/test_eval.py | 2 +- .../tests/dtypes/cast/test_construct_from_scalar.py | 3 +-- pandas/tests/dtypes/cast/test_construct_ndarray.py | 4 ++-- pandas/tests/dtypes/cast/test_downcast.py | 3 +-- pandas/tests/dtypes/cast/test_infer_dtype.py | 3 +-- pandas/tests/dtypes/cast/test_upcast.py | 3 +-- pandas/tests/dtypes/test_common.py | 2 +- pandas/tests/dtypes/test_dtypes.py | 3 +-- pandas/tests/dtypes/test_generic.py | 3 +-- pandas/tests/dtypes/test_inference.py | 2 +- pandas/tests/dtypes/test_missing.py | 2 +- pandas/tests/extension/arrow/test_bool.py | 3 +-- pandas/tests/extension/base/base.py | 2 +- pandas/tests/extension/base/groupby.py | 3 +-- pandas/tests/extension/base/interface.py | 3 +-- pandas/tests/extension/base/methods.py | 3 +-- pandas/tests/extension/base/missing.py | 3 +-- pandas/tests/extension/base/reduce.py | 3 +-- pandas/tests/extension/decimal/test_decimal.py | 3 +-- pandas/tests/extension/json/test_json.py | 3 +-- pandas/tests/extension/test_boolean.py | 2 +- pandas/tests/extension/test_categorical.py | 3 +-- pandas/tests/extension/test_common.py | 3 +-- pandas/tests/extension/test_numpy.py | 2 +- pandas/tests/extension/test_sparse.py | 2 +- pandas/tests/frame/conftest.py | 3 +-- pandas/tests/frame/indexing/test_categorical.py | 3 +-- pandas/tests/frame/indexing/test_datetime.py | 3 +-- pandas/tests/frame/indexing/test_indexing.py | 2 +- pandas/tests/frame/indexing/test_where.py | 3 +-- pandas/tests/frame/methods/test_append.py | 3 +-- pandas/tests/frame/methods/test_asof.py | 3 +-- pandas/tests/frame/methods/test_clip.py | 3 +-- pandas/tests/frame/methods/test_count.py | 3 +-- pandas/tests/frame/methods/test_cov_corr.py | 2 +- pandas/tests/frame/methods/test_describe.py | 3 +-- pandas/tests/frame/methods/test_diff.py | 3 +-- pandas/tests/frame/methods/test_drop_duplicates.py | 3 +-- pandas/tests/frame/methods/test_duplicated.py | 3 +-- pandas/tests/frame/methods/test_explode.py | 3 +-- pandas/tests/frame/methods/test_isin.py | 3 +-- pandas/tests/frame/methods/test_nlargest.py | 3 +-- pandas/tests/frame/methods/test_pct_change.py | 3 +-- pandas/tests/frame/methods/test_quantile.py | 3 +-- pandas/tests/frame/methods/test_rank.py | 2 +- pandas/tests/frame/methods/test_replace.py | 3 +-- pandas/tests/frame/methods/test_round.py | 3 +-- pandas/tests/frame/methods/test_shift.py | 3 +-- pandas/tests/frame/methods/test_sort_index.py | 3 +-- pandas/tests/frame/methods/test_sort_values.py | 3 +-- pandas/tests/frame/methods/test_to_dict.py | 3 +-- pandas/tests/frame/methods/test_to_records.py | 3 +-- pandas/tests/frame/methods/test_transpose.py | 3 +-- pandas/tests/frame/methods/test_truncate.py | 3 +-- pandas/tests/frame/test_alter_axes.py | 3 +-- pandas/tests/frame/test_analytics.py | 2 +- pandas/tests/frame/test_api.py | 2 +- pandas/tests/frame/test_apply.py | 3 +-- pandas/tests/frame/test_arithmetic.py | 3 +-- pandas/tests/frame/test_axis_select_reindex.py | 2 +- pandas/tests/frame/test_block_internals.py | 3 +-- pandas/tests/frame/test_combine_concat.py | 3 +-- pandas/tests/frame/test_constructors.py | 2 +- pandas/tests/frame/test_cumulative.py | 3 +-- pandas/tests/frame/test_dtypes.py | 3 +-- pandas/tests/frame/test_join.py | 3 +-- pandas/tests/frame/test_missing.py | 2 +- pandas/tests/frame/test_mutate_columns.py | 3 +-- pandas/tests/frame/test_nonunique_indexes.py | 3 +-- pandas/tests/frame/test_operators.py | 3 +-- pandas/tests/frame/test_period.py | 3 +-- pandas/tests/frame/test_query_eval.py | 2 +- pandas/tests/frame/test_repr_info.py | 2 +- pandas/tests/frame/test_reshape.py | 3 +-- pandas/tests/frame/test_sort_values_level_as_str.py | 2 +- pandas/tests/frame/test_subclass.py | 3 +-- pandas/tests/frame/test_timeseries.py | 3 +-- pandas/tests/frame/test_timezones.py | 3 +-- pandas/tests/frame/test_to_csv.py | 2 +- pandas/tests/generic/test_frame.py | 2 +- pandas/tests/generic/test_generic.py | 3 +-- pandas/tests/generic/test_series.py | 2 +- pandas/tests/groupby/aggregate/test_aggregate.py | 3 +-- pandas/tests/groupby/aggregate/test_cython.py | 3 +-- pandas/tests/groupby/aggregate/test_other.py | 3 +-- pandas/tests/groupby/conftest.py | 3 +-- pandas/tests/groupby/test_apply.py | 3 +-- pandas/tests/groupby/test_bin_groupby.py | 2 +- pandas/tests/groupby/test_categorical.py | 2 +- pandas/tests/groupby/test_counting.py | 3 +-- pandas/tests/groupby/test_filters.py | 3 +-- pandas/tests/groupby/test_function.py | 3 ++- pandas/tests/groupby/test_groupby.py | 2 +- pandas/tests/groupby/test_grouping.py | 3 +-- pandas/tests/groupby/test_index_as_string.py | 3 +-- pandas/tests/groupby/test_nth.py | 3 +-- pandas/tests/groupby/test_rank.py | 3 +-- pandas/tests/groupby/test_timegrouper.py | 3 +-- pandas/tests/groupby/test_transform.py | 2 +- pandas/tests/groupby/test_value_counts.py | 3 +-- pandas/tests/groupby/test_whitelist.py | 3 +-- pandas/tests/indexes/categorical/test_category.py | 2 +- .../tests/indexes/categorical/test_constructors.py | 3 +-- pandas/tests/indexes/common.py | 2 +- pandas/tests/indexes/conftest.py | 3 +-- pandas/tests/indexes/datetimelike.py | 3 +-- pandas/tests/indexes/datetimes/test_astype.py | 3 +-- pandas/tests/indexes/datetimes/test_constructors.py | 2 +- pandas/tests/indexes/datetimes/test_date_range.py | 2 +- pandas/tests/indexes/datetimes/test_datetime.py | 3 +-- pandas/tests/indexes/datetimes/test_datetimelike.py | 3 +-- pandas/tests/indexes/datetimes/test_formats.py | 3 +-- pandas/tests/indexes/datetimes/test_indexing.py | 3 +-- pandas/tests/indexes/datetimes/test_misc.py | 3 +-- pandas/tests/indexes/datetimes/test_missing.py | 3 +-- pandas/tests/indexes/datetimes/test_ops.py | 3 +-- .../tests/indexes/datetimes/test_partial_slicing.py | 3 +-- pandas/tests/indexes/datetimes/test_scalar_compat.py | 2 +- pandas/tests/indexes/datetimes/test_setops.py | 2 +- pandas/tests/indexes/datetimes/test_shift.py | 2 +- pandas/tests/indexes/datetimes/test_timezones.py | 2 +- pandas/tests/indexes/datetimes/test_tools.py | 2 +- pandas/tests/indexes/interval/test_astype.py | 3 +-- pandas/tests/indexes/interval/test_base.py | 3 +-- pandas/tests/indexes/interval/test_constructors.py | 3 +-- pandas/tests/indexes/interval/test_formats.py | 3 +-- pandas/tests/indexes/interval/test_indexing.py | 3 +-- pandas/tests/indexes/interval/test_interval.py | 3 +-- pandas/tests/indexes/interval/test_interval_range.py | 3 +-- pandas/tests/indexes/interval/test_interval_tree.py | 2 +- pandas/tests/indexes/interval/test_setops.py | 3 +-- pandas/tests/indexes/multi/test_analytics.py | 2 +- pandas/tests/indexes/multi/test_astype.py | 4 ++-- pandas/tests/indexes/multi/test_compat.py | 3 +-- pandas/tests/indexes/multi/test_constructors.py | 2 +- pandas/tests/indexes/multi/test_contains.py | 2 +- pandas/tests/indexes/multi/test_conversion.py | 3 +-- pandas/tests/indexes/multi/test_copy.py | 3 +-- pandas/tests/indexes/multi/test_drop.py | 2 +- pandas/tests/indexes/multi/test_duplicates.py | 2 +- pandas/tests/indexes/multi/test_equivalence.py | 3 +-- pandas/tests/indexes/multi/test_format.py | 3 +-- pandas/tests/indexes/multi/test_get_set.py | 3 +-- pandas/tests/indexes/multi/test_indexing.py | 3 +-- pandas/tests/indexes/multi/test_integrity.py | 3 +-- pandas/tests/indexes/multi/test_join.py | 3 +-- pandas/tests/indexes/multi/test_missing.py | 2 +- pandas/tests/indexes/multi/test_names.py | 3 +-- pandas/tests/indexes/multi/test_partial_indexing.py | 3 +-- pandas/tests/indexes/multi/test_reindex.py | 3 +-- pandas/tests/indexes/multi/test_reshape.py | 3 +-- pandas/tests/indexes/multi/test_setops.py | 3 +-- pandas/tests/indexes/multi/test_sorting.py | 2 +- pandas/tests/indexes/period/test_asfreq.py | 3 +-- pandas/tests/indexes/period/test_astype.py | 3 +-- pandas/tests/indexes/period/test_constructors.py | 2 +- pandas/tests/indexes/period/test_formats.py | 3 +-- pandas/tests/indexes/period/test_indexing.py | 2 +- pandas/tests/indexes/period/test_ops.py | 3 +-- pandas/tests/indexes/period/test_partial_slicing.py | 3 +-- pandas/tests/indexes/period/test_period.py | 2 +- pandas/tests/indexes/period/test_period_range.py | 3 +-- pandas/tests/indexes/period/test_scalar_compat.py | 3 +-- pandas/tests/indexes/period/test_setops.py | 3 +-- pandas/tests/indexes/period/test_shift.py | 3 +-- pandas/tests/indexes/period/test_tools.py | 2 +- pandas/tests/indexes/ranges/test_constructors.py | 3 +-- pandas/tests/indexes/ranges/test_range.py | 3 +-- pandas/tests/indexes/ranges/test_setops.py | 3 +-- pandas/tests/indexes/test_base.py | 2 +- pandas/tests/indexes/test_common.py | 2 +- pandas/tests/indexes/test_numeric.py | 2 +- pandas/tests/indexes/test_numpy_compat.py | 3 +-- pandas/tests/indexes/test_setops.py | 3 +-- pandas/tests/indexes/timedeltas/test_astype.py | 3 +-- pandas/tests/indexes/timedeltas/test_constructors.py | 3 +-- pandas/tests/indexes/timedeltas/test_indexing.py | 3 +-- pandas/tests/indexes/timedeltas/test_ops.py | 3 +-- .../tests/indexes/timedeltas/test_partial_slicing.py | 3 +-- .../tests/indexes/timedeltas/test_scalar_compat.py | 3 +-- pandas/tests/indexes/timedeltas/test_setops.py | 3 +-- pandas/tests/indexes/timedeltas/test_shift.py | 2 +- pandas/tests/indexes/timedeltas/test_timedelta.py | 3 +-- .../tests/indexes/timedeltas/test_timedelta_range.py | 3 +-- pandas/tests/indexes/timedeltas/test_tools.py | 3 +-- pandas/tests/indexing/common.py | 3 +-- pandas/tests/indexing/interval/test_interval.py | 3 +-- pandas/tests/indexing/interval/test_interval_new.py | 3 +-- pandas/tests/indexing/multiindex/conftest.py | 3 +-- .../indexing/multiindex/test_chaining_and_caching.py | 3 +-- pandas/tests/indexing/multiindex/test_getitem.py | 3 +-- pandas/tests/indexing/multiindex/test_iloc.py | 3 +-- .../tests/indexing/multiindex/test_indexing_slow.py | 3 +-- pandas/tests/indexing/multiindex/test_ix.py | 2 +- pandas/tests/indexing/multiindex/test_loc.py | 3 +-- pandas/tests/indexing/multiindex/test_multiindex.py | 2 +- pandas/tests/indexing/multiindex/test_partial.py | 3 +-- pandas/tests/indexing/multiindex/test_set_ops.py | 3 +-- pandas/tests/indexing/multiindex/test_setitem.py | 3 +-- pandas/tests/indexing/multiindex/test_slice.py | 2 +- pandas/tests/indexing/multiindex/test_sorted.py | 3 +-- pandas/tests/indexing/multiindex/test_xs.py | 3 +-- pandas/tests/indexing/test_callable.py | 3 +-- pandas/tests/indexing/test_categorical.py | 3 +-- pandas/tests/indexing/test_chaining_and_caching.py | 3 +-- pandas/tests/indexing/test_coercion.py | 2 +- pandas/tests/indexing/test_datetime.py | 3 +-- pandas/tests/indexing/test_floats.py | 3 +-- pandas/tests/indexing/test_iloc.py | 3 +-- pandas/tests/indexing/test_indexing.py | 2 +- pandas/tests/indexing/test_indexing_engines.py | 3 ++- pandas/tests/indexing/test_indexing_slow.py | 3 +-- pandas/tests/indexing/test_loc.py | 3 +-- pandas/tests/indexing/test_partial.py | 3 +-- pandas/tests/indexing/test_scalar.py | 3 +-- pandas/tests/indexing/test_timedelta.py | 3 +-- pandas/tests/internals/test_internals.py | 2 +- pandas/tests/io/conftest.py | 2 +- pandas/tests/io/excel/conftest.py | 3 ++- pandas/tests/io/excel/test_odf.py | 3 +-- pandas/tests/io/excel/test_openpyxl.py | 3 +-- pandas/tests/io/excel/test_readers.py | 2 +- pandas/tests/io/excel/test_style.py | 3 +-- pandas/tests/io/excel/test_writers.py | 2 +- pandas/tests/io/excel/test_xlrd.py | 3 +-- pandas/tests/io/excel/test_xlsxwriter.py | 3 +-- pandas/tests/io/excel/test_xlwt.py | 3 +-- pandas/tests/io/formats/test_css.py | 2 +- pandas/tests/io/formats/test_eng_formatting.py | 3 +-- pandas/tests/io/formats/test_format.py | 2 +- pandas/tests/io/formats/test_style.py | 2 +- pandas/tests/io/formats/test_to_csv.py | 3 +-- pandas/tests/io/formats/test_to_excel.py | 2 +- pandas/tests/io/formats/test_to_html.py | 3 +-- pandas/tests/io/formats/test_to_latex.py | 3 +-- pandas/tests/io/json/test_compression.py | 2 +- pandas/tests/io/json/test_json_table_schema.py | 3 +-- pandas/tests/io/json/test_normalize.py | 3 +-- pandas/tests/io/json/test_pandas.py | 2 +- pandas/tests/io/json/test_readlines.py | 3 +-- pandas/tests/io/json/test_ujson.py | 2 +- pandas/tests/io/parser/test_c_parser_only.py | 2 +- pandas/tests/io/parser/test_comment.py | 3 +-- pandas/tests/io/parser/test_common.py | 2 +- pandas/tests/io/parser/test_compression.py | 3 +-- pandas/tests/io/parser/test_converters.py | 3 +-- pandas/tests/io/parser/test_dialect.py | 2 +- pandas/tests/io/parser/test_dtypes.py | 2 +- pandas/tests/io/parser/test_header.py | 2 +- pandas/tests/io/parser/test_index_col.py | 3 +-- pandas/tests/io/parser/test_mangle_dupes.py | 3 +-- pandas/tests/io/parser/test_multi_thread.py | 3 +-- pandas/tests/io/parser/test_na_values.py | 2 +- pandas/tests/io/parser/test_network.py | 2 +- pandas/tests/io/parser/test_parse_dates.py | 2 +- pandas/tests/io/parser/test_python_parser_only.py | 2 +- pandas/tests/io/parser/test_quoting.py | 2 +- pandas/tests/io/parser/test_read_fwf.py | 3 +-- pandas/tests/io/parser/test_skiprows.py | 2 +- pandas/tests/io/parser/test_textreader.py | 2 +- pandas/tests/io/parser/test_unsupported.py | 3 ++- pandas/tests/io/parser/test_usecols.py | 2 +- pandas/tests/io/pytables/conftest.py | 2 +- pandas/tests/io/pytables/test_compat.py | 3 +-- pandas/tests/io/pytables/test_complex.py | 2 +- pandas/tests/io/pytables/test_pytables_missing.py | 2 +- pandas/tests/io/pytables/test_store.py | 2 +- pandas/tests/io/pytables/test_timezones.py | 2 +- pandas/tests/io/sas/test_sas.py | 3 +-- pandas/tests/io/sas/test_sas7bdat.py | 2 +- pandas/tests/io/sas/test_xport.py | 3 +-- pandas/tests/io/test_clipboard.py | 3 +-- pandas/tests/io/test_common.py | 2 +- pandas/tests/io/test_compression.py | 3 +-- pandas/tests/io/test_date_converters.py | 2 +- pandas/tests/io/test_feather.py | 3 +-- pandas/tests/io/test_gcs.py | 3 +-- pandas/tests/io/test_html.py | 2 +- pandas/tests/io/test_orc.py | 3 +-- pandas/tests/io/test_parquet.py | 2 +- pandas/tests/io/test_pickle.py | 2 +- pandas/tests/io/test_spss.py | 3 +-- pandas/tests/io/test_sql.py | 3 +-- pandas/tests/io/test_stata.py | 3 +-- pandas/tests/plotting/common.py | 2 +- pandas/tests/plotting/test_boxplot_method.py | 2 +- pandas/tests/plotting/test_converter.py | 2 +- pandas/tests/plotting/test_datetimelike.py | 2 +- pandas/tests/plotting/test_frame.py | 2 +- pandas/tests/plotting/test_groupby.py | 2 +- pandas/tests/plotting/test_hist_method.py | 2 +- pandas/tests/plotting/test_misc.py | 2 +- pandas/tests/plotting/test_series.py | 2 +- pandas/tests/reductions/test_reductions.py | 3 +-- pandas/tests/reductions/test_stat_reductions.py | 2 +- pandas/tests/resample/test_base.py | 3 +-- pandas/tests/resample/test_datetime_index.py | 2 +- pandas/tests/resample/test_period_index.py | 2 +- pandas/tests/resample/test_resample_api.py | 3 +-- pandas/tests/resample/test_resampler_grouper.py | 5 ++--- pandas/tests/resample/test_time_grouper.py | 3 +-- pandas/tests/resample/test_timedelta.py | 3 +-- pandas/tests/reshape/merge/test_join.py | 2 +- pandas/tests/reshape/merge/test_merge.py | 3 +-- pandas/tests/reshape/merge/test_merge_asof.py | 3 +-- .../reshape/merge/test_merge_index_as_string.py | 3 +-- pandas/tests/reshape/merge/test_merge_ordered.py | 3 +-- pandas/tests/reshape/merge/test_multi.py | 3 +-- pandas/tests/reshape/test_concat.py | 3 +-- pandas/tests/reshape/test_cut.py | 3 +-- pandas/tests/reshape/test_melt.py | 3 +-- pandas/tests/reshape/test_pivot.py | 3 +-- pandas/tests/reshape/test_qcut.py | 3 +-- pandas/tests/reshape/test_reshape.py | 3 +-- pandas/tests/reshape/test_union_categoricals.py | 3 +-- pandas/tests/reshape/test_util.py | 3 +-- pandas/tests/scalar/period/test_period.py | 2 +- pandas/tests/scalar/test_na_scalar.py | 2 +- pandas/tests/scalar/test_nat.py | 2 +- pandas/tests/scalar/timedelta/test_arithmetic.py | 3 +-- pandas/tests/scalar/timedelta/test_timedelta.py | 2 +- pandas/tests/scalar/timestamp/test_timestamp.py | 2 +- pandas/tests/scalar/timestamp/test_unary_ops.py | 2 +- pandas/tests/series/conftest.py | 2 +- pandas/tests/series/indexing/test_alter_index.py | 3 +-- pandas/tests/series/indexing/test_boolean.py | 3 +-- pandas/tests/series/indexing/test_callable.py | 3 +-- pandas/tests/series/indexing/test_datetime.py | 2 +- pandas/tests/series/indexing/test_iloc.py | 3 +-- pandas/tests/series/indexing/test_indexing.py | 3 +-- pandas/tests/series/indexing/test_loc.py | 3 +-- pandas/tests/series/indexing/test_numeric.py | 3 +-- pandas/tests/series/methods/test_append.py | 3 +-- pandas/tests/series/methods/test_argsort.py | 3 +-- pandas/tests/series/methods/test_asof.py | 3 +-- pandas/tests/series/methods/test_clip.py | 3 +-- pandas/tests/series/methods/test_count.py | 3 +-- pandas/tests/series/methods/test_cov_corr.py | 2 +- pandas/tests/series/methods/test_describe.py | 3 +-- pandas/tests/series/methods/test_diff.py | 3 +-- pandas/tests/series/methods/test_drop_duplicates.py | 3 +-- pandas/tests/series/methods/test_duplicated.py | 3 +-- pandas/tests/series/methods/test_explode.py | 3 +-- pandas/tests/series/methods/test_isin.py | 3 +-- pandas/tests/series/methods/test_nlargest.py | 3 +-- pandas/tests/series/methods/test_pct_change.py | 3 +-- pandas/tests/series/methods/test_quantile.py | 3 +-- pandas/tests/series/methods/test_rank.py | 2 +- pandas/tests/series/methods/test_replace.py | 3 +-- pandas/tests/series/methods/test_round.py | 3 +-- pandas/tests/series/methods/test_searchsorted.py | 3 +-- pandas/tests/series/methods/test_shift.py | 2 +- pandas/tests/series/methods/test_sort_index.py | 3 +-- pandas/tests/series/methods/test_sort_values.py | 3 +-- pandas/tests/series/methods/test_to_dict.py | 3 +-- pandas/tests/series/methods/test_truncate.py | 3 +-- pandas/tests/series/methods/test_value_counts.py | 3 +-- pandas/tests/series/test_alter_axes.py | 3 +-- pandas/tests/series/test_analytics.py | 2 +- pandas/tests/series/test_api.py | 3 +-- pandas/tests/series/test_apply.py | 3 +-- pandas/tests/series/test_arithmetic.py | 3 +-- pandas/tests/series/test_combine_concat.py | 3 +-- pandas/tests/series/test_constructors.py | 2 +- pandas/tests/series/test_cumulative.py | 3 +-- pandas/tests/series/test_datetime_values.py | 2 +- pandas/tests/series/test_dtypes.py | 2 +- pandas/tests/series/test_duplicates.py | 3 +-- pandas/tests/series/test_internals.py | 3 +-- pandas/tests/series/test_io.py | 3 +-- pandas/tests/series/test_missing.py | 2 +- pandas/tests/series/test_operators.py | 3 +-- pandas/tests/series/test_period.py | 3 +-- pandas/tests/series/test_repr.py | 3 +-- pandas/tests/series/test_subclass.py | 2 +- pandas/tests/series/test_timeseries.py | 2 +- pandas/tests/series/test_timezones.py | 2 +- pandas/tests/series/test_ufunc.py | 3 +-- pandas/tests/test_algos.py | 2 +- pandas/tests/test_downstream.py | 3 +-- pandas/tests/test_expressions.py | 3 +-- pandas/tests/test_join.py | 2 +- pandas/tests/test_lib.py | 2 +- pandas/tests/test_multilevel.py | 3 +-- pandas/tests/test_nanops.py | 2 +- pandas/tests/test_optional_dependency.py | 3 ++- pandas/tests/test_register_accessor.py | 3 +-- pandas/tests/test_sorting.py | 3 +-- pandas/tests/test_strings.py | 2 +- pandas/tests/test_take.py | 2 +- pandas/tests/tools/test_numeric.py | 3 +-- pandas/tests/tseries/frequencies/test_inference.py | 2 +- pandas/tests/tseries/holiday/test_calendar.py | 3 +-- pandas/tests/tseries/holiday/test_holiday.py | 2 +- pandas/tests/tseries/offsets/test_fiscal.py | 2 +- pandas/tests/tseries/offsets/test_offsets.py | 2 +- pandas/tests/tseries/offsets/test_ticks.py | 3 +-- pandas/tests/tslibs/test_array_to_datetime.py | 2 +- pandas/tests/tslibs/test_conversion.py | 2 +- pandas/tests/tslibs/test_fields.py | 3 ++- pandas/tests/tslibs/test_parsing.py | 3 ++- pandas/tests/util/test_assert_almost_equal.py | 3 +-- pandas/tests/util/test_assert_categorical_equal.py | 3 +-- .../tests/util/test_assert_extension_array_equal.py | 3 +-- pandas/tests/util/test_assert_frame_equal.py | 3 +-- pandas/tests/util/test_assert_index_equal.py | 3 +-- .../tests/util/test_assert_interval_array_equal.py | 3 +-- pandas/tests/util/test_assert_numpy_array_equal.py | 3 +-- pandas/tests/util/test_assert_produces_warning.py | 2 +- pandas/tests/util/test_assert_series_equal.py | 3 +-- pandas/tests/util/test_deprecate.py | 3 ++- pandas/tests/util/test_deprecate_kwarg.py | 3 ++- pandas/tests/util/test_hashing.py | 3 +-- pandas/tests/util/test_util.py | 3 ++- pandas/tests/window/common.py | 3 +-- pandas/tests/window/moments/test_moments_ewm.py | 3 +-- .../tests/window/moments/test_moments_expanding.py | 3 +-- pandas/tests/window/moments/test_moments_rolling.py | 2 +- pandas/tests/window/test_api.py | 2 +- pandas/tests/window/test_apply.py | 2 +- pandas/tests/window/test_base_indexer.py | 3 +-- pandas/tests/window/test_dtypes.py | 3 +-- pandas/tests/window/test_expanding.py | 2 +- pandas/tests/window/test_grouper.py | 3 +-- pandas/tests/window/test_numba.py | 2 +- pandas/tests/window/test_pairwise.py | 3 +-- pandas/tests/window/test_rolling.py | 2 +- pandas/tests/window/test_timeseries_window.py | 3 +-- pandas/util/testing/__init__.py | 2 +- scripts/list_future_warnings.sh | 2 +- setup.cfg | 2 +- 507 files changed, 530 insertions(+), 838 deletions(-) diff --git a/asv_bench/benchmarks/categoricals.py b/asv_bench/benchmarks/categoricals.py index c7f24b928cdf0..eb903e28ff719 100644 --- a/asv_bench/benchmarks/categoricals.py +++ b/asv_bench/benchmarks/categoricals.py @@ -2,9 +2,8 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm try: from pandas.api.types import union_categoricals diff --git a/asv_bench/benchmarks/ctors.py b/asv_bench/benchmarks/ctors.py index f0820af897dbe..a1ae83373528b 100644 --- a/asv_bench/benchmarks/ctors.py +++ b/asv_bench/benchmarks/ctors.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DatetimeIndex, Index, MultiIndex, Series, Timestamp +import pandas._testing as tm def no_change(arr): diff --git a/asv_bench/benchmarks/frame_ctor.py b/asv_bench/benchmarks/frame_ctor.py index ec263b4b4ddd9..fdcdcc06bef4d 100644 --- a/asv_bench/benchmarks/frame_ctor.py +++ b/asv_bench/benchmarks/frame_ctor.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range +import pandas._testing as tm try: from pandas.tseries.offsets import Nano, Hour diff --git a/asv_bench/benchmarks/frame_methods.py b/asv_bench/benchmarks/frame_methods.py index 5477d3f5e5c40..33c415d91de60 100644 --- a/asv_bench/benchmarks/frame_methods.py +++ b/asv_bench/benchmarks/frame_methods.py @@ -3,9 +3,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, NaT, Series, date_range, isnull, period_range +import pandas._testing as tm class GetNumericData: diff --git a/asv_bench/benchmarks/gil.py b/asv_bench/benchmarks/gil.py index 9415f70cae96e..6efae0b7222ad 100644 --- a/asv_bench/benchmarks/gil.py +++ b/asv_bench/benchmarks/gil.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, Series, date_range, factorize, read_csv +import pandas._testing as tm from pandas.core.algorithms import take_1d try: @@ -25,7 +24,7 @@ except ImportError: from pandas import algos try: - from pandas.util._testing import test_parallel + from pandas._testing import test_parallel have_real_test_parallel = True except ImportError: diff --git a/asv_bench/benchmarks/groupby.py b/asv_bench/benchmarks/groupby.py index 9ade9492ae85b..f526369b634b4 100644 --- a/asv_bench/benchmarks/groupby.py +++ b/asv_bench/benchmarks/groupby.py @@ -4,8 +4,6 @@ import numpy as np -import pandas.util._testing as tm - from pandas import ( Categorical, DataFrame, @@ -15,6 +13,7 @@ date_range, period_range, ) +import pandas._testing as tm method_blacklist = { "object": { diff --git a/asv_bench/benchmarks/index_object.py b/asv_bench/benchmarks/index_object.py index 666b55c3f2557..0ba0ac764172b 100644 --- a/asv_bench/benchmarks/index_object.py +++ b/asv_bench/benchmarks/index_object.py @@ -2,8 +2,6 @@ import numpy as np -import pandas.util._testing as tm - from pandas import ( DatetimeIndex, Float64Index, @@ -14,6 +12,7 @@ Series, date_range, ) +import pandas._testing as tm class SetOperations: diff --git a/asv_bench/benchmarks/indexing.py b/asv_bench/benchmarks/indexing.py index 5be915fa9237e..8705b9f2bfffe 100644 --- a/asv_bench/benchmarks/indexing.py +++ b/asv_bench/benchmarks/indexing.py @@ -2,8 +2,6 @@ import numpy as np -import pandas.util._testing as tm - from pandas import ( CategoricalIndex, DataFrame, @@ -19,6 +17,7 @@ option_context, period_range, ) +import pandas._testing as tm class NumericSeriesIndexing: diff --git a/asv_bench/benchmarks/inference.py b/asv_bench/benchmarks/inference.py index 021ba361e94ea..9e33f91b4d548 100644 --- a/asv_bench/benchmarks/inference.py +++ b/asv_bench/benchmarks/inference.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, Series, to_numeric +import pandas._testing as tm from .pandas_vb_common import lib, numeric_dtypes diff --git a/asv_bench/benchmarks/io/csv.py b/asv_bench/benchmarks/io/csv.py index f0cd96713ab4a..d25ad1026f91c 100644 --- a/asv_bench/benchmarks/io/csv.py +++ b/asv_bench/benchmarks/io/csv.py @@ -4,9 +4,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import Categorical, DataFrame, date_range, read_csv, to_datetime +import pandas._testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/excel.py b/asv_bench/benchmarks/io/excel.py index 9f4b4ff46644b..d3ab8a12c1e2b 100644 --- a/asv_bench/benchmarks/io/excel.py +++ b/asv_bench/benchmarks/io/excel.py @@ -5,9 +5,8 @@ from odf.table import Table, TableCell, TableRow from odf.text import P -import pandas.util._testing as tm - from pandas import DataFrame, ExcelWriter, date_range, read_excel +import pandas._testing as tm def _generate_dataframe(): diff --git a/asv_bench/benchmarks/io/hdf.py b/asv_bench/benchmarks/io/hdf.py index f27be3e29efd8..1bb8411d005cf 100644 --- a/asv_bench/benchmarks/io/hdf.py +++ b/asv_bench/benchmarks/io/hdf.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, HDFStore, date_range, read_hdf +import pandas._testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/json.py b/asv_bench/benchmarks/io/json.py index 11af156c1fb4e..d758693b4b0a9 100644 --- a/asv_bench/benchmarks/io/json.py +++ b/asv_bench/benchmarks/io/json.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, concat, date_range, read_json, timedelta_range +import pandas._testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/pickle.py b/asv_bench/benchmarks/io/pickle.py index 5db0e04760cd2..158a9386696e6 100644 --- a/asv_bench/benchmarks/io/pickle.py +++ b/asv_bench/benchmarks/io/pickle.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, date_range, read_pickle +import pandas._testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/io/sql.py b/asv_bench/benchmarks/io/sql.py index ae69dbf9f2dd4..a5f4d54710dde 100644 --- a/asv_bench/benchmarks/io/sql.py +++ b/asv_bench/benchmarks/io/sql.py @@ -3,9 +3,8 @@ import numpy as np from sqlalchemy import create_engine -import pandas.util._testing as tm - from pandas import DataFrame, date_range, read_sql_query, read_sql_table +import pandas._testing as tm class SQL: diff --git a/asv_bench/benchmarks/io/stata.py b/asv_bench/benchmarks/io/stata.py index ba240fb72aa29..70a773f994d8a 100644 --- a/asv_bench/benchmarks/io/stata.py +++ b/asv_bench/benchmarks/io/stata.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, date_range, read_stata +import pandas._testing as tm from ..pandas_vb_common import BaseIO diff --git a/asv_bench/benchmarks/join_merge.py b/asv_bench/benchmarks/join_merge.py index 9887430f66dca..77e5afffc6260 100644 --- a/asv_bench/benchmarks/join_merge.py +++ b/asv_bench/benchmarks/join_merge.py @@ -2,9 +2,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series, concat, date_range, merge, merge_asof +import pandas._testing as tm try: from pandas import merge_ordered diff --git a/asv_bench/benchmarks/multiindex_object.py b/asv_bench/benchmarks/multiindex_object.py index c78a1658ed1ce..1d2412975046b 100644 --- a/asv_bench/benchmarks/multiindex_object.py +++ b/asv_bench/benchmarks/multiindex_object.py @@ -2,9 +2,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, RangeIndex, date_range +import pandas._testing as tm class GetLoc: diff --git a/asv_bench/benchmarks/reindex.py b/asv_bench/benchmarks/reindex.py index 9323d6de22fd3..d5bfaa1fb0314 100644 --- a/asv_bench/benchmarks/reindex.py +++ b/asv_bench/benchmarks/reindex.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, Series, date_range, period_range +import pandas._testing as tm from .pandas_vb_common import lib diff --git a/asv_bench/benchmarks/series_methods.py b/asv_bench/benchmarks/series_methods.py index 35f17cbea83aa..e335963aa2d7c 100644 --- a/asv_bench/benchmarks/series_methods.py +++ b/asv_bench/benchmarks/series_methods.py @@ -2,9 +2,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import NaT, Series, date_range +import pandas._testing as tm class SeriesConstructor: diff --git a/asv_bench/benchmarks/strings.py b/asv_bench/benchmarks/strings.py index 7ad1e47d11011..aca18553f1086 100644 --- a/asv_bench/benchmarks/strings.py +++ b/asv_bench/benchmarks/strings.py @@ -2,9 +2,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm class Methods: diff --git a/ci/code_checks.sh b/ci/code_checks.sh index 70c4caeb55e77..a90774d2e8ff1 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -139,8 +139,8 @@ if [[ -z "$CHECK" || "$CHECK" == "patterns" ]]; then RET=$(($RET + $?)) ; echo $MSG "DONE" # Checks for test suite - # Check for imports from pandas.util._testing instead of `import pandas.util._testing as tm` - invgrep -R --include="*.py*" -E "from pandas.util._testing import" pandas/tests + # Check for imports from pandas._testing instead of `import pandas._testing as tm` + invgrep -R --include="*.py*" -E "from pandas._testing import" pandas/tests RET=$(($RET + $?)) ; echo $MSG "DONE" invgrep -R --include="*.py*" -E "from pandas.util import testing as tm" pandas/tests RET=$(($RET + $?)) ; echo $MSG "DONE" diff --git a/doc/source/development/contributing.rst b/doc/source/development/contributing.rst index 885f64d8820f9..253dd5160a7ff 100644 --- a/doc/source/development/contributing.rst +++ b/doc/source/development/contributing.rst @@ -957,7 +957,7 @@ inspiration. If your test requires working with files or network connectivity, there is more information on the `testing page `_ of the wiki. -The ``pandas.util._testing`` module has many special ``assert`` functions that +The ``pandas._testing`` module has many special ``assert`` functions that make it easier to make statements about whether Series or DataFrame objects are equivalent. The easiest way to verify that your code is correct is to explicitly construct the result you expect, then compare the actual result to @@ -1143,7 +1143,7 @@ If your change involves checking that a warning is actually emitted, use .. code-block:: python - import pandas.util._testing as tm + import pandas._testing as tm df = pd.DataFrame() diff --git a/doc/source/user_guide/io.rst b/doc/source/user_guide/io.rst index fc43df068312c..f9751dae87deb 100644 --- a/doc/source/user_guide/io.rst +++ b/doc/source/user_guide/io.rst @@ -1519,7 +1519,7 @@ rows will skip the intervening rows. .. ipython:: python - from pandas.util._testing import makeCustomDataframe as mkdf + from pandas._testing import makeCustomDataframe as mkdf df = mkdf(5, 3, r_idx_nlevels=2, c_idx_nlevels=4) df.to_csv('mi.csv') print(open('mi.csv').read()) diff --git a/doc/source/user_guide/reshaping.rst b/doc/source/user_guide/reshaping.rst index 7ed0b37c8ca07..b28354cd8b5f2 100644 --- a/doc/source/user_guide/reshaping.rst +++ b/doc/source/user_guide/reshaping.rst @@ -14,7 +14,7 @@ Reshaping by pivoting DataFrame objects .. ipython:: python :suppress: - import pandas.util._testing as tm + import pandas._testing as tm tm.N = 3 def unpivot(frame): @@ -38,7 +38,7 @@ For the curious here is how the above ``DataFrame`` was created: .. code-block:: python - import pandas.util._testing as tm + import pandas._testing as tm tm.N = 3 diff --git a/doc/source/user_guide/scale.rst b/doc/source/user_guide/scale.rst index 4a21ea922eb3f..43bb4966ec5bf 100644 --- a/doc/source/user_guide/scale.rst +++ b/doc/source/user_guide/scale.rst @@ -26,7 +26,7 @@ Assuming you want or need the expressiveness and power of pandas, let's carry on .. ipython:: python :suppress: - from pandas.util._testing import _make_timeseries + from pandas._testing import _make_timeseries # Make a random in-memory dataset ts = _make_timeseries(freq="30S", seed=0) diff --git a/doc/source/whatsnew/v0.12.0.rst b/doc/source/whatsnew/v0.12.0.rst index f037ae0ee4d74..823e177f3e05e 100644 --- a/doc/source/whatsnew/v0.12.0.rst +++ b/doc/source/whatsnew/v0.12.0.rst @@ -236,7 +236,7 @@ I/O enhancements .. ipython:: python - from pandas.util._testing import makeCustomDataframe as mkdf + from pandas._testing import makeCustomDataframe as mkdf df = mkdf(5, 3, r_idx_nlevels=2, c_idx_nlevels=4) df.to_csv('mi.csv') print(open('mi.csv').read()) diff --git a/doc/source/whatsnew/v0.13.1.rst b/doc/source/whatsnew/v0.13.1.rst index 2f71cb274d1d6..4f9ab761334e7 100644 --- a/doc/source/whatsnew/v0.13.1.rst +++ b/doc/source/whatsnew/v0.13.1.rst @@ -224,7 +224,7 @@ Enhancements .. code-block:: ipython - In [28]: import pandas.util._testing as tm + In [28]: import pandas._testing as tm In [29]: panel = tm.makePanel(5) diff --git a/doc/source/whatsnew/v0.18.0.rst b/doc/source/whatsnew/v0.18.0.rst index bf6bd87b47f38..d3f96d4185d65 100644 --- a/doc/source/whatsnew/v0.18.0.rst +++ b/doc/source/whatsnew/v0.18.0.rst @@ -1279,7 +1279,7 @@ Bug Fixes - Removed ``millisecond`` property of ``DatetimeIndex``. This would always raise a ``ValueError`` (:issue:`12019`). - Bug in ``Series`` constructor with read-only data (:issue:`11502`) -- Removed ``pandas.util._testing.choice()``. Should use ``np.random.choice()``, instead. (:issue:`12386`) +- Removed ``pandas._testing.choice()``. Should use ``np.random.choice()``, instead. (:issue:`12386`) - Bug in ``.loc`` setitem indexer preventing the use of a TZ-aware DatetimeIndex (:issue:`12050`) - Bug in ``.style`` indexes and MultiIndexes not appearing (:issue:`11655`) - Bug in ``to_msgpack`` and ``from_msgpack`` which did not correctly serialize or deserialize ``NaT`` (:issue:`12307`). diff --git a/doc/source/whatsnew/v0.20.0.rst b/doc/source/whatsnew/v0.20.0.rst index 9eed6427cdd8d..ceb1c7f27231b 100644 --- a/doc/source/whatsnew/v0.20.0.rst +++ b/doc/source/whatsnew/v0.20.0.rst @@ -1360,7 +1360,7 @@ provides a :meth:`~Panel.to_xarray` method to automate this conversion (:issue:` .. code-block:: ipython - In [133]: import pandas.util._testing as tm + In [133]: import pandas._testing as tm In [134]: p = tm.makePanel() diff --git a/doc/source/whatsnew/v0.21.0.rst b/doc/source/whatsnew/v0.21.0.rst index 9726525f14e2d..2a160eed9f8fd 100644 --- a/doc/source/whatsnew/v0.21.0.rst +++ b/doc/source/whatsnew/v0.21.0.rst @@ -927,7 +927,7 @@ Other API changes - :class:`pandas.HDFStore`'s string representation is now faster and less detailed. For the previous behavior, use ``pandas.HDFStore.info()``. (:issue:`16503`). - Compression defaults in HDF stores now follow pytables standards. Default is no compression and if ``complib`` is missing and ``complevel`` > 0 ``zlib`` is used (:issue:`15943`) - ``Index.get_indexer_non_unique()`` now returns a ndarray indexer rather than an ``Index``; this is consistent with ``Index.get_indexer()`` (:issue:`16819`) -- Removed the ``@slow`` decorator from ``pandas.util._testing``, which caused issues for some downstream packages' test suites. Use ``@pytest.mark.slow`` instead, which achieves the same thing (:issue:`16850`) +- Removed the ``@slow`` decorator from ``pandas._testing``, which caused issues for some downstream packages' test suites. Use ``@pytest.mark.slow`` instead, which achieves the same thing (:issue:`16850`) - Moved definition of ``MergeError`` to the ``pandas.errors`` module. - The signature of :func:`Series.set_axis` and :func:`DataFrame.set_axis` has been changed from ``set_axis(axis, labels)`` to ``set_axis(labels, axis=0)``, for consistency with the rest of the API. The old signature is deprecated and will show a ``FutureWarning`` (:issue:`14636`) - :func:`Series.argmin` and :func:`Series.argmax` will now raise a ``TypeError`` when used with ``object`` dtypes, instead of a ``ValueError`` (:issue:`13595`) diff --git a/doc/source/whatsnew/v0.23.0.rst b/doc/source/whatsnew/v0.23.0.rst index 3bb9b961b537a..b9e1b5060d1da 100644 --- a/doc/source/whatsnew/v0.23.0.rst +++ b/doc/source/whatsnew/v0.23.0.rst @@ -648,7 +648,7 @@ provides a :meth:`~Panel.to_xarray` method to automate this conversion (:issue:` .. code-block:: ipython - In [75]: import pandas.util._testing as tm + In [75]: import pandas._testing as tm In [76]: p = tm.makePanel() diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst index d5fcf648ab511..7ab1a1513ba37 100755 --- a/doc/source/whatsnew/v1.0.0.rst +++ b/doc/source/whatsnew/v1.0.0.rst @@ -682,7 +682,7 @@ or ``matplotlib.Axes.plot``. See :ref:`plotting.formatters` for more. - Ability to read pickles containing :class:`Categorical` instances created with pre-0.16 version of pandas has been removed (:issue:`27538`) - Removed :func:`pandas.tseries.plotting.tsplot` (:issue:`18627`) - Removed the previously deprecated keywords "reduce" and "broadcast" from :meth:`DataFrame.apply` (:issue:`18577`) -- Removed the previously deprecated ``assert_raises_regex`` function in ``pandas.util._testing`` (:issue:`29174`) +- Removed the previously deprecated ``assert_raises_regex`` function in ``pandas._testing`` (:issue:`29174`) - Removed the previously deprecated ``FrozenNDArray`` class in ``pandas.core.indexes.frozen`` (:issue:`29335`) - Removed the previously deprecated keyword "nthreads" from :func:`read_feather`, use "use_threads" instead (:issue:`23053`) - Removed :meth:`Index.is_lexsorted_for_tuple` (:issue:`29305`) diff --git a/pandas/_libs/testing.pyx b/pandas/_libs/testing.pyx index 1772eea918cb4..5a30b71a6fea1 100644 --- a/pandas/_libs/testing.pyx +++ b/pandas/_libs/testing.pyx @@ -123,7 +123,7 @@ cpdef assert_almost_equal(a, b, if isiterable(a): if not isiterable(b): - from pandas.util._testing import assert_class_equal + from pandas._testing import assert_class_equal # classes can't be the same, to raise error assert_class_equal(a, b, obj=obj) @@ -134,12 +134,12 @@ cpdef assert_almost_equal(a, b, if a_is_ndarray and b_is_ndarray: na, nb = a.size, b.size if a.shape != b.shape: - from pandas.util._testing import raise_assert_detail + from pandas._testing import raise_assert_detail raise_assert_detail( obj, f'{obj} shapes are different', a.shape, b.shape) if check_dtype and not is_dtype_equal(a.dtype, b.dtype): - from pandas.util._testing import assert_attr_equal + from pandas._testing import assert_attr_equal assert_attr_equal('dtype', a, b, obj=obj) if array_equivalent(a, b, strict_nan=True): @@ -149,7 +149,7 @@ cpdef assert_almost_equal(a, b, na, nb = len(a), len(b) if na != nb: - from pandas.util._testing import raise_assert_detail + from pandas._testing import raise_assert_detail # if we have a small diff set, print it if abs(na - nb) < 10: @@ -168,7 +168,7 @@ cpdef assert_almost_equal(a, b, diff += 1 if is_unequal: - from pandas.util._testing import raise_assert_detail + from pandas._testing import raise_assert_detail msg = (f"{obj} values are different " f"({np.round(diff * 100.0 / na, 5)} %)") raise_assert_detail(obj, msg, lobj, robj) @@ -176,7 +176,7 @@ cpdef assert_almost_equal(a, b, return True elif isiterable(b): - from pandas.util._testing import assert_class_equal + from pandas._testing import assert_class_equal # classes can't be the same, to raise error assert_class_equal(a, b, obj=obj) diff --git a/pandas/_testing.py b/pandas/_testing.py index a098b4604292a..2ebebc5d5e10a 100644 --- a/pandas/_testing.py +++ b/pandas/_testing.py @@ -1274,7 +1274,7 @@ def assert_frame_equal( This example shows comparing two DataFrames that are equal but with columns of differing dtypes. - >>> from pandas.util._testing import assert_frame_equal + >>> from pandas._testing import assert_frame_equal >>> df1 = pd.DataFrame({'a': [1, 2], 'b': [3, 4]}) >>> df2 = pd.DataFrame({'a': [1, 2], 'b': [3.0, 4.0]}) @@ -2283,7 +2283,7 @@ def network( Tests decorated with @network will fail if it's possible to make a network connection to another URL (defaults to google.com):: - >>> from pandas.util._testing import network + >>> from pandas._testing import network >>> from pandas.io.common import urlopen >>> @network ... def test_network(): diff --git a/pandas/conftest.py b/pandas/conftest.py index b7fd6dd039f00..3eab2186ccb94 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -12,10 +12,10 @@ from pytz import FixedOffset, utc import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame +import pandas._testing as tm from pandas.core import ops hypothesis.settings.register_profile( diff --git a/pandas/testing.py b/pandas/testing.py index 59a20933baf92..26a60d80854b8 100644 --- a/pandas/testing.py +++ b/pandas/testing.py @@ -2,7 +2,7 @@ Public testing utility functions. """ -from pandas.util._testing import ( +from pandas._testing import ( assert_almost_equal, assert_categorical_equal, assert_datetime_array_equal, diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index 2d0bc410bd43c..c7b9358d6b5ad 100644 --- a/pandas/tests/api/test_api.py +++ b/pandas/tests/api/test_api.py @@ -1,9 +1,8 @@ from typing import List -import pandas.util._testing as tm - import pandas as pd from pandas import api, compat +import pandas._testing as tm class Base: diff --git a/pandas/tests/api/test_types.py b/pandas/tests/api/test_types.py index 8e7f1bd3502b9..31423c03dee34 100644 --- a/pandas/tests/api/test_types.py +++ b/pandas/tests/api/test_types.py @@ -1,5 +1,4 @@ -import pandas.util._testing as tm - +import pandas._testing as tm from pandas.api import types from .test_api import Base diff --git a/pandas/tests/arithmetic/common.py b/pandas/tests/arithmetic/common.py index 7885ed46e34ee..7c3ceb3dba2b6 100644 --- a/pandas/tests/arithmetic/common.py +++ b/pandas/tests/arithmetic/common.py @@ -4,9 +4,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, Series +import pandas._testing as tm def assert_invalid_addsub_type(left, right, msg=None): diff --git a/pandas/tests/arithmetic/conftest.py b/pandas/tests/arithmetic/conftest.py index d62b5b58e4e6a..577093c0f2967 100644 --- a/pandas/tests/arithmetic/conftest.py +++ b/pandas/tests/arithmetic/conftest.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm # ------------------------------------------------------------------ # Helper Functions diff --git a/pandas/tests/arithmetic/test_datetime64.py b/pandas/tests/arithmetic/test_datetime64.py index 56288bbdb1c8d..20ea8d31ebbe2 100644 --- a/pandas/tests/arithmetic/test_datetime64.py +++ b/pandas/tests/arithmetic/test_datetime64.py @@ -14,7 +14,6 @@ from pandas._libs.tslibs.offsets import shift_months from pandas.compat.numpy import np_datetime64_compat from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -27,6 +26,7 @@ Timestamp, date_range, ) +import pandas._testing as tm from pandas.core.indexes.datetimes import _to_M8 from pandas.core.ops import roperator from pandas.tests.arithmetic.common import ( diff --git a/pandas/tests/arithmetic/test_numeric.py b/pandas/tests/arithmetic/test_numeric.py index 32d841d478143..b2826ab139ed6 100644 --- a/pandas/tests/arithmetic/test_numeric.py +++ b/pandas/tests/arithmetic/test_numeric.py @@ -10,10 +10,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, Series, Timedelta, TimedeltaIndex +import pandas._testing as tm from pandas.core import ops diff --git a/pandas/tests/arithmetic/test_object.py b/pandas/tests/arithmetic/test_object.py index 7349c77d764ce..799ef3492e53f 100644 --- a/pandas/tests/arithmetic/test_object.py +++ b/pandas/tests/arithmetic/test_object.py @@ -7,10 +7,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series, Timestamp +import pandas._testing as tm from pandas.core import ops # ------------------------------------------------------------------ diff --git a/pandas/tests/arithmetic/test_period.py b/pandas/tests/arithmetic/test_period.py index b94604a17636a..8d2537b0f52ab 100644 --- a/pandas/tests/arithmetic/test_period.py +++ b/pandas/tests/arithmetic/test_period.py @@ -8,10 +8,10 @@ from pandas._libs.tslibs.period import IncompatibleFrequency from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import Period, PeriodIndex, Series, period_range +import pandas._testing as tm from pandas.core import ops from pandas.core.arrays import TimedeltaArray diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py index bcacf2cd6000c..9b0d3712e9bea 100644 --- a/pandas/tests/arithmetic/test_timedelta64.py +++ b/pandas/tests/arithmetic/test_timedelta64.py @@ -6,7 +6,6 @@ import pytest from pandas.errors import OutOfBoundsDatetime, PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -19,6 +18,7 @@ Timestamp, timedelta_range, ) +import pandas._testing as tm from pandas.tests.arithmetic.common import ( assert_invalid_addsub_type, assert_invalid_comparison, diff --git a/pandas/tests/arrays/categorical/test_algos.py b/pandas/tests/arrays/categorical/test_algos.py index fa62d420b2756..c55a19bf04987 100644 --- a/pandas/tests/arrays/categorical/test_algos.py +++ b/pandas/tests/arrays/categorical/test_algos.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm @pytest.mark.parametrize("ordered", [True, False]) diff --git a/pandas/tests/arrays/categorical/test_analytics.py b/pandas/tests/arrays/categorical/test_analytics.py index 0ac7464d77386..90fcf12093909 100644 --- a/pandas/tests/arrays/categorical/test_analytics.py +++ b/pandas/tests/arrays/categorical/test_analytics.py @@ -4,9 +4,9 @@ import pytest from pandas.compat import PYPY -import pandas.util._testing as tm from pandas import Categorical, Index, NaT, Series, date_range +import pandas._testing as tm from pandas.api.types import is_scalar diff --git a/pandas/tests/arrays/categorical/test_api.py b/pandas/tests/arrays/categorical/test_api.py index af70e3f4b3bf5..df6623acfefee 100644 --- a/pandas/tests/arrays/categorical/test_api.py +++ b/pandas/tests/arrays/categorical/test_api.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, CategoricalIndex, DataFrame, Index, Series +import pandas._testing as tm from pandas.core.arrays.categorical import _recode_for_categories from pandas.tests.arrays.categorical.common import TestCategorical diff --git a/pandas/tests/arrays/categorical/test_constructors.py b/pandas/tests/arrays/categorical/test_constructors.py index c31540fe131ac..70a23e9748dd1 100644 --- a/pandas/tests/arrays/categorical/test_constructors.py +++ b/pandas/tests/arrays/categorical/test_constructors.py @@ -4,7 +4,6 @@ import pytest from pandas.compat.numpy import _np_version_under1p16 -import pandas.util._testing as tm from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -25,6 +24,7 @@ period_range, timedelta_range, ) +import pandas._testing as tm class TestCategoricalConstructors: diff --git a/pandas/tests/arrays/categorical/test_dtypes.py b/pandas/tests/arrays/categorical/test_dtypes.py index c736541f77925..19746d7d72162 100644 --- a/pandas/tests/arrays/categorical/test_dtypes.py +++ b/pandas/tests/arrays/categorical/test_dtypes.py @@ -1,11 +1,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import Categorical, CategoricalIndex, Index, Series, Timestamp +import pandas._testing as tm class TestCategoricalDtypes: diff --git a/pandas/tests/arrays/categorical/test_indexing.py b/pandas/tests/arrays/categorical/test_indexing.py index ae1b2a9d09ab2..8ff6a4709c0d7 100644 --- a/pandas/tests/arrays/categorical/test_indexing.py +++ b/pandas/tests/arrays/categorical/test_indexing.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, CategoricalIndex, Index, PeriodIndex, Series +import pandas._testing as tm import pandas.core.common as com from pandas.tests.arrays.categorical.common import TestCategorical diff --git a/pandas/tests/arrays/categorical/test_missing.py b/pandas/tests/arrays/categorical/test_missing.py index 954168aace227..211bf091ee17d 100644 --- a/pandas/tests/arrays/categorical/test_missing.py +++ b/pandas/tests/arrays/categorical/test_missing.py @@ -3,11 +3,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import Categorical, Index, Series, isna +import pandas._testing as tm class TestCategoricalMissing: diff --git a/pandas/tests/arrays/categorical/test_operators.py b/pandas/tests/arrays/categorical/test_operators.py index fb3e35a9c4c7a..f58524a86b4aa 100644 --- a/pandas/tests/arrays/categorical/test_operators.py +++ b/pandas/tests/arrays/categorical/test_operators.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, DataFrame, Series, date_range +import pandas._testing as tm from pandas.tests.arrays.categorical.common import TestCategorical diff --git a/pandas/tests/arrays/categorical/test_sorting.py b/pandas/tests/arrays/categorical/test_sorting.py index 65b7d573171f9..2a0ef043bf9a9 100644 --- a/pandas/tests/arrays/categorical/test_sorting.py +++ b/pandas/tests/arrays/categorical/test_sorting.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, Index +import pandas._testing as tm class TestCategoricalSort: diff --git a/pandas/tests/arrays/categorical/test_subclass.py b/pandas/tests/arrays/categorical/test_subclass.py index 4e89d1143e8da..b80d0ff41aba6 100644 --- a/pandas/tests/arrays/categorical/test_subclass.py +++ b/pandas/tests/arrays/categorical/test_subclass.py @@ -1,6 +1,5 @@ -import pandas.util._testing as tm - from pandas import Categorical +import pandas._testing as tm class TestCategoricalSubclassing: diff --git a/pandas/tests/arrays/categorical/test_warnings.py b/pandas/tests/arrays/categorical/test_warnings.py index 9d369e7f6e46a..1ee877cbbf348 100644 --- a/pandas/tests/arrays/categorical/test_warnings.py +++ b/pandas/tests/arrays/categorical/test_warnings.py @@ -1,6 +1,6 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm class TestCategoricalWarnings: diff --git a/pandas/tests/arrays/interval/test_interval.py b/pandas/tests/arrays/interval/test_interval.py index 56f002ac151f9..82db14d9eb135 100644 --- a/pandas/tests/arrays/interval/test_interval.py +++ b/pandas/tests/arrays/interval/test_interval.py @@ -1,8 +1,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Index, @@ -13,6 +11,7 @@ date_range, timedelta_range, ) +import pandas._testing as tm from pandas.core.arrays import IntervalArray diff --git a/pandas/tests/arrays/interval/test_ops.py b/pandas/tests/arrays/interval/test_ops.py index f2513c3029160..b4de80dc00a4e 100644 --- a/pandas/tests/arrays/interval/test_ops.py +++ b/pandas/tests/arrays/interval/test_ops.py @@ -2,9 +2,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Interval, IntervalIndex, Timedelta, Timestamp +import pandas._testing as tm from pandas.core.arrays import IntervalArray diff --git a/pandas/tests/arrays/sparse/test_accessor.py b/pandas/tests/arrays/sparse/test_accessor.py index 5c31dd81878ea..e40535697cf1b 100644 --- a/pandas/tests/arrays/sparse/test_accessor.py +++ b/pandas/tests/arrays/sparse/test_accessor.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm class TestSeriesAccessor: diff --git a/pandas/tests/arrays/sparse/test_arithmetics.py b/pandas/tests/arrays/sparse/test_arithmetics.py index 3a3786c1701d9..b23e011a92ed9 100644 --- a/pandas/tests/arrays/sparse/test_arithmetics.py +++ b/pandas/tests/arrays/sparse/test_arithmetics.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.core import ops from pandas.core.arrays.sparse import SparseDtype diff --git a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py index 88c317e7627e7..4cb6d48fa6ec0 100644 --- a/pandas/tests/arrays/sparse/test_array.py +++ b/pandas/tests/arrays/sparse/test_array.py @@ -7,10 +7,10 @@ from pandas._libs.sparse import IntIndex import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import isna +import pandas._testing as tm from pandas.core.arrays.sparse import SparseArray, SparseDtype diff --git a/pandas/tests/arrays/sparse/test_combine_concat.py b/pandas/tests/arrays/sparse/test_combine_concat.py index 7cb64c36c9452..bcca4a23ea9ed 100644 --- a/pandas/tests/arrays/sparse/test_combine_concat.py +++ b/pandas/tests/arrays/sparse/test_combine_concat.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestSparseArrayConcat: diff --git a/pandas/tests/arrays/sparse/test_libsparse.py b/pandas/tests/arrays/sparse/test_libsparse.py index 25f4a35332a3a..a2f861d378e67 100644 --- a/pandas/tests/arrays/sparse/test_libsparse.py +++ b/pandas/tests/arrays/sparse/test_libsparse.py @@ -5,9 +5,9 @@ import pandas._libs.sparse as splib import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import Series +import pandas._testing as tm from pandas.core.arrays.sparse import BlockIndex, IntIndex, _make_index TEST_LENGTH = 20 diff --git a/pandas/tests/arrays/string_/test_string.py b/pandas/tests/arrays/string_/test_string.py index 81454265d91a1..ec7e35e5c6db4 100644 --- a/pandas/tests/arrays/string_/test_string.py +++ b/pandas/tests/arrays/string_/test_string.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm def test_repr_with_NA(): diff --git a/pandas/tests/arrays/test_array.py b/pandas/tests/arrays/test_array.py index d0b49ccfdc14d..4d714623db5f7 100644 --- a/pandas/tests/arrays/test_array.py +++ b/pandas/tests/arrays/test_array.py @@ -5,11 +5,10 @@ import pytest import pytz -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import registry import pandas as pd +import pandas._testing as tm from pandas.api.extensions import register_extension_dtype from pandas.api.types import is_scalar from pandas.core.arrays import PandasArray, integer_array, period_array diff --git a/pandas/tests/arrays/test_boolean.py b/pandas/tests/arrays/test_boolean.py index b8a0f7e390e9e..278b4d41262b7 100644 --- a/pandas/tests/arrays/test_boolean.py +++ b/pandas/tests/arrays/test_boolean.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm from pandas.arrays import BooleanArray from pandas.core.arrays.boolean import coerce_to_array from pandas.tests.extension.base import BaseOpsUtil diff --git a/pandas/tests/arrays/test_datetimelike.py b/pandas/tests/arrays/test_datetimelike.py index 04c520dc3f4c8..d3108c30df324 100644 --- a/pandas/tests/arrays/test_datetimelike.py +++ b/pandas/tests/arrays/test_datetimelike.py @@ -4,9 +4,9 @@ import pytest from pandas._libs import OutOfBoundsDatetime -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm from pandas.core.arrays import DatetimeArray, PeriodArray, TimedeltaArray from pandas.core.indexes.datetimes import DatetimeIndex from pandas.core.indexes.period import PeriodIndex diff --git a/pandas/tests/arrays/test_datetimes.py b/pandas/tests/arrays/test_datetimes.py index a6c7018ab6211..bca629ae32270 100644 --- a/pandas/tests/arrays/test_datetimes.py +++ b/pandas/tests/arrays/test_datetimes.py @@ -6,11 +6,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import DatetimeTZDtype import pandas as pd +import pandas._testing as tm from pandas.core.arrays import DatetimeArray from pandas.core.arrays.datetimes import sequence_to_dt64ns diff --git a/pandas/tests/arrays/test_integer.py b/pandas/tests/arrays/test_integer.py index 2fe77d6b1c838..f172280202e64 100644 --- a/pandas/tests/arrays/test_integer.py +++ b/pandas/tests/arrays/test_integer.py @@ -2,11 +2,11 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.generic import ABCIndexClass import pandas as pd +import pandas._testing as tm from pandas.api.types import is_float, is_float_dtype, is_integer, is_scalar from pandas.core.arrays import IntegerArray, integer_array from pandas.core.arrays.integer import ( diff --git a/pandas/tests/arrays/test_numpy.py b/pandas/tests/arrays/test_numpy.py index 36cd2318dd03c..86793c4ec50dd 100644 --- a/pandas/tests/arrays/test_numpy.py +++ b/pandas/tests/arrays/test_numpy.py @@ -5,9 +5,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.arrays import PandasArray from pandas.core.arrays.numpy_ import PandasDtype diff --git a/pandas/tests/arrays/test_period.py b/pandas/tests/arrays/test_period.py index b9efd66a4c229..5068e8d57e1de 100644 --- a/pandas/tests/arrays/test_period.py +++ b/pandas/tests/arrays/test_period.py @@ -3,11 +3,11 @@ from pandas._libs.tslibs import iNaT from pandas._libs.tslibs.period import IncompatibleFrequency -import pandas.util._testing as tm from pandas.core.dtypes.dtypes import PeriodDtype, registry import pandas as pd +import pandas._testing as tm from pandas.core.arrays import PeriodArray, period_array # ---------------------------------------------------------------------------- diff --git a/pandas/tests/arrays/test_timedeltas.py b/pandas/tests/arrays/test_timedeltas.py index a5b098f8d9509..667fe36ddf572 100644 --- a/pandas/tests/arrays/test_timedeltas.py +++ b/pandas/tests/arrays/test_timedeltas.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.core.arrays import TimedeltaArray diff --git a/pandas/tests/base/test_constructors.py b/pandas/tests/base/test_constructors.py index 462f67f2431c9..0b7274399aafc 100644 --- a/pandas/tests/base/test_constructors.py +++ b/pandas/tests/base/test_constructors.py @@ -5,10 +5,10 @@ import pytest from pandas.compat import PYPY -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series +import pandas._testing as tm from pandas.core.accessor import PandasDelegate from pandas.core.base import NoNewAttributesMixin, PandasObject diff --git a/pandas/tests/base/test_conversion.py b/pandas/tests/base/test_conversion.py index c45a99b7781b6..486a1daaf8b50 100644 --- a/pandas/tests/base/test_conversion.py +++ b/pandas/tests/base/test_conversion.py @@ -1,13 +1,12 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_datetime64_dtype, is_timedelta64_dtype from pandas.core.dtypes.dtypes import DatetimeTZDtype import pandas as pd from pandas import CategoricalIndex, Series, Timedelta, Timestamp +import pandas._testing as tm from pandas.core.arrays import DatetimeArray, PandasArray, TimedeltaArray diff --git a/pandas/tests/base/test_ops.py b/pandas/tests/base/test_ops.py index cd16c4389a57f..2693eb12dda71 100644 --- a/pandas/tests/base/test_ops.py +++ b/pandas/tests/base/test_ops.py @@ -8,7 +8,6 @@ from pandas._libs.tslib import iNaT from pandas.compat import PYPY from pandas.compat.numpy import np_array_datetime64_compat -import pandas.util._testing as tm from pandas.core.dtypes.common import ( is_datetime64_dtype, @@ -30,6 +29,7 @@ TimedeltaIndex, Timestamp, ) +import pandas._testing as tm from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin diff --git a/pandas/tests/computation/test_eval.py b/pandas/tests/computation/test_eval.py index 310e09ba63f48..886c43f84045e 100644 --- a/pandas/tests/computation/test_eval.py +++ b/pandas/tests/computation/test_eval.py @@ -11,12 +11,12 @@ from pandas.errors import PerformanceWarning import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.common import is_bool, is_list_like, is_scalar import pandas as pd from pandas import DataFrame, Series, compat, date_range +import pandas._testing as tm from pandas.core.computation import pytables from pandas.core.computation.check import _NUMEXPR_VERSION from pandas.core.computation.engines import NumExprClobberingError, _engines diff --git a/pandas/tests/dtypes/cast/test_construct_from_scalar.py b/pandas/tests/dtypes/cast/test_construct_from_scalar.py index cc65d47ef77bf..cc823a3d6e02c 100644 --- a/pandas/tests/dtypes/cast/test_construct_from_scalar.py +++ b/pandas/tests/dtypes/cast/test_construct_from_scalar.py @@ -1,9 +1,8 @@ -import pandas.util._testing as tm - from pandas.core.dtypes.cast import construct_1d_arraylike_from_scalar from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import Categorical +import pandas._testing as tm def test_cast_1d_array_like_from_scalar_categorical(): diff --git a/pandas/tests/dtypes/cast/test_construct_ndarray.py b/pandas/tests/dtypes/cast/test_construct_ndarray.py index 7faf20302c7cf..fe271392122a2 100644 --- a/pandas/tests/dtypes/cast/test_construct_ndarray.py +++ b/pandas/tests/dtypes/cast/test_construct_ndarray.py @@ -1,10 +1,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.cast import construct_1d_ndarray_preserving_na +import pandas._testing as tm + @pytest.mark.parametrize( "values, dtype, expected", diff --git a/pandas/tests/dtypes/cast/test_downcast.py b/pandas/tests/dtypes/cast/test_downcast.py index bc196a886a016..d6e6ed3022b75 100644 --- a/pandas/tests/dtypes/cast/test_downcast.py +++ b/pandas/tests/dtypes/cast/test_downcast.py @@ -3,11 +3,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.cast import maybe_downcast_to_dtype from pandas import DatetimeIndex, Series, Timestamp +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/dtypes/cast/test_infer_dtype.py b/pandas/tests/dtypes/cast/test_infer_dtype.py index 08debe2bda95f..2744cfa8ddc62 100644 --- a/pandas/tests/dtypes/cast/test_infer_dtype.py +++ b/pandas/tests/dtypes/cast/test_infer_dtype.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.cast import ( cast_scalar_to_array, infer_dtype_from_array, @@ -21,6 +19,7 @@ Timestamp, date_range, ) +import pandas._testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/dtypes/cast/test_upcast.py b/pandas/tests/dtypes/cast/test_upcast.py index 33420b210cc27..bb7a7d059c7ee 100644 --- a/pandas/tests/dtypes/cast/test_upcast.py +++ b/pandas/tests/dtypes/cast/test_upcast.py @@ -1,11 +1,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.cast import maybe_upcast_putmask from pandas import Series +import pandas._testing as tm @pytest.mark.parametrize("result", [Series([10, 11, 12]), [10, 11, 12], (10, 11, 12)]) diff --git a/pandas/tests/dtypes/test_common.py b/pandas/tests/dtypes/test_common.py index 608619115d31f..f58979f807adb 100644 --- a/pandas/tests/dtypes/test_common.py +++ b/pandas/tests/dtypes/test_common.py @@ -5,7 +5,6 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.cast import astype_nansafe import pandas.core.dtypes.common as com @@ -19,6 +18,7 @@ from pandas.core.dtypes.missing import isna import pandas as pd +import pandas._testing as tm from pandas.conftest import ( ALL_EA_INT_DTYPES, ALL_INT_DTYPES, diff --git a/pandas/tests/dtypes/test_dtypes.py b/pandas/tests/dtypes/test_dtypes.py index 1ca1edc41c8d2..13648322fc9c9 100644 --- a/pandas/tests/dtypes/test_dtypes.py +++ b/pandas/tests/dtypes/test_dtypes.py @@ -4,8 +4,6 @@ import pytest import pytz -import pandas.util._testing as tm - from pandas.core.dtypes.common import ( is_bool_dtype, is_categorical, @@ -29,6 +27,7 @@ import pandas as pd from pandas import Categorical, CategoricalIndex, IntervalIndex, Series, date_range +import pandas._testing as tm from pandas.core.arrays.sparse import SparseDtype diff --git a/pandas/tests/dtypes/test_generic.py b/pandas/tests/dtypes/test_generic.py index e5ee943dda2a7..6e9334996100f 100644 --- a/pandas/tests/dtypes/test_generic.py +++ b/pandas/tests/dtypes/test_generic.py @@ -2,11 +2,10 @@ import numpy as np -import pandas.util._testing as tm - from pandas.core.dtypes import generic as gt import pandas as pd +import pandas._testing as tm class TestABCClasses: diff --git a/pandas/tests/dtypes/test_inference.py b/pandas/tests/dtypes/test_inference.py index 28bcf0945edb9..d5ca35dce1c85 100644 --- a/pandas/tests/dtypes/test_inference.py +++ b/pandas/tests/dtypes/test_inference.py @@ -18,7 +18,6 @@ from pandas._libs import iNaT, lib, missing as libmissing import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes import inference from pandas.core.dtypes.common import ( @@ -53,6 +52,7 @@ Timestamp, isna, ) +import pandas._testing as tm from pandas.core.arrays import IntegerArray diff --git a/pandas/tests/dtypes/test_missing.py b/pandas/tests/dtypes/test_missing.py index 1d189228a0fbf..52b74c0820b42 100644 --- a/pandas/tests/dtypes/test_missing.py +++ b/pandas/tests/dtypes/test_missing.py @@ -9,7 +9,6 @@ from pandas._libs import missing as libmissing from pandas._libs.tslibs import iNaT, is_null_datetimelike -import pandas.util._testing as tm from pandas.core.dtypes.common import is_scalar from pandas.core.dtypes.dtypes import DatetimeTZDtype, IntervalDtype, PeriodDtype @@ -24,6 +23,7 @@ import pandas as pd from pandas import DatetimeIndex, Float64Index, NaT, Series, TimedeltaIndex, date_range +import pandas._testing as tm now = pd.Timestamp.now() utcnow = pd.Timestamp.now("UTC") diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index ea549f6c192ff..033cb4437cfbe 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.tests.extension import base pytest.importorskip("pyarrow", minversion="0.12.0") diff --git a/pandas/tests/extension/base/base.py b/pandas/tests/extension/base/base.py index e91a875a14647..144b0825b39a2 100644 --- a/pandas/tests/extension/base/base.py +++ b/pandas/tests/extension/base/base.py @@ -1,4 +1,4 @@ -import pandas.util._testing as tm +import pandas._testing as tm class BaseExtensionTests: diff --git a/pandas/tests/extension/base/groupby.py b/pandas/tests/extension/base/groupby.py index 673bf6515366f..94d0ef7bbea84 100644 --- a/pandas/tests/extension/base/groupby.py +++ b/pandas/tests/extension/base/groupby.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/interface.py b/pandas/tests/extension/base/interface.py index e2f4b326c5540..cdea96334be2a 100644 --- a/pandas/tests/extension/base/interface.py +++ b/pandas/tests/extension/base/interface.py @@ -1,11 +1,10 @@ import numpy as np -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_extension_array_dtype from pandas.core.dtypes.dtypes import ExtensionDtype import pandas as pd +import pandas._testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/methods.py b/pandas/tests/extension/base/methods.py index 10c2ffafa73ba..1e427c6319cab 100644 --- a/pandas/tests/extension/base/methods.py +++ b/pandas/tests/extension/base/methods.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.core.sorting import nargsort from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/missing.py b/pandas/tests/extension/base/missing.py index 1df0ccba6e85e..2393d2edcd2c6 100644 --- a/pandas/tests/extension/base/missing.py +++ b/pandas/tests/extension/base/missing.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/base/reduce.py b/pandas/tests/extension/base/reduce.py index 64e630acfe907..6f433d659575a 100644 --- a/pandas/tests/extension/base/reduce.py +++ b/pandas/tests/extension/base/reduce.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from .base import BaseExtensionTests diff --git a/pandas/tests/extension/decimal/test_decimal.py b/pandas/tests/extension/decimal/test_decimal.py index 63bb68646137e..d946772a98779 100644 --- a/pandas/tests/extension/decimal/test_decimal.py +++ b/pandas/tests/extension/decimal/test_decimal.py @@ -5,9 +5,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.tests.extension import base from .array import DecimalArray, DecimalDtype, make_data, to_decimal diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index aa995ebfeac00..4d3145109e3c2 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -3,9 +3,8 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.tests.extension import base from .array import JSONArray, JSONDtype, make_data diff --git a/pandas/tests/extension/test_boolean.py b/pandas/tests/extension/test_boolean.py index 166e37aa6ed39..9c151b5482c9d 100644 --- a/pandas/tests/extension/test_boolean.py +++ b/pandas/tests/extension/test_boolean.py @@ -17,9 +17,9 @@ import pytest from pandas.compat.numpy import _np_version_under1p14 -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm from pandas.core.arrays.boolean import BooleanDtype from pandas.tests.extension import base diff --git a/pandas/tests/extension/test_categorical.py b/pandas/tests/extension/test_categorical.py index 88d26dc58843a..336b23e54d74c 100644 --- a/pandas/tests/extension/test_categorical.py +++ b/pandas/tests/extension/test_categorical.py @@ -18,10 +18,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, CategoricalIndex, Timestamp +import pandas._testing as tm from pandas.api.types import CategoricalDtype from pandas.tests.extension import base diff --git a/pandas/tests/extension/test_common.py b/pandas/tests/extension/test_common.py index b7de2456539b3..e43650c291200 100644 --- a/pandas/tests/extension/test_common.py +++ b/pandas/tests/extension/test_common.py @@ -1,12 +1,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes import dtypes from pandas.core.dtypes.common import is_extension_array_dtype import pandas as pd +import pandas._testing as tm from pandas.core.arrays import ExtensionArray diff --git a/pandas/tests/extension/test_numpy.py b/pandas/tests/extension/test_numpy.py index 8dbaaf6f2a1c7..7db38f41d4573 100644 --- a/pandas/tests/extension/test_numpy.py +++ b/pandas/tests/extension/test_numpy.py @@ -2,9 +2,9 @@ import pytest from pandas.compat.numpy import _np_version_under1p16 -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm from pandas.core.arrays.numpy_ import PandasArray, PandasDtype from . import base diff --git a/pandas/tests/extension/test_sparse.py b/pandas/tests/extension/test_sparse.py index 2946c728c6527..3c54f8fcd012b 100644 --- a/pandas/tests/extension/test_sparse.py +++ b/pandas/tests/extension/test_sparse.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import SparseArray, SparseDtype +import pandas._testing as tm from pandas.tests.extension import base diff --git a/pandas/tests/frame/conftest.py b/pandas/tests/frame/conftest.py index 3c91d41716a2e..774eb443c45fe 100644 --- a/pandas/tests/frame/conftest.py +++ b/pandas/tests/frame/conftest.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, NaT, date_range +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/frame/indexing/test_categorical.py b/pandas/tests/frame/indexing/test_categorical.py index 7be28d5021e09..5de38915f04c1 100644 --- a/pandas/tests/frame/indexing/test_categorical.py +++ b/pandas/tests/frame/indexing/test_categorical.py @@ -1,12 +1,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import Categorical, DataFrame, Index, Series +import pandas._testing as tm class TestDataFrameIndexingCategorical: diff --git a/pandas/tests/frame/indexing/test_datetime.py b/pandas/tests/frame/indexing/test_datetime.py index e6449f08831e8..a1c12be2b0180 100644 --- a/pandas/tests/frame/indexing/test_datetime.py +++ b/pandas/tests/frame/indexing/test_datetime.py @@ -1,7 +1,6 @@ -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, date_range, notna +import pandas._testing as tm class TestDataFrameIndexingDatetimeWithTZ: diff --git a/pandas/tests/frame/indexing/test_indexing.py b/pandas/tests/frame/indexing/test_indexing.py index f3adc1ca90bfc..0734a7bb240e5 100644 --- a/pandas/tests/frame/indexing/test_indexing.py +++ b/pandas/tests/frame/indexing/test_indexing.py @@ -5,7 +5,6 @@ import pytest from pandas._libs.tslib import iNaT -import pandas.util._testing as tm from pandas.core.dtypes.common import is_float_dtype, is_integer @@ -21,6 +20,7 @@ isna, notna, ) +import pandas._testing as tm import pandas.core.common as com from pandas.core.indexing import IndexingError diff --git a/pandas/tests/frame/indexing/test_where.py b/pandas/tests/frame/indexing/test_where.py index b728468b21dbd..df1b128dcd227 100644 --- a/pandas/tests/frame/indexing/test_where.py +++ b/pandas/tests/frame/indexing/test_where.py @@ -3,12 +3,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_scalar import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, Timestamp, date_range, isna +import pandas._testing as tm class TestDataFrameIndexingWhere: diff --git a/pandas/tests/frame/methods/test_append.py b/pandas/tests/frame/methods/test_append.py index 17fbcd8c3bb72..d128a51f4b390 100644 --- a/pandas/tests/frame/methods/test_append.py +++ b/pandas/tests/frame/methods/test_append.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp +import pandas._testing as tm class TestDataFrameAppend: diff --git a/pandas/tests/frame/methods/test_asof.py b/pandas/tests/frame/methods/test_asof.py index 1c94fff2635d0..055f81c9942a6 100644 --- a/pandas/tests/frame/methods/test_asof.py +++ b/pandas/tests/frame/methods/test_asof.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series, Timestamp, date_range, to_datetime +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/frame/methods/test_clip.py b/pandas/tests/frame/methods/test_clip.py index be7f583b7394a..34727da3b95ae 100644 --- a/pandas/tests/frame/methods/test_clip.py +++ b/pandas/tests/frame/methods/test_clip.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm class TestDataFrameClip: diff --git a/pandas/tests/frame/methods/test_count.py b/pandas/tests/frame/methods/test_count.py index 3a527bdbd810d..13a93e3efc48c 100644 --- a/pandas/tests/frame/methods/test_count.py +++ b/pandas/tests/frame/methods/test_count.py @@ -1,6 +1,5 @@ -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm class TestDataFrameCount: diff --git a/pandas/tests/frame/methods/test_cov_corr.py b/pandas/tests/frame/methods/test_cov_corr.py index 85b4781cc32ec..5c13b60aae0d0 100644 --- a/pandas/tests/frame/methods/test_cov_corr.py +++ b/pandas/tests/frame/methods/test_cov_corr.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, isna +import pandas._testing as tm class TestDataFrameCov: diff --git a/pandas/tests/frame/methods/test_describe.py b/pandas/tests/frame/methods/test_describe.py index 99e13cf9bcc15..251563e51e15a 100644 --- a/pandas/tests/frame/methods/test_describe.py +++ b/pandas/tests/frame/methods/test_describe.py @@ -1,9 +1,8 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, DataFrame, Series, Timestamp, date_range +import pandas._testing as tm class TestDataFrameDescribe: diff --git a/pandas/tests/frame/methods/test_diff.py b/pandas/tests/frame/methods/test_diff.py index f2cba57c40355..43c25f4c05c2d 100644 --- a/pandas/tests/frame/methods/test_diff.py +++ b/pandas/tests/frame/methods/test_diff.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range +import pandas._testing as tm class TestDataFrameDiff: diff --git a/pandas/tests/frame/methods/test_drop_duplicates.py b/pandas/tests/frame/methods/test_drop_duplicates.py index f7b9ecfe42235..95624dd769b18 100644 --- a/pandas/tests/frame/methods/test_drop_duplicates.py +++ b/pandas/tests/frame/methods/test_drop_duplicates.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm @pytest.mark.parametrize("subset", ["a", ["a"], ["a", "B"]]) diff --git a/pandas/tests/frame/methods/test_duplicated.py b/pandas/tests/frame/methods/test_duplicated.py index fb54246cec398..72eec8753315c 100644 --- a/pandas/tests/frame/methods/test_duplicated.py +++ b/pandas/tests/frame/methods/test_duplicated.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm @pytest.mark.parametrize("subset", ["a", ["a"], ["a", "B"]]) diff --git a/pandas/tests/frame/methods/test_explode.py b/pandas/tests/frame/methods/test_explode.py index 8b66ae3116219..76c87ed355492 100644 --- a/pandas/tests/frame/methods/test_explode.py +++ b/pandas/tests/frame/methods/test_explode.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm def test_error(): diff --git a/pandas/tests/frame/methods/test_isin.py b/pandas/tests/frame/methods/test_isin.py index faaa8be3ebc63..0eb94afc99d94 100644 --- a/pandas/tests/frame/methods/test_isin.py +++ b/pandas/tests/frame/methods/test_isin.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm class TestDataFrameIsIn: diff --git a/pandas/tests/frame/methods/test_nlargest.py b/pandas/tests/frame/methods/test_nlargest.py index 5a76d6e856798..4ce474230b686 100644 --- a/pandas/tests/frame/methods/test_nlargest.py +++ b/pandas/tests/frame/methods/test_nlargest.py @@ -7,9 +7,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/frame/methods/test_pct_change.py b/pandas/tests/frame/methods/test_pct_change.py index ff5107b42f4cd..2980838281783 100644 --- a/pandas/tests/frame/methods/test_pct_change.py +++ b/pandas/tests/frame/methods/test_pct_change.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm class TestDataFramePctChange: diff --git a/pandas/tests/frame/methods/test_quantile.py b/pandas/tests/frame/methods/test_quantile.py index 3115dc3078938..9c0ab67e62a1a 100644 --- a/pandas/tests/frame/methods/test_quantile.py +++ b/pandas/tests/frame/methods/test_quantile.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp +import pandas._testing as tm class TestDataFrameQuantile: diff --git a/pandas/tests/frame/methods/test_rank.py b/pandas/tests/frame/methods/test_rank.py index fae4745a69007..bab2db3192b4a 100644 --- a/pandas/tests/frame/methods/test_rank.py +++ b/pandas/tests/frame/methods/test_rank.py @@ -4,9 +4,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Series +import pandas._testing as tm class TestRank: diff --git a/pandas/tests/frame/methods/test_replace.py b/pandas/tests/frame/methods/test_replace.py index 6d2afd9fe0c5d..aa91e7a489356 100644 --- a/pandas/tests/frame/methods/test_replace.py +++ b/pandas/tests/frame/methods/test_replace.py @@ -6,10 +6,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, date_range +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/frame/methods/test_round.py b/pandas/tests/frame/methods/test_round.py index 486ac0a5042a3..0865e03cedc50 100644 --- a/pandas/tests/frame/methods/test_round.py +++ b/pandas/tests/frame/methods/test_round.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, date_range +import pandas._testing as tm class TestDataFrameRound: diff --git a/pandas/tests/frame/methods/test_shift.py b/pandas/tests/frame/methods/test_shift.py index 5acf66439dfd7..cfb17de892b1c 100644 --- a/pandas/tests/frame/methods/test_shift.py +++ b/pandas/tests/frame/methods/test_shift.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, date_range, offsets +import pandas._testing as tm class TestDataFrameShift: diff --git a/pandas/tests/frame/methods/test_sort_index.py b/pandas/tests/frame/methods/test_sort_index.py index ba9c4b2eb3cfc..bee60c6cd7fb9 100644 --- a/pandas/tests/frame/methods/test_sort_index.py +++ b/pandas/tests/frame/methods/test_sort_index.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import CategoricalDtype, DataFrame, IntervalIndex, MultiIndex, Series +import pandas._testing as tm class TestDataFrameSortIndex: diff --git a/pandas/tests/frame/methods/test_sort_values.py b/pandas/tests/frame/methods/test_sort_values.py index 88c4fb1e71a42..375023328a95e 100644 --- a/pandas/tests/frame/methods/test_sort_values.py +++ b/pandas/tests/frame/methods/test_sort_values.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, DataFrame, NaT, Timestamp, date_range +import pandas._testing as tm class TestDataFrameSortValues: diff --git a/pandas/tests/frame/methods/test_to_dict.py b/pandas/tests/frame/methods/test_to_dict.py index d05331d45e5e7..7b0adceb57668 100644 --- a/pandas/tests/frame/methods/test_to_dict.py +++ b/pandas/tests/frame/methods/test_to_dict.py @@ -5,9 +5,8 @@ import pytest import pytz -import pandas.util._testing as tm - from pandas import DataFrame, Series, Timestamp +import pandas._testing as tm class TestDataFrameToDict: diff --git a/pandas/tests/frame/methods/test_to_records.py b/pandas/tests/frame/methods/test_to_records.py index 308c3e3257748..8099c881c987e 100644 --- a/pandas/tests/frame/methods/test_to_records.py +++ b/pandas/tests/frame/methods/test_to_records.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import CategoricalDtype, DataFrame, MultiIndex, Series, date_range +import pandas._testing as tm class TestDataFrameToRecords: diff --git a/pandas/tests/frame/methods/test_transpose.py b/pandas/tests/frame/methods/test_transpose.py index 2b0df921d87d6..428b9e5068407 100644 --- a/pandas/tests/frame/methods/test_transpose.py +++ b/pandas/tests/frame/methods/test_transpose.py @@ -1,6 +1,5 @@ -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestTranspose: diff --git a/pandas/tests/frame/methods/test_truncate.py b/pandas/tests/frame/methods/test_truncate.py index 721e15099375b..ad86ee1266874 100644 --- a/pandas/tests/frame/methods/test_truncate.py +++ b/pandas/tests/frame/methods/test_truncate.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestDataFrameTruncate: diff --git a/pandas/tests/frame/test_alter_axes.py b/pandas/tests/frame/test_alter_axes.py index 7f1ac0bfc5457..ac945e6f10674 100644 --- a/pandas/tests/frame/test_alter_axes.py +++ b/pandas/tests/frame/test_alter_axes.py @@ -5,8 +5,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import ( is_categorical_dtype, is_interval_dtype, @@ -27,6 +25,7 @@ date_range, to_datetime, ) +import pandas._testing as tm class TestDataFrameAlterAxes: diff --git a/pandas/tests/frame/test_analytics.py b/pandas/tests/frame/test_analytics.py index c3a4f1563c639..910230c737a2a 100644 --- a/pandas/tests/frame/test_analytics.py +++ b/pandas/tests/frame/test_analytics.py @@ -6,7 +6,6 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -21,6 +20,7 @@ to_datetime, to_timedelta, ) +import pandas._testing as tm import pandas.core.algorithms as algorithms import pandas.core.nanops as nanops diff --git a/pandas/tests/frame/test_api.py b/pandas/tests/frame/test_api.py index 4ac503fd472e2..8093b602dd6f3 100644 --- a/pandas/tests/frame/test_api.py +++ b/pandas/tests/frame/test_api.py @@ -6,10 +6,10 @@ import pytest from pandas.compat import PY37 -import pandas.util._testing as tm import pandas as pd from pandas import Categorical, DataFrame, Series, compat, date_range, timedelta_range +import pandas._testing as tm class TestDataFrameMisc: diff --git a/pandas/tests/frame/test_apply.py b/pandas/tests/frame/test_apply.py index 34439078e07b4..d3b5d82280ced 100644 --- a/pandas/tests/frame/test_apply.py +++ b/pandas/tests/frame/test_apply.py @@ -7,12 +7,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range, notna +import pandas._testing as tm from pandas.conftest import _get_cython_table_params from pandas.core.apply import frame_apply from pandas.core.base import SpecificationError diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py index f7ee56932bf8e..156cc18ded1bf 100644 --- a/pandas/tests/frame/test_arithmetic.py +++ b/pandas/tests/frame/test_arithmetic.py @@ -5,9 +5,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.tests.frame.common import _check_mixed_float, _check_mixed_int # ------------------------------------------------------------------- diff --git a/pandas/tests/frame/test_axis_select_reindex.py b/pandas/tests/frame/test_axis_select_reindex.py index d4e2d59e9bdb7..7effa98fd8213 100644 --- a/pandas/tests/frame/test_axis_select_reindex.py +++ b/pandas/tests/frame/test_axis_select_reindex.py @@ -5,10 +5,10 @@ import pytest from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import Categorical, DataFrame, Index, MultiIndex, Series, date_range, isna +import pandas._testing as tm class TestDataFrameSelectReindex: diff --git a/pandas/tests/frame/test_block_internals.py b/pandas/tests/frame/test_block_internals.py index 073f546a00e74..d301ed969789e 100644 --- a/pandas/tests/frame/test_block_internals.py +++ b/pandas/tests/frame/test_block_internals.py @@ -5,8 +5,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -17,6 +15,7 @@ date_range, option_context, ) +import pandas._testing as tm from pandas.core.arrays import IntervalArray, integer_array from pandas.core.internals import ObjectBlock from pandas.core.internals.blocks import IntBlock diff --git a/pandas/tests/frame/test_combine_concat.py b/pandas/tests/frame/test_combine_concat.py index 8bfa4c0047dbb..9bad54b051d6c 100644 --- a/pandas/tests/frame/test_combine_concat.py +++ b/pandas/tests/frame/test_combine_concat.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, date_range +import pandas._testing as tm class TestDataFrameConcatCommon: diff --git a/pandas/tests/frame/test_constructors.py b/pandas/tests/frame/test_constructors.py index 4e00bde7c74b1..071c6bb79d30e 100644 --- a/pandas/tests/frame/test_constructors.py +++ b/pandas/tests/frame/test_constructors.py @@ -9,7 +9,6 @@ import pytest from pandas.compat import is_platform_little_endian -import pandas.util._testing as tm from pandas.core.dtypes.common import is_integer_dtype @@ -26,6 +25,7 @@ date_range, isna, ) +import pandas._testing as tm from pandas.arrays import IntervalArray, PeriodArray from pandas.core.construction import create_series_with_explicit_dtype diff --git a/pandas/tests/frame/test_cumulative.py b/pandas/tests/frame/test_cumulative.py index 7d2e4b86d4344..b545d6aa8afd3 100644 --- a/pandas/tests/frame/test_cumulative.py +++ b/pandas/tests/frame/test_cumulative.py @@ -8,9 +8,8 @@ import numpy as np -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm class TestDataFrameCumulativeOps: diff --git a/pandas/tests/frame/test_dtypes.py b/pandas/tests/frame/test_dtypes.py index cbff72a5ce8e3..06bb040224455 100644 --- a/pandas/tests/frame/test_dtypes.py +++ b/pandas/tests/frame/test_dtypes.py @@ -4,8 +4,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype, DatetimeTZDtype, IntervalDtype import pandas as pd @@ -20,6 +18,7 @@ date_range, option_context, ) +import pandas._testing as tm from pandas.core.arrays import integer_array diff --git a/pandas/tests/frame/test_join.py b/pandas/tests/frame/test_join.py index c5cfc00923b98..c6e28f3c64f12 100644 --- a/pandas/tests/frame/test_join.py +++ b/pandas/tests/frame/test_join.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, period_range +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/frame/test_missing.py b/pandas/tests/frame/test_missing.py index f1d16e3882d29..651929216a722 100644 --- a/pandas/tests/frame/test_missing.py +++ b/pandas/tests/frame/test_missing.py @@ -5,10 +5,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import Categorical, DataFrame, Series, Timestamp, date_range +import pandas._testing as tm from pandas.tests.frame.common import _check_mixed_float diff --git a/pandas/tests/frame/test_mutate_columns.py b/pandas/tests/frame/test_mutate_columns.py index d4563d3228dc8..8bc2aa214e035 100644 --- a/pandas/tests/frame/test_mutate_columns.py +++ b/pandas/tests/frame/test_mutate_columns.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm # Column add, remove, delete. diff --git a/pandas/tests/frame/test_nonunique_indexes.py b/pandas/tests/frame/test_nonunique_indexes.py index d27fb5c33ffe1..32ead406a3e86 100644 --- a/pandas/tests/frame/test_nonunique_indexes.py +++ b/pandas/tests/frame/test_nonunique_indexes.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range +import pandas._testing as tm class TestDataFrameNonuniqueIndexes: diff --git a/pandas/tests/frame/test_operators.py b/pandas/tests/frame/test_operators.py index 0f93348c34de4..c727cb398d53e 100644 --- a/pandas/tests/frame/test_operators.py +++ b/pandas/tests/frame/test_operators.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm import pandas.core.common as com from pandas.tests.frame.common import _check_mixed_float diff --git a/pandas/tests/frame/test_period.py b/pandas/tests/frame/test_period.py index c3ecbe48ee295..a6b2b334d3ec8 100644 --- a/pandas/tests/frame/test_period.py +++ b/pandas/tests/frame/test_period.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( DataFrame, @@ -16,6 +14,7 @@ period_range, to_datetime, ) +import pandas._testing as tm def _permute(obj): diff --git a/pandas/tests/frame/test_query_eval.py b/pandas/tests/frame/test_query_eval.py index 363e265966792..9cd26160ec877 100644 --- a/pandas/tests/frame/test_query_eval.py +++ b/pandas/tests/frame/test_query_eval.py @@ -5,10 +5,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, date_range +import pandas._testing as tm from pandas.core.computation.check import _NUMEXPR_INSTALLED PARSERS = "python", "pandas" diff --git a/pandas/tests/frame/test_repr_info.py b/pandas/tests/frame/test_repr_info.py index 996d938b95976..2fcf05f6c726f 100644 --- a/pandas/tests/frame/test_repr_info.py +++ b/pandas/tests/frame/test_repr_info.py @@ -9,7 +9,6 @@ import pytest from pandas.compat import PYPY -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -20,6 +19,7 @@ option_context, period_range, ) +import pandas._testing as tm import pandas.io.formats.format as fmt diff --git a/pandas/tests/frame/test_reshape.py b/pandas/tests/frame/test_reshape.py index 291a526e2b9e1..b77d3029a5446 100644 --- a/pandas/tests/frame/test_reshape.py +++ b/pandas/tests/frame/test_reshape.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Period, Series, Timedelta, date_range +import pandas._testing as tm class TestDataFrameReshape: diff --git a/pandas/tests/frame/test_sort_values_level_as_str.py b/pandas/tests/frame/test_sort_values_level_as_str.py index f7fe05c14a412..40526ab27ac9a 100644 --- a/pandas/tests/frame/test_sort_values_level_as_str.py +++ b/pandas/tests/frame/test_sort_values_level_as_str.py @@ -2,9 +2,9 @@ import pytest from pandas.errors import PerformanceWarning -import pandas.util._testing as tm from pandas import DataFrame +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/frame/test_subclass.py b/pandas/tests/frame/test_subclass.py index 56ab9d3a40a14..4a436d70dc48f 100644 --- a/pandas/tests/frame/test_subclass.py +++ b/pandas/tests/frame/test_subclass.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm class TestDataFrameSubclassing: diff --git a/pandas/tests/frame/test_timeseries.py b/pandas/tests/frame/test_timeseries.py index cff2bcacdd59b..e89f4ee07ea00 100644 --- a/pandas/tests/frame/test_timeseries.py +++ b/pandas/tests/frame/test_timeseries.py @@ -5,8 +5,6 @@ import pytest import pytz -import pandas.util._testing as tm - import pandas as pd from pandas import ( DataFrame, @@ -18,6 +16,7 @@ period_range, to_datetime, ) +import pandas._testing as tm import pandas.tseries.offsets as offsets diff --git a/pandas/tests/frame/test_timezones.py b/pandas/tests/frame/test_timezones.py index 79315213ab540..b60f2052a988f 100644 --- a/pandas/tests/frame/test_timezones.py +++ b/pandas/tests/frame/test_timezones.py @@ -7,12 +7,11 @@ import pytest import pytz -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import DatetimeTZDtype import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/frame/test_to_csv.py b/pandas/tests/frame/test_to_csv.py index 8f9f85709b16d..aeff92971b42a 100644 --- a/pandas/tests/frame/test_to_csv.py +++ b/pandas/tests/frame/test_to_csv.py @@ -6,7 +6,6 @@ import pytest from pandas.errors import ParserError -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -19,6 +18,7 @@ read_csv, to_datetime, ) +import pandas._testing as tm import pandas.core.common as com from pandas.io.common import get_handle diff --git a/pandas/tests/generic/test_frame.py b/pandas/tests/generic/test_frame.py index 110eb68a84bb4..9eb90b296fa1e 100644 --- a/pandas/tests/generic/test_frame.py +++ b/pandas/tests/generic/test_frame.py @@ -6,10 +6,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range +import pandas._testing as tm from .test_generic import Generic diff --git a/pandas/tests/generic/test_generic.py b/pandas/tests/generic/test_generic.py index ab5220ee3c1a2..cdb79dc6606ff 100644 --- a/pandas/tests/generic/test_generic.py +++ b/pandas/tests/generic/test_generic.py @@ -3,12 +3,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_scalar import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range +import pandas._testing as tm # ---------------------------------------------------------------------- # Generic types test cases diff --git a/pandas/tests/generic/test_series.py b/pandas/tests/generic/test_series.py index 3a43e54215886..8ad8355f2d530 100644 --- a/pandas/tests/generic/test_series.py +++ b/pandas/tests/generic/test_series.py @@ -5,10 +5,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import MultiIndex, Series, date_range +import pandas._testing as tm from .test_generic import Generic diff --git a/pandas/tests/groupby/aggregate/test_aggregate.py b/pandas/tests/groupby/aggregate/test_aggregate.py index 1e94e9539a2d1..0b72a61ed84de 100644 --- a/pandas/tests/groupby/aggregate/test_aggregate.py +++ b/pandas/tests/groupby/aggregate/test_aggregate.py @@ -6,10 +6,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, concat +import pandas._testing as tm from pandas.core.base import SpecificationError from pandas.core.groupby.generic import _make_unique, _maybe_mangle_lambdas from pandas.core.groupby.grouper import Grouping diff --git a/pandas/tests/groupby/aggregate/test_cython.py b/pandas/tests/groupby/aggregate/test_cython.py index 75fd9fd59895a..5ddda264642de 100644 --- a/pandas/tests/groupby/aggregate/test_cython.py +++ b/pandas/tests/groupby/aggregate/test_cython.py @@ -5,10 +5,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, NaT, Series, Timedelta, Timestamp, bdate_range +import pandas._testing as tm from pandas.core.groupby.groupby import DataError diff --git a/pandas/tests/groupby/aggregate/test_other.py b/pandas/tests/groupby/aggregate/test_other.py index 487712ddfc5d7..2fe23e15cedc4 100644 --- a/pandas/tests/groupby/aggregate/test_other.py +++ b/pandas/tests/groupby/aggregate/test_other.py @@ -8,8 +8,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( DataFrame, @@ -20,6 +18,7 @@ date_range, period_range, ) +import pandas._testing as tm from pandas.core.base import SpecificationError from pandas.io.formats.printing import pprint_thing diff --git a/pandas/tests/groupby/conftest.py b/pandas/tests/groupby/conftest.py index f9c966681f778..8901af7a90acc 100644 --- a/pandas/tests/groupby/conftest.py +++ b/pandas/tests/groupby/conftest.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex +import pandas._testing as tm from pandas.core.groupby.base import reduction_kernels, transformation_kernels diff --git a/pandas/tests/groupby/test_apply.py b/pandas/tests/groupby/test_apply.py index 6138bfd788d31..53879cad629b2 100644 --- a/pandas/tests/groupby/test_apply.py +++ b/pandas/tests/groupby/test_apply.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, bdate_range +import pandas._testing as tm def test_apply_issues(): diff --git a/pandas/tests/groupby/test_bin_groupby.py b/pandas/tests/groupby/test_bin_groupby.py index 732afdab628ce..69be1067ce37d 100644 --- a/pandas/tests/groupby/test_bin_groupby.py +++ b/pandas/tests/groupby/test_bin_groupby.py @@ -2,11 +2,11 @@ import pytest from pandas._libs import groupby, lib, reduction as libreduction -import pandas.util._testing as tm from pandas.core.dtypes.common import ensure_int64 from pandas import Index, Series, isna +import pandas._testing as tm def test_series_grouper(): diff --git a/pandas/tests/groupby/test_categorical.py b/pandas/tests/groupby/test_categorical.py index 1d31bb61011ae..40f844bdaa7c0 100644 --- a/pandas/tests/groupby/test_categorical.py +++ b/pandas/tests/groupby/test_categorical.py @@ -4,7 +4,6 @@ import pytest from pandas.compat import PY37 -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -16,6 +15,7 @@ Series, qcut, ) +import pandas._testing as tm def cartesian_product_for_groupers(result, args, names): diff --git a/pandas/tests/groupby/test_counting.py b/pandas/tests/groupby/test_counting.py index e093bba1118e8..d88f293c99e0f 100644 --- a/pandas/tests/groupby/test_counting.py +++ b/pandas/tests/groupby/test_counting.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Period, Series, Timedelta, Timestamp +import pandas._testing as tm class TestCounting: diff --git a/pandas/tests/groupby/test_filters.py b/pandas/tests/groupby/test_filters.py index 3e85de738dad8..c16ad812eb634 100644 --- a/pandas/tests/groupby/test_filters.py +++ b/pandas/tests/groupby/test_filters.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp +import pandas._testing as tm def test_filter_series(): diff --git a/pandas/tests/groupby/test_function.py b/pandas/tests/groupby/test_function.py index 81765eb898f2a..19b00502da5dc 100644 --- a/pandas/tests/groupby/test_function.py +++ b/pandas/tests/groupby/test_function.py @@ -20,8 +20,9 @@ date_range, isna, ) +import pandas._testing as tm import pandas.core.nanops as nanops -from pandas.util import _test_decorators as td, _testing as tm +from pandas.util import _test_decorators as td @pytest.mark.parametrize("agg_func", ["any", "all"]) diff --git a/pandas/tests/groupby/test_groupby.py b/pandas/tests/groupby/test_groupby.py index 11428c910a4d4..f9a77cd584d46 100644 --- a/pandas/tests/groupby/test_groupby.py +++ b/pandas/tests/groupby/test_groupby.py @@ -6,10 +6,10 @@ import pytest from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range, read_csv +import pandas._testing as tm from pandas.core.base import SpecificationError import pandas.core.common as com diff --git a/pandas/tests/groupby/test_grouping.py b/pandas/tests/groupby/test_grouping.py index 447e4890c847d..1354d4bf86328 100644 --- a/pandas/tests/groupby/test_grouping.py +++ b/pandas/tests/groupby/test_grouping.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( CategoricalIndex, @@ -15,6 +13,7 @@ Timestamp, date_range, ) +import pandas._testing as tm from pandas.core.groupby.grouper import Grouping # selection diff --git a/pandas/tests/groupby/test_index_as_string.py b/pandas/tests/groupby/test_index_as_string.py index 54384a2b69b6b..971a447b84cae 100644 --- a/pandas/tests/groupby/test_index_as_string.py +++ b/pandas/tests/groupby/test_index_as_string.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm @pytest.fixture(params=[["inner"], ["inner", "outer"]]) diff --git a/pandas/tests/groupby/test_nth.py b/pandas/tests/groupby/test_nth.py index a8d96b9b059a5..1d8883b60d4a3 100644 --- a/pandas/tests/groupby/test_nth.py +++ b/pandas/tests/groupby/test_nth.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, isna +import pandas._testing as tm def test_first_last_nth(df): diff --git a/pandas/tests/groupby/test_rank.py b/pandas/tests/groupby/test_rank.py index 8a8c91e1d7146..3461bf6e10662 100644 --- a/pandas/tests/groupby/test_rank.py +++ b/pandas/tests/groupby/test_rank.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, concat +import pandas._testing as tm from pandas.core.base import DataError diff --git a/pandas/tests/groupby/test_timegrouper.py b/pandas/tests/groupby/test_timegrouper.py index 7d0e4e7fc42d3..6b8bd9e805a0c 100644 --- a/pandas/tests/groupby/test_timegrouper.py +++ b/pandas/tests/groupby/test_timegrouper.py @@ -7,10 +7,9 @@ import pytest import pytz -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range +import pandas._testing as tm from pandas.core.groupby.grouper import Grouper from pandas.core.groupby.ops import BinGrouper diff --git a/pandas/tests/groupby/test_transform.py b/pandas/tests/groupby/test_transform.py index ac7b416fa2929..bfad0ddf55015 100644 --- a/pandas/tests/groupby/test_transform.py +++ b/pandas/tests/groupby/test_transform.py @@ -5,7 +5,6 @@ import pytest from pandas._libs import groupby -import pandas.util._testing as tm from pandas.core.dtypes.common import ensure_platform_int, is_timedelta64_dtype @@ -19,6 +18,7 @@ concat, date_range, ) +import pandas._testing as tm from pandas.core.groupby.groupby import DataError diff --git a/pandas/tests/groupby/test_value_counts.py b/pandas/tests/groupby/test_value_counts.py index 3666970dbe9a6..5acf71edf2b63 100644 --- a/pandas/tests/groupby/test_value_counts.py +++ b/pandas/tests/groupby/test_value_counts.py @@ -9,9 +9,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Grouper, MultiIndex, Series, date_range, to_datetime +import pandas._testing as tm # our starting frame diff --git a/pandas/tests/groupby/test_whitelist.py b/pandas/tests/groupby/test_whitelist.py index c722654db9de2..6a5e531416ecb 100644 --- a/pandas/tests/groupby/test_whitelist.py +++ b/pandas/tests/groupby/test_whitelist.py @@ -8,9 +8,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, Series, date_range +import pandas._testing as tm from pandas.core.groupby.base import ( groupby_other_methods, reduction_kernels, diff --git a/pandas/tests/indexes/categorical/test_category.py b/pandas/tests/indexes/categorical/test_category.py index 7c546b1f597cf..61e30d3e5c139 100644 --- a/pandas/tests/indexes/categorical/test_category.py +++ b/pandas/tests/indexes/categorical/test_category.py @@ -4,12 +4,12 @@ import pandas._config.config as cf from pandas._libs import index as libindex -import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import Categorical, IntervalIndex +import pandas._testing as tm from pandas.core.indexes.api import CategoricalIndex, Index from ..common import Base diff --git a/pandas/tests/indexes/categorical/test_constructors.py b/pandas/tests/indexes/categorical/test_constructors.py index 9aa63be398525..1df0874e2f947 100644 --- a/pandas/tests/indexes/categorical/test_constructors.py +++ b/pandas/tests/indexes/categorical/test_constructors.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, CategoricalDtype, CategoricalIndex, Index +import pandas._testing as tm class TestCategoricalIndexConstructors: diff --git a/pandas/tests/indexes/common.py b/pandas/tests/indexes/common.py index 48c8e486d302b..ceb3ac8b61c0b 100644 --- a/pandas/tests/indexes/common.py +++ b/pandas/tests/indexes/common.py @@ -5,7 +5,6 @@ import pytest from pandas._libs.tslib import iNaT -import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype @@ -24,6 +23,7 @@ UInt64Index, isna, ) +import pandas._testing as tm from pandas.core.indexes.base import InvalidIndexError from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin diff --git a/pandas/tests/indexes/conftest.py b/pandas/tests/indexes/conftest.py index 7c7fa9dec85a5..e3e7ff4093b76 100644 --- a/pandas/tests/indexes/conftest.py +++ b/pandas/tests/indexes/conftest.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.core.indexes.api import Index, MultiIndex indices_dict = { diff --git a/pandas/tests/indexes/datetimelike.py b/pandas/tests/indexes/datetimelike.py index 77b6347417b52..3c72d34d84b28 100644 --- a/pandas/tests/indexes/datetimelike.py +++ b/pandas/tests/indexes/datetimelike.py @@ -2,9 +2,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from .common import Base diff --git a/pandas/tests/indexes/datetimes/test_astype.py b/pandas/tests/indexes/datetimes/test_astype.py index 8982941a35676..6139726dc34e4 100644 --- a/pandas/tests/indexes/datetimes/test_astype.py +++ b/pandas/tests/indexes/datetimes/test_astype.py @@ -6,8 +6,6 @@ import pytest import pytz -import pandas.util._testing as tm - import pandas as pd from pandas import ( DatetimeIndex, @@ -19,6 +17,7 @@ Timestamp, date_range, ) +import pandas._testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexes/datetimes/test_constructors.py b/pandas/tests/indexes/datetimes/test_constructors.py index 78d81a5c0fe00..c75c296e724db 100644 --- a/pandas/tests/indexes/datetimes/test_constructors.py +++ b/pandas/tests/indexes/datetimes/test_constructors.py @@ -8,10 +8,10 @@ import pytz from pandas._libs.tslibs import OutOfBoundsDatetime, conversion -import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Index, Timestamp, date_range, offsets, to_datetime +import pandas._testing as tm from pandas.core.arrays import DatetimeArray, period_array diff --git a/pandas/tests/indexes/datetimes/test_date_range.py b/pandas/tests/indexes/datetimes/test_date_range.py index 0c4d4294a1381..f9df295284806 100644 --- a/pandas/tests/indexes/datetimes/test_date_range.py +++ b/pandas/tests/indexes/datetimes/test_date_range.py @@ -11,10 +11,10 @@ from pandas.errors import OutOfBoundsDatetime import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Timestamp, bdate_range, date_range, offsets +import pandas._testing as tm from pandas.tseries.offsets import ( BDay, diff --git a/pandas/tests/indexes/datetimes/test_datetime.py b/pandas/tests/indexes/datetimes/test_datetime.py index efa71e2330410..9be740f0ff76c 100644 --- a/pandas/tests/indexes/datetimes/test_datetime.py +++ b/pandas/tests/indexes/datetimes/test_datetime.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, DatetimeIndex, Index, Timestamp, date_range, offsets +import pandas._testing as tm randn = np.random.randn diff --git a/pandas/tests/indexes/datetimes/test_datetimelike.py b/pandas/tests/indexes/datetimes/test_datetimelike.py index 5417c7203d520..da1bd6f091d1a 100644 --- a/pandas/tests/indexes/datetimes/test_datetimelike.py +++ b/pandas/tests/indexes/datetimes/test_datetimelike.py @@ -1,9 +1,8 @@ """ generic tests from the Datetimelike class """ import pytest -import pandas.util._testing as tm - from pandas import DatetimeIndex, date_range +import pandas._testing as tm from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/datetimes/test_formats.py b/pandas/tests/indexes/datetimes/test_formats.py index 872028d25a5cf..f34019e06fd5f 100644 --- a/pandas/tests/indexes/datetimes/test_formats.py +++ b/pandas/tests/indexes/datetimes/test_formats.py @@ -5,10 +5,9 @@ import pytest import pytz -import pandas.util._testing as tm - import pandas as pd from pandas import DatetimeIndex, Series +import pandas._testing as tm def test_to_native_types(): diff --git a/pandas/tests/indexes/datetimes/test_indexing.py b/pandas/tests/indexes/datetimes/test_indexing.py index 71b1534c05c38..ef0d2cd2e48cc 100644 --- a/pandas/tests/indexes/datetimes/test_indexing.py +++ b/pandas/tests/indexes/datetimes/test_indexing.py @@ -4,10 +4,9 @@ import pytest import pytz -import pandas.util._testing as tm - import pandas as pd from pandas import DatetimeIndex, Index, Timestamp, date_range, notna +import pandas._testing as tm from pandas.tseries.offsets import BDay, CDay diff --git a/pandas/tests/indexes/datetimes/test_misc.py b/pandas/tests/indexes/datetimes/test_misc.py index f1513b97e8c14..340f53b2868bd 100644 --- a/pandas/tests/indexes/datetimes/test_misc.py +++ b/pandas/tests/indexes/datetimes/test_misc.py @@ -6,10 +6,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DatetimeIndex, Index, Timestamp, date_range, offsets +import pandas._testing as tm class TestTimeSeries: diff --git a/pandas/tests/indexes/datetimes/test_missing.py b/pandas/tests/indexes/datetimes/test_missing.py index 42cfc37408eec..3399c8eaf6750 100644 --- a/pandas/tests/indexes/datetimes/test_missing.py +++ b/pandas/tests/indexes/datetimes/test_missing.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexes/datetimes/test_ops.py b/pandas/tests/indexes/datetimes/test_ops.py index 7c07315dc3b5e..ecd4ace705e9e 100644 --- a/pandas/tests/indexes/datetimes/test_ops.py +++ b/pandas/tests/indexes/datetimes/test_ops.py @@ -4,8 +4,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.generic import ABCDateOffset import pandas as pd @@ -18,6 +16,7 @@ bdate_range, date_range, ) +import pandas._testing as tm from pandas.tests.base.test_ops import Ops from pandas.tseries.offsets import BDay, BMonthEnd, CDay, Day, Hour diff --git a/pandas/tests/indexes/datetimes/test_partial_slicing.py b/pandas/tests/indexes/datetimes/test_partial_slicing.py index c621d987953a0..e30cc4449e01e 100644 --- a/pandas/tests/indexes/datetimes/test_partial_slicing.py +++ b/pandas/tests/indexes/datetimes/test_partial_slicing.py @@ -6,8 +6,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( DataFrame, @@ -18,6 +16,7 @@ Timestamp, date_range, ) +import pandas._testing as tm from pandas.core.indexing import IndexingError diff --git a/pandas/tests/indexes/datetimes/test_scalar_compat.py b/pandas/tests/indexes/datetimes/test_scalar_compat.py index dd294762a3a51..84eee2419f0b8 100644 --- a/pandas/tests/indexes/datetimes/test_scalar_compat.py +++ b/pandas/tests/indexes/datetimes/test_scalar_compat.py @@ -7,10 +7,10 @@ import pytest from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime -import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Timestamp, date_range +import pandas._testing as tm from pandas.tseries.frequencies import to_offset diff --git a/pandas/tests/indexes/datetimes/test_setops.py b/pandas/tests/indexes/datetimes/test_setops.py index 901c3e4b4e86f..f7960c114ec9d 100644 --- a/pandas/tests/indexes/datetimes/test_setops.py +++ b/pandas/tests/indexes/datetimes/test_setops.py @@ -4,7 +4,6 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -17,6 +16,7 @@ date_range, to_datetime, ) +import pandas._testing as tm from pandas.tseries.offsets import BMonthEnd, Minute, MonthEnd diff --git a/pandas/tests/indexes/datetimes/test_shift.py b/pandas/tests/indexes/datetimes/test_shift.py index 34c277ad2c963..1c87995931c62 100644 --- a/pandas/tests/indexes/datetimes/test_shift.py +++ b/pandas/tests/indexes/datetimes/test_shift.py @@ -4,10 +4,10 @@ import pytz from pandas.errors import NullFrequencyError -import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Series, date_range +import pandas._testing as tm class TestDatetimeIndexShift: diff --git a/pandas/tests/indexes/datetimes/test_timezones.py b/pandas/tests/indexes/datetimes/test_timezones.py index 5c8f0cd92aea9..1505ac1dff29c 100644 --- a/pandas/tests/indexes/datetimes/test_timezones.py +++ b/pandas/tests/indexes/datetimes/test_timezones.py @@ -11,7 +11,6 @@ from pandas._libs.tslibs import conversion, timezones import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -23,6 +22,7 @@ isna, to_datetime, ) +import pandas._testing as tm class FixedOffset(tzinfo): diff --git a/pandas/tests/indexes/datetimes/test_tools.py b/pandas/tests/indexes/datetimes/test_tools.py index fcd26492ace37..7a5a1912a7023 100644 --- a/pandas/tests/indexes/datetimes/test_tools.py +++ b/pandas/tests/indexes/datetimes/test_tools.py @@ -15,7 +15,6 @@ from pandas._libs.tslibs import iNaT, parsing from pandas.errors import OutOfBoundsDatetime import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.common import is_datetime64_ns_dtype @@ -31,6 +30,7 @@ isna, to_datetime, ) +import pandas._testing as tm from pandas.core.arrays import DatetimeArray from pandas.core.tools import datetimes as tools diff --git a/pandas/tests/indexes/interval/test_astype.py b/pandas/tests/indexes/interval/test_astype.py index 0982230b14de7..2b1742d58b77e 100644 --- a/pandas/tests/indexes/interval/test_astype.py +++ b/pandas/tests/indexes/interval/test_astype.py @@ -1,8 +1,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype, IntervalDtype from pandas import ( @@ -14,6 +12,7 @@ Timestamp, interval_range, ) +import pandas._testing as tm class Base: diff --git a/pandas/tests/indexes/interval/test_base.py b/pandas/tests/indexes/interval/test_base.py index 0af0567e5542d..91f8dddea71d7 100644 --- a/pandas/tests/indexes/interval/test_base.py +++ b/pandas/tests/indexes/interval/test_base.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import IntervalIndex, Series, date_range +import pandas._testing as tm from pandas.tests.indexes.common import Base diff --git a/pandas/tests/indexes/interval/test_constructors.py b/pandas/tests/indexes/interval/test_constructors.py index b3884824ef93f..13a45df743cf5 100644 --- a/pandas/tests/indexes/interval/test_constructors.py +++ b/pandas/tests/indexes/interval/test_constructors.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_categorical_dtype from pandas.core.dtypes.dtypes import IntervalDtype @@ -21,6 +19,7 @@ period_range, timedelta_range, ) +import pandas._testing as tm from pandas.core.arrays import IntervalArray import pandas.core.common as com diff --git a/pandas/tests/indexes/interval/test_formats.py b/pandas/tests/indexes/interval/test_formats.py index 7365fbf232355..7acf5c1e0906c 100644 --- a/pandas/tests/indexes/interval/test_formats.py +++ b/pandas/tests/indexes/interval/test_formats.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, IntervalIndex, Series, Timedelta, Timestamp +import pandas._testing as tm class TestIntervalIndexRendering: diff --git a/pandas/tests/indexes/interval/test_indexing.py b/pandas/tests/indexes/interval/test_indexing.py index e4de6c1d2870d..3c54442cf40c5 100644 --- a/pandas/tests/indexes/interval/test_indexing.py +++ b/pandas/tests/indexes/interval/test_indexing.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import ( CategoricalIndex, Interval, @@ -13,6 +11,7 @@ date_range, timedelta_range, ) +import pandas._testing as tm from pandas.core.indexes.base import InvalidIndexError diff --git a/pandas/tests/indexes/interval/test_interval.py b/pandas/tests/indexes/interval/test_interval.py index 7d583b8998ed0..58f88ffb16318 100644 --- a/pandas/tests/indexes/interval/test_interval.py +++ b/pandas/tests/indexes/interval/test_interval.py @@ -4,8 +4,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Index, @@ -19,6 +17,7 @@ notna, timedelta_range, ) +import pandas._testing as tm import pandas.core.common as com diff --git a/pandas/tests/indexes/interval/test_interval_range.py b/pandas/tests/indexes/interval/test_interval_range.py index f0c1af3595793..2f28c33a3bbc6 100644 --- a/pandas/tests/indexes/interval/test_interval_range.py +++ b/pandas/tests/indexes/interval/test_interval_range.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_integer from pandas import ( @@ -17,6 +15,7 @@ interval_range, timedelta_range, ) +import pandas._testing as tm from pandas.tseries.offsets import Day diff --git a/pandas/tests/indexes/interval/test_interval_tree.py b/pandas/tests/indexes/interval/test_interval_tree.py index 8d527ac6b51ce..476ec1dd10b4b 100644 --- a/pandas/tests/indexes/interval/test_interval_tree.py +++ b/pandas/tests/indexes/interval/test_interval_tree.py @@ -4,9 +4,9 @@ import pytest from pandas._libs.interval import IntervalTree -import pandas.util._testing as tm from pandas import compat +import pandas._testing as tm def skipif_32bit(param): diff --git a/pandas/tests/indexes/interval/test_setops.py b/pandas/tests/indexes/interval/test_setops.py index ca028fb475c8d..3246ac6bafde9 100644 --- a/pandas/tests/indexes/interval/test_setops.py +++ b/pandas/tests/indexes/interval/test_setops.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Index, IntervalIndex, Timestamp, interval_range +import pandas._testing as tm @pytest.fixture(scope="class", params=[None, "foo"]) diff --git a/pandas/tests/indexes/multi/test_analytics.py b/pandas/tests/indexes/multi/test_analytics.py index 0dbc9f6fb10ab..8e6a360af797b 100644 --- a/pandas/tests/indexes/multi/test_analytics.py +++ b/pandas/tests/indexes/multi/test_analytics.py @@ -2,10 +2,10 @@ import pytest from pandas.compat.numpy import _np_version_under1p17 -import pandas.util._testing as tm import pandas as pd from pandas import Index, MultiIndex, date_range, period_range +import pandas._testing as tm def test_shift(idx): diff --git a/pandas/tests/indexes/multi/test_astype.py b/pandas/tests/indexes/multi/test_astype.py index 5c9668d0e137a..29908537fbe59 100644 --- a/pandas/tests/indexes/multi/test_astype.py +++ b/pandas/tests/indexes/multi/test_astype.py @@ -1,10 +1,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype +import pandas._testing as tm + def test_astype(idx): expected = idx.copy() diff --git a/pandas/tests/indexes/multi/test_compat.py b/pandas/tests/indexes/multi/test_compat.py index 1340ff21e0d17..d92cff1e10496 100644 --- a/pandas/tests/indexes/multi/test_compat.py +++ b/pandas/tests/indexes/multi/test_compat.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import MultiIndex +import pandas._testing as tm def test_numeric_compat(idx): diff --git a/pandas/tests/indexes/multi/test_constructors.py b/pandas/tests/indexes/multi/test_constructors.py index 6fd2fb3881882..4beae4fa1a9af 100644 --- a/pandas/tests/indexes/multi/test_constructors.py +++ b/pandas/tests/indexes/multi/test_constructors.py @@ -2,12 +2,12 @@ import pytest from pandas._libs.tslib import Timestamp -import pandas.util._testing as tm from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike import pandas as pd from pandas import Index, MultiIndex, date_range +import pandas._testing as tm def test_constructor_single_level(): diff --git a/pandas/tests/indexes/multi/test_contains.py b/pandas/tests/indexes/multi/test_contains.py index 42c7f166f4a68..4b0895c823b8b 100644 --- a/pandas/tests/indexes/multi/test_contains.py +++ b/pandas/tests/indexes/multi/test_contains.py @@ -2,10 +2,10 @@ import pytest from pandas.compat import PYPY -import pandas.util._testing as tm import pandas as pd from pandas import MultiIndex +import pandas._testing as tm def test_contains_top_level(): diff --git a/pandas/tests/indexes/multi/test_conversion.py b/pandas/tests/indexes/multi/test_conversion.py index 4b9be4d55d8ff..8956e6ed4996f 100644 --- a/pandas/tests/indexes/multi/test_conversion.py +++ b/pandas/tests/indexes/multi/test_conversion.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, date_range +import pandas._testing as tm def test_tolist(idx): diff --git a/pandas/tests/indexes/multi/test_copy.py b/pandas/tests/indexes/multi/test_copy.py index 5ef29af72c587..1acc65aef8b8a 100644 --- a/pandas/tests/indexes/multi/test_copy.py +++ b/pandas/tests/indexes/multi/test_copy.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - from pandas import MultiIndex +import pandas._testing as tm def assert_multiindex_copied(copy, original): diff --git a/pandas/tests/indexes/multi/test_drop.py b/pandas/tests/indexes/multi/test_drop.py index c323f0e8af9e2..25261dd25d717 100644 --- a/pandas/tests/indexes/multi/test_drop.py +++ b/pandas/tests/indexes/multi/test_drop.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import Index, MultiIndex +import pandas._testing as tm def test_drop(idx): diff --git a/pandas/tests/indexes/multi/test_duplicates.py b/pandas/tests/indexes/multi/test_duplicates.py index 0d1ee0f54f0e2..93e1de535835f 100644 --- a/pandas/tests/indexes/multi/test_duplicates.py +++ b/pandas/tests/indexes/multi/test_duplicates.py @@ -4,9 +4,9 @@ import pytest from pandas._libs import hashtable -import pandas.util._testing as tm from pandas import DatetimeIndex, MultiIndex +import pandas._testing as tm @pytest.mark.parametrize("names", [None, ["first", "second"]]) diff --git a/pandas/tests/indexes/multi/test_equivalence.py b/pandas/tests/indexes/multi/test_equivalence.py index e57fd4c6cadbb..063ede028add7 100644 --- a/pandas/tests/indexes/multi/test_equivalence.py +++ b/pandas/tests/indexes/multi/test_equivalence.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, MultiIndex, Series +import pandas._testing as tm def test_equals(idx): diff --git a/pandas/tests/indexes/multi/test_format.py b/pandas/tests/indexes/multi/test_format.py index 279e1395508d9..75f23fb2f32ba 100644 --- a/pandas/tests/indexes/multi/test_format.py +++ b/pandas/tests/indexes/multi/test_format.py @@ -2,10 +2,9 @@ import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import MultiIndex +import pandas._testing as tm def test_format(idx): diff --git a/pandas/tests/indexes/multi/test_get_set.py b/pandas/tests/indexes/multi/test_get_set.py index 7ebd3df1164b3..074072ae581b2 100644 --- a/pandas/tests/indexes/multi/test_get_set.py +++ b/pandas/tests/indexes/multi/test_get_set.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import CategoricalIndex, Index, MultiIndex +import pandas._testing as tm def assert_matching(actual, expected, check_dtype=False): diff --git a/pandas/tests/indexes/multi/test_indexing.py b/pandas/tests/indexes/multi/test_indexing.py index 73cef18571ebc..176d47a3bdb9b 100644 --- a/pandas/tests/indexes/multi/test_indexing.py +++ b/pandas/tests/indexes/multi/test_indexing.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -14,6 +12,7 @@ MultiIndex, date_range, ) +import pandas._testing as tm from pandas.core.indexes.base import InvalidIndexError diff --git a/pandas/tests/indexes/multi/test_integrity.py b/pandas/tests/indexes/multi/test_integrity.py index f0d46f3980e75..f2ec15e0af88c 100644 --- a/pandas/tests/indexes/multi/test_integrity.py +++ b/pandas/tests/indexes/multi/test_integrity.py @@ -3,12 +3,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike import pandas as pd from pandas import IntervalIndex, MultiIndex, RangeIndex +import pandas._testing as tm def test_labels_dtypes(): diff --git a/pandas/tests/indexes/multi/test_join.py b/pandas/tests/indexes/multi/test_join.py index aac57dab2799d..062fb92c44552 100644 --- a/pandas/tests/indexes/multi/test_join.py +++ b/pandas/tests/indexes/multi/test_join.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, MultiIndex +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/indexes/multi/test_missing.py b/pandas/tests/indexes/multi/test_missing.py index 2e6a021065ba2..a17e1e9928bff 100644 --- a/pandas/tests/indexes/multi/test_missing.py +++ b/pandas/tests/indexes/multi/test_missing.py @@ -2,10 +2,10 @@ import pytest from pandas._libs.tslib import iNaT -import pandas.util._testing as tm import pandas as pd from pandas import Int64Index, MultiIndex, PeriodIndex, UInt64Index +import pandas._testing as tm from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin diff --git a/pandas/tests/indexes/multi/test_names.py b/pandas/tests/indexes/multi/test_names.py index 12cc7c668b974..b68c03eba60d4 100644 --- a/pandas/tests/indexes/multi/test_names.py +++ b/pandas/tests/indexes/multi/test_names.py @@ -1,9 +1,8 @@ import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import MultiIndex +import pandas._testing as tm def check_level_names(index, names): diff --git a/pandas/tests/indexes/multi/test_partial_indexing.py b/pandas/tests/indexes/multi/test_partial_indexing.py index be0e837746d0d..b00018d2ceb69 100644 --- a/pandas/tests/indexes/multi/test_partial_indexing.py +++ b/pandas/tests/indexes/multi/test_partial_indexing.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, date_range +import pandas._testing as tm def test_partial_string_timestamp_multiindex(): diff --git a/pandas/tests/indexes/multi/test_reindex.py b/pandas/tests/indexes/multi/test_reindex.py index e2dd6cb6449f3..ceb14aa82a76c 100644 --- a/pandas/tests/indexes/multi/test_reindex.py +++ b/pandas/tests/indexes/multi/test_reindex.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, MultiIndex +import pandas._testing as tm def test_reindex(idx): diff --git a/pandas/tests/indexes/multi/test_reshape.py b/pandas/tests/indexes/multi/test_reshape.py index a4563db010a5c..2e39c714ca7af 100644 --- a/pandas/tests/indexes/multi/test_reshape.py +++ b/pandas/tests/indexes/multi/test_reshape.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, MultiIndex +import pandas._testing as tm def test_insert(idx): diff --git a/pandas/tests/indexes/multi/test_setops.py b/pandas/tests/indexes/multi/test_setops.py index c23b33323a324..841e3b3f17b38 100644 --- a/pandas/tests/indexes/multi/test_setops.py +++ b/pandas/tests/indexes/multi/test_setops.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import MultiIndex, Series +import pandas._testing as tm @pytest.mark.parametrize("case", [0.5, "xxx"]) diff --git a/pandas/tests/indexes/multi/test_sorting.py b/pandas/tests/indexes/multi/test_sorting.py index fcf88983c37eb..062c0ba9f4759 100644 --- a/pandas/tests/indexes/multi/test_sorting.py +++ b/pandas/tests/indexes/multi/test_sorting.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import PerformanceWarning, UnsortedIndexError -import pandas.util._testing as tm import pandas as pd from pandas import CategoricalIndex, DataFrame, Index, MultiIndex, RangeIndex +import pandas._testing as tm def test_sortlevel(idx): diff --git a/pandas/tests/indexes/period/test_asfreq.py b/pandas/tests/indexes/period/test_asfreq.py index 7fa2fb11b9e64..88e800d66f3ad 100644 --- a/pandas/tests/indexes/period/test_asfreq.py +++ b/pandas/tests/indexes/period/test_asfreq.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, PeriodIndex, Series, period_range +import pandas._testing as tm class TestPeriodIndex: diff --git a/pandas/tests/indexes/period/test_astype.py b/pandas/tests/indexes/period/test_astype.py index d79bd7cada386..ec386dd9dd11c 100644 --- a/pandas/tests/indexes/period/test_astype.py +++ b/pandas/tests/indexes/period/test_astype.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, Int64Index, NaT, Period, PeriodIndex, period_range +import pandas._testing as tm class TestPeriodIndexAsType: diff --git a/pandas/tests/indexes/period/test_constructors.py b/pandas/tests/indexes/period/test_constructors.py index 877e7fe954d0d..c836ff0704115 100644 --- a/pandas/tests/indexes/period/test_constructors.py +++ b/pandas/tests/indexes/period/test_constructors.py @@ -2,12 +2,12 @@ import pytest from pandas._libs.tslibs.period import IncompatibleFrequency -import pandas.util._testing as tm from pandas.core.dtypes.dtypes import PeriodDtype import pandas as pd from pandas import Index, Period, PeriodIndex, Series, date_range, offsets, period_range +import pandas._testing as tm import pandas.core.indexes.period as period diff --git a/pandas/tests/indexes/period/test_formats.py b/pandas/tests/indexes/period/test_formats.py index f708612b0af0a..5db373a9f07ae 100644 --- a/pandas/tests/indexes/period/test_formats.py +++ b/pandas/tests/indexes/period/test_formats.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import PeriodIndex +import pandas._testing as tm def test_to_native_types(): diff --git a/pandas/tests/indexes/period/test_indexing.py b/pandas/tests/indexes/period/test_indexing.py index 27e1e24668270..8b5a2958c4c61 100644 --- a/pandas/tests/indexes/period/test_indexing.py +++ b/pandas/tests/indexes/period/test_indexing.py @@ -4,10 +4,10 @@ import pytest from pandas._libs.tslibs import period as libperiod -import pandas.util._testing as tm import pandas as pd from pandas import DatetimeIndex, Period, PeriodIndex, Series, notna, period_range +import pandas._testing as tm class TestGetItem: diff --git a/pandas/tests/indexes/period/test_ops.py b/pandas/tests/indexes/period/test_ops.py index 7fdf42c45be2f..427d9ab712320 100644 --- a/pandas/tests/indexes/period/test_ops.py +++ b/pandas/tests/indexes/period/test_ops.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DatetimeIndex, Index, NaT, PeriodIndex, Series +import pandas._testing as tm from pandas.core.arrays import PeriodArray from pandas.tests.base.test_ops import Ops diff --git a/pandas/tests/indexes/period/test_partial_slicing.py b/pandas/tests/indexes/period/test_partial_slicing.py index b03e3f35fd00b..9ca2dd169416f 100644 --- a/pandas/tests/indexes/period/test_partial_slicing.py +++ b/pandas/tests/indexes/period/test_partial_slicing.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Period, Series, period_range +import pandas._testing as tm class TestPeriodIndex: diff --git a/pandas/tests/indexes/period/test_period.py b/pandas/tests/indexes/period/test_period.py index 0c8b785252edb..af5aa54c60476 100644 --- a/pandas/tests/indexes/period/test_period.py +++ b/pandas/tests/indexes/period/test_period.py @@ -3,7 +3,6 @@ from pandas._libs.tslibs.period import IncompatibleFrequency import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -18,6 +17,7 @@ offsets, period_range, ) +import pandas._testing as tm from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/period/test_period_range.py b/pandas/tests/indexes/period/test_period_range.py index 875c6c2f8171a..2c3d22198df9f 100644 --- a/pandas/tests/indexes/period/test_period_range.py +++ b/pandas/tests/indexes/period/test_period_range.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - from pandas import NaT, Period, PeriodIndex, date_range, period_range +import pandas._testing as tm class TestPeriodRange: diff --git a/pandas/tests/indexes/period/test_scalar_compat.py b/pandas/tests/indexes/period/test_scalar_compat.py index b680ce7162d60..d9809f0f75611 100644 --- a/pandas/tests/indexes/period/test_scalar_compat.py +++ b/pandas/tests/indexes/period/test_scalar_compat.py @@ -1,8 +1,7 @@ """Tests for PeriodIndex behaving like a vectorized Period scalar""" -import pandas.util._testing as tm - from pandas import Timedelta, date_range, period_range +import pandas._testing as tm class TestPeriodIndexOps: diff --git a/pandas/tests/indexes/period/test_setops.py b/pandas/tests/indexes/period/test_setops.py index 6affad5fbbb3b..1ec53c1dac81c 100644 --- a/pandas/tests/indexes/period/test_setops.py +++ b/pandas/tests/indexes/period/test_setops.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, PeriodIndex, date_range, period_range +import pandas._testing as tm import pandas.core.indexes.period as period diff --git a/pandas/tests/indexes/period/test_shift.py b/pandas/tests/indexes/period/test_shift.py index 927f23160b28b..5689e98c33455 100644 --- a/pandas/tests/indexes/period/test_shift.py +++ b/pandas/tests/indexes/period/test_shift.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import PeriodIndex, period_range +import pandas._testing as tm class TestPeriodIndexShift: diff --git a/pandas/tests/indexes/period/test_tools.py b/pandas/tests/indexes/period/test_tools.py index 159b707b1958d..fc861b88d1f1b 100644 --- a/pandas/tests/indexes/period/test_tools.py +++ b/pandas/tests/indexes/period/test_tools.py @@ -4,7 +4,6 @@ import pytest from pandas._libs.tslibs.ccalendar import MONTHS -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -18,6 +17,7 @@ period_range, to_datetime, ) +import pandas._testing as tm import pandas.core.indexes.period as period diff --git a/pandas/tests/indexes/ranges/test_constructors.py b/pandas/tests/indexes/ranges/test_constructors.py index 02343cdefa6c0..ba1de6d551d6b 100644 --- a/pandas/tests/indexes/ranges/test_constructors.py +++ b/pandas/tests/indexes/ranges/test_constructors.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Index, RangeIndex, Series +import pandas._testing as tm class TestRangeIndexConstructors: diff --git a/pandas/tests/indexes/ranges/test_range.py b/pandas/tests/indexes/ranges/test_range.py index d13b648d4ea8a..8d98ab18963b6 100644 --- a/pandas/tests/indexes/ranges/test_range.py +++ b/pandas/tests/indexes/ranges/test_range.py @@ -1,12 +1,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import ensure_platform_int import pandas as pd from pandas import Float64Index, Index, Int64Index, RangeIndex +import pandas._testing as tm from ..test_numeric import Numeric diff --git a/pandas/tests/indexes/ranges/test_setops.py b/pandas/tests/indexes/ranges/test_setops.py index a5bb4212a5fcb..5bedc4089feba 100644 --- a/pandas/tests/indexes/ranges/test_setops.py +++ b/pandas/tests/indexes/ranges/test_setops.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Index, Int64Index, RangeIndex +import pandas._testing as tm class TestRangeIndexSetOps: diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py index a675585e58127..4a773cc1c6f49 100644 --- a/pandas/tests/indexes/test_base.py +++ b/pandas/tests/indexes/test_base.py @@ -12,7 +12,6 @@ from pandas._libs.tslib import Timestamp from pandas.compat.numpy import np_datetime64_compat -import pandas.util._testing as tm from pandas.core.dtypes.common import is_unsigned_integer_dtype from pandas.core.dtypes.generic import ABCIndex @@ -33,6 +32,7 @@ isna, period_range, ) +import pandas._testing as tm from pandas.core.algorithms import safe_sort from pandas.core.indexes.api import ( Index, diff --git a/pandas/tests/indexes/test_common.py b/pandas/tests/indexes/test_common.py index 4a2c9a0ecd75a..7e30233353553 100644 --- a/pandas/tests/indexes/test_common.py +++ b/pandas/tests/indexes/test_common.py @@ -9,12 +9,12 @@ import pytest from pandas._libs.tslibs import iNaT -import pandas.util._testing as tm from pandas.core.dtypes.common import needs_i8_conversion import pandas as pd from pandas import CategoricalIndex, MultiIndex, RangeIndex +import pandas._testing as tm class TestCommon: diff --git a/pandas/tests/indexes/test_numeric.py b/pandas/tests/indexes/test_numeric.py index fa52e388b5746..69a3983128a51 100644 --- a/pandas/tests/indexes/test_numeric.py +++ b/pandas/tests/indexes/test_numeric.py @@ -5,10 +5,10 @@ import pytest from pandas._libs.tslibs import Timestamp -import pandas.util._testing as tm import pandas as pd from pandas import Float64Index, Index, Int64Index, Series, UInt64Index +import pandas._testing as tm from pandas.api.types import pandas_dtype from pandas.tests.indexes.common import Base diff --git a/pandas/tests/indexes/test_numpy_compat.py b/pandas/tests/indexes/test_numpy_compat.py index 9cbaeb89cf45f..583556656ac87 100644 --- a/pandas/tests/indexes/test_numpy_compat.py +++ b/pandas/tests/indexes/test_numpy_compat.py @@ -1,8 +1,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import ( DatetimeIndex, Float64Index, @@ -14,6 +12,7 @@ _np_version_under1p17, _np_version_under1p18, ) +import pandas._testing as tm from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin diff --git a/pandas/tests/indexes/test_setops.py b/pandas/tests/indexes/test_setops.py index ae74b62e71474..abfa413d56655 100644 --- a/pandas/tests/indexes/test_setops.py +++ b/pandas/tests/indexes/test_setops.py @@ -7,12 +7,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_dtype_equal import pandas as pd from pandas import Float64Index, Int64Index, RangeIndex, UInt64Index +import pandas._testing as tm from pandas.api.types import pandas_dtype from pandas.tests.indexes.conftest import indices_dict diff --git a/pandas/tests/indexes/timedeltas/test_astype.py b/pandas/tests/indexes/timedeltas/test_astype.py index 3c9b43da68bf9..82c9d995c9c7c 100644 --- a/pandas/tests/indexes/timedeltas/test_astype.py +++ b/pandas/tests/indexes/timedeltas/test_astype.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Float64Index, @@ -15,6 +13,7 @@ TimedeltaIndex, timedelta_range, ) +import pandas._testing as tm class TestTimedeltaIndex: diff --git a/pandas/tests/indexes/timedeltas/test_constructors.py b/pandas/tests/indexes/timedeltas/test_constructors.py index 720dbb0de5b6a..e9540c950a32b 100644 --- a/pandas/tests/indexes/timedeltas/test_constructors.py +++ b/pandas/tests/indexes/timedeltas/test_constructors.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Timedelta, TimedeltaIndex, timedelta_range, to_timedelta +import pandas._testing as tm from pandas.core.arrays import TimedeltaArray diff --git a/pandas/tests/indexes/timedeltas/test_indexing.py b/pandas/tests/indexes/timedeltas/test_indexing.py index 7f47ec25f69ce..0114dfef548de 100644 --- a/pandas/tests/indexes/timedeltas/test_indexing.py +++ b/pandas/tests/indexes/timedeltas/test_indexing.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, Timedelta, TimedeltaIndex, timedelta_range +import pandas._testing as tm class TestGetItem: diff --git a/pandas/tests/indexes/timedeltas/test_ops.py b/pandas/tests/indexes/timedeltas/test_ops.py index bc9a01d114a95..25f27da758ad8 100644 --- a/pandas/tests/indexes/timedeltas/test_ops.py +++ b/pandas/tests/indexes/timedeltas/test_ops.py @@ -3,12 +3,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.generic import ABCDateOffset import pandas as pd from pandas import Series, TimedeltaIndex, timedelta_range +import pandas._testing as tm from pandas.tests.base.test_ops import Ops from pandas.tseries.offsets import Day, Hour diff --git a/pandas/tests/indexes/timedeltas/test_partial_slicing.py b/pandas/tests/indexes/timedeltas/test_partial_slicing.py index ab534ef4fa1a1..29e2c7dd20be0 100644 --- a/pandas/tests/indexes/timedeltas/test_partial_slicing.py +++ b/pandas/tests/indexes/timedeltas/test_partial_slicing.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series, Timedelta, timedelta_range +import pandas._testing as tm class TestSlicing: diff --git a/pandas/tests/indexes/timedeltas/test_scalar_compat.py b/pandas/tests/indexes/timedeltas/test_scalar_compat.py index 3ef04819d940a..44f4a2adedaad 100644 --- a/pandas/tests/indexes/timedeltas/test_scalar_compat.py +++ b/pandas/tests/indexes/timedeltas/test_scalar_compat.py @@ -5,10 +5,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Index, Series, Timedelta, TimedeltaIndex, timedelta_range +import pandas._testing as tm class TestVectorizedTimedelta: diff --git a/pandas/tests/indexes/timedeltas/test_setops.py b/pandas/tests/indexes/timedeltas/test_setops.py index 03519626531f7..b2024d04efc66 100644 --- a/pandas/tests/indexes/timedeltas/test_setops.py +++ b/pandas/tests/indexes/timedeltas/test_setops.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Int64Index, TimedeltaIndex, timedelta_range +import pandas._testing as tm from pandas.tseries.offsets import Hour diff --git a/pandas/tests/indexes/timedeltas/test_shift.py b/pandas/tests/indexes/timedeltas/test_shift.py index 39617a9704332..98933ff0423ab 100644 --- a/pandas/tests/indexes/timedeltas/test_shift.py +++ b/pandas/tests/indexes/timedeltas/test_shift.py @@ -1,10 +1,10 @@ import pytest from pandas.errors import NullFrequencyError -import pandas.util._testing as tm import pandas as pd from pandas import TimedeltaIndex +import pandas._testing as tm class TestTimedeltaIndexShift: diff --git a/pandas/tests/indexes/timedeltas/test_timedelta.py b/pandas/tests/indexes/timedeltas/test_timedelta.py index 0ea49736d0ae0..7703fbbbcad2a 100644 --- a/pandas/tests/indexes/timedeltas/test_timedelta.py +++ b/pandas/tests/indexes/timedeltas/test_timedelta.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( DataFrame, @@ -16,6 +14,7 @@ date_range, timedelta_range, ) +import pandas._testing as tm from ..datetimelike import DatetimeLike diff --git a/pandas/tests/indexes/timedeltas/test_timedelta_range.py b/pandas/tests/indexes/timedeltas/test_timedelta_range.py index 4a0048c47029c..1cef9de6a3a77 100644 --- a/pandas/tests/indexes/timedeltas/test_timedelta_range.py +++ b/pandas/tests/indexes/timedeltas/test_timedelta_range.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import timedelta_range, to_timedelta +import pandas._testing as tm from pandas.tseries.offsets import Day, Second diff --git a/pandas/tests/indexes/timedeltas/test_tools.py b/pandas/tests/indexes/timedeltas/test_tools.py index 8ae472282c3ce..223bde8b0e2c2 100644 --- a/pandas/tests/indexes/timedeltas/test_tools.py +++ b/pandas/tests/indexes/timedeltas/test_tools.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series, TimedeltaIndex, isna, to_timedelta +import pandas._testing as tm class TestTimedeltas: diff --git a/pandas/tests/indexing/common.py b/pandas/tests/indexing/common.py index 54578ebab3aad..3c027b035c2b8 100644 --- a/pandas/tests/indexing/common.py +++ b/pandas/tests/indexing/common.py @@ -4,11 +4,10 @@ import numpy as np -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_scalar from pandas import DataFrame, Float64Index, MultiIndex, Series, UInt64Index, date_range +import pandas._testing as tm def _mklbl(prefix, n): diff --git a/pandas/tests/indexing/interval/test_interval.py b/pandas/tests/indexing/interval/test_interval.py index f99e982aebaa0..634020982b1c2 100644 --- a/pandas/tests/indexing/interval/test_interval.py +++ b/pandas/tests/indexing/interval/test_interval.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, IntervalIndex, Series +import pandas._testing as tm class TestIntervalIndex: diff --git a/pandas/tests/indexing/interval/test_interval_new.py b/pandas/tests/indexing/interval/test_interval_new.py index 5a4d8e4a43042..43036fbbd9844 100644 --- a/pandas/tests/indexing/interval/test_interval_new.py +++ b/pandas/tests/indexing/interval/test_interval_new.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Interval, IntervalIndex, Series +import pandas._testing as tm class TestIntervalIndex: diff --git a/pandas/tests/indexing/multiindex/conftest.py b/pandas/tests/indexing/multiindex/conftest.py index d72ada6339548..e6d5a9eb84410 100644 --- a/pandas/tests/indexing/multiindex/conftest.py +++ b/pandas/tests/indexing/multiindex/conftest.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py index d71a04dcfa3db..4051d7c5fe374 100644 --- a/pandas/tests/indexing/multiindex/test_chaining_and_caching.py +++ b/pandas/tests/indexing/multiindex/test_chaining_and_caching.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm import pandas.core.common as com diff --git a/pandas/tests/indexing/multiindex/test_getitem.py b/pandas/tests/indexing/multiindex/test_getitem.py index 83c72baafd7f1..8ea825da8f94f 100644 --- a/pandas/tests/indexing/multiindex/test_getitem.py +++ b/pandas/tests/indexing/multiindex/test_getitem.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm from pandas.core.indexing import IndexingError # ---------------------------------------------------------------------------- diff --git a/pandas/tests/indexing/multiindex/test_iloc.py b/pandas/tests/indexing/multiindex/test_iloc.py index 96502aa7498db..9859c7235c380 100644 --- a/pandas/tests/indexing/multiindex/test_iloc.py +++ b/pandas/tests/indexing/multiindex/test_iloc.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/indexing/multiindex/test_indexing_slow.py b/pandas/tests/indexing/multiindex/test_indexing_slow.py index 5432846b8f6ed..8ea1cebd7bf7b 100644 --- a/pandas/tests/indexing/multiindex/test_indexing_slow.py +++ b/pandas/tests/indexing/multiindex/test_indexing_slow.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm @pytest.mark.slow diff --git a/pandas/tests/indexing/multiindex/test_ix.py b/pandas/tests/indexing/multiindex/test_ix.py index da8441bb05c3d..01b0b392d52a3 100644 --- a/pandas/tests/indexing/multiindex/test_ix.py +++ b/pandas/tests/indexing/multiindex/test_ix.py @@ -2,9 +2,9 @@ import pytest from pandas.errors import PerformanceWarning -import pandas.util._testing as tm from pandas import DataFrame, MultiIndex +import pandas._testing as tm class TestMultiIndex: diff --git a/pandas/tests/indexing/multiindex/test_loc.py b/pandas/tests/indexing/multiindex/test_loc.py index ef65c1222beaa..ce427116ea343 100644 --- a/pandas/tests/indexing/multiindex/test_loc.py +++ b/pandas/tests/indexing/multiindex/test_loc.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm from pandas.core.indexing import IndexingError diff --git a/pandas/tests/indexing/multiindex/test_multiindex.py b/pandas/tests/indexing/multiindex/test_multiindex.py index 780a8c3a2387a..3339cb5f3150d 100644 --- a/pandas/tests/indexing/multiindex/test_multiindex.py +++ b/pandas/tests/indexing/multiindex/test_multiindex.py @@ -3,10 +3,10 @@ import pandas._libs.index as _index from pandas.errors import PerformanceWarning -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm class TestMultiIndexBasic: diff --git a/pandas/tests/indexing/multiindex/test_partial.py b/pandas/tests/indexing/multiindex/test_partial.py index f04ab0cab746f..9d181bdcb9491 100644 --- a/pandas/tests/indexing/multiindex/test_partial.py +++ b/pandas/tests/indexing/multiindex/test_partial.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex +import pandas._testing as tm class TestMultiIndexPartial: diff --git a/pandas/tests/indexing/multiindex/test_set_ops.py b/pandas/tests/indexing/multiindex/test_set_ops.py index d7d46503edd4b..f2cbfadb3cfa5 100644 --- a/pandas/tests/indexing/multiindex/test_set_ops.py +++ b/pandas/tests/indexing/multiindex/test_set_ops.py @@ -1,8 +1,7 @@ from numpy.random import randn -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm class TestMultiIndexSetOps: diff --git a/pandas/tests/indexing/multiindex/test_setitem.py b/pandas/tests/indexing/multiindex/test_setitem.py index 2d17e31149b89..cb6c3a71fecc4 100644 --- a/pandas/tests/indexing/multiindex/test_setitem.py +++ b/pandas/tests/indexing/multiindex/test_setitem.py @@ -2,10 +2,9 @@ from numpy.random import randn import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex, Series, Timestamp, date_range, isna, notna +import pandas._testing as tm import pandas.core.common as com diff --git a/pandas/tests/indexing/multiindex/test_slice.py b/pandas/tests/indexing/multiindex/test_slice.py index b93fcf22cbb42..6fa9d3bd2cdbb 100644 --- a/pandas/tests/indexing/multiindex/test_slice.py +++ b/pandas/tests/indexing/multiindex/test_slice.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import UnsortedIndexError -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp +import pandas._testing as tm from pandas.core.indexing import _non_reducing_slice from pandas.tests.indexing.common import _mklbl diff --git a/pandas/tests/indexing/multiindex/test_sorted.py b/pandas/tests/indexing/multiindex/test_sorted.py index f649d20c42f4b..4bec0f429a34e 100644 --- a/pandas/tests/indexing/multiindex/test_sorted.py +++ b/pandas/tests/indexing/multiindex/test_sorted.py @@ -1,9 +1,8 @@ import numpy as np from numpy.random import randn -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm class TestMultiIndexSorted: diff --git a/pandas/tests/indexing/multiindex/test_xs.py b/pandas/tests/indexing/multiindex/test_xs.py index 46b762dbd4daf..db8c0c643a623 100644 --- a/pandas/tests/indexing/multiindex/test_xs.py +++ b/pandas/tests/indexing/multiindex/test_xs.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, Series, concat, date_range +import pandas._testing as tm import pandas.core.common as com diff --git a/pandas/tests/indexing/test_callable.py b/pandas/tests/indexing/test_callable.py index 995f9f0bb64ee..621417eb38d94 100644 --- a/pandas/tests/indexing/test_callable.py +++ b/pandas/tests/indexing/test_callable.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestIndexingCallable: diff --git a/pandas/tests/indexing/test_categorical.py b/pandas/tests/indexing/test_categorical.py index 2c4cbd404599c..4a33dbd8fc7bd 100644 --- a/pandas/tests/indexing/test_categorical.py +++ b/pandas/tests/indexing/test_categorical.py @@ -1,8 +1,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_categorical_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -18,6 +16,7 @@ Timestamp, conftest, ) +import pandas._testing as tm from pandas.api.types import CategoricalDtype as CDT diff --git a/pandas/tests/indexing/test_chaining_and_caching.py b/pandas/tests/indexing/test_chaining_and_caching.py index 3969d8840e20d..785448e910217 100644 --- a/pandas/tests/indexing/test_chaining_and_caching.py +++ b/pandas/tests/indexing/test_chaining_and_caching.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range, option_context +import pandas._testing as tm import pandas.core.common as com diff --git a/pandas/tests/indexing/test_coercion.py b/pandas/tests/indexing/test_coercion.py index 579ffeef88e32..8843f6c08fe80 100644 --- a/pandas/tests/indexing/test_coercion.py +++ b/pandas/tests/indexing/test_coercion.py @@ -5,9 +5,9 @@ import pytest import pandas.compat as compat -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm ############################################################### # Index / Series common tests which may trigger dtype coercions diff --git a/pandas/tests/indexing/test_datetime.py b/pandas/tests/indexing/test_datetime.py index 9c3a863f78bdc..42f992339f036 100644 --- a/pandas/tests/indexing/test_datetime.py +++ b/pandas/tests/indexing/test_datetime.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, date_range +import pandas._testing as tm class TestDatetimeIndex: diff --git a/pandas/tests/indexing/test_floats.py b/pandas/tests/indexing/test_floats.py index c12c9c4bcd6a8..75bf23b39a935 100644 --- a/pandas/tests/indexing/test_floats.py +++ b/pandas/tests/indexing/test_floats.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Float64Index, Index, Int64Index, RangeIndex, Series +import pandas._testing as tm class TestFloatIndexers: diff --git a/pandas/tests/indexing/test_iloc.py b/pandas/tests/indexing/test_iloc.py index 284482e067fc4..26dedf02e7333 100644 --- a/pandas/tests/indexing/test_iloc.py +++ b/pandas/tests/indexing/test_iloc.py @@ -6,10 +6,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, concat, date_range, isna +import pandas._testing as tm from pandas.api.types import is_scalar from pandas.core.indexing import IndexingError from pandas.tests.indexing.common import Base diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index cf86ec32b3559..be921c813e2fa 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -8,12 +8,12 @@ import pytest from pandas.errors import AbstractMethodError -import pandas.util._testing as tm from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype import pandas as pd from pandas import DataFrame, Index, NaT, Series +import pandas._testing as tm from pandas.core.generic import NDFrame from pandas.core.indexers import validate_indices from pandas.core.indexing import _maybe_numeric_slice, _non_reducing_slice diff --git a/pandas/tests/indexing/test_indexing_engines.py b/pandas/tests/indexing/test_indexing_engines.py index c21188d6d982c..edb5d7d7f3a57 100644 --- a/pandas/tests/indexing/test_indexing_engines.py +++ b/pandas/tests/indexing/test_indexing_engines.py @@ -1,7 +1,8 @@ import numpy as np from pandas._libs import algos as libalgos, index as libindex -import pandas.util._testing as tm + +import pandas._testing as tm class TestNumericEngine: diff --git a/pandas/tests/indexing/test_indexing_slow.py b/pandas/tests/indexing/test_indexing_slow.py index 8c47eec7a7628..2ffa44bec14a6 100644 --- a/pandas/tests/indexing/test_indexing_slow.py +++ b/pandas/tests/indexing/test_indexing_slow.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm class TestIndexingSlow: diff --git a/pandas/tests/indexing/test_loc.py b/pandas/tests/indexing/test_loc.py index 88f2a75f4ded1..01cd0c6bc7a59 100644 --- a/pandas/tests/indexing/test_loc.py +++ b/pandas/tests/indexing/test_loc.py @@ -5,10 +5,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp, date_range +import pandas._testing as tm from pandas.api.types import is_scalar from pandas.tests.indexing.common import Base diff --git a/pandas/tests/indexing/test_partial.py b/pandas/tests/indexing/test_partial.py index bc7fa0f14bd45..5fda759020f1a 100644 --- a/pandas/tests/indexing/test_partial.py +++ b/pandas/tests/indexing/test_partial.py @@ -7,10 +7,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, date_range +import pandas._testing as tm class TestPartialSetting: diff --git a/pandas/tests/indexing/test_scalar.py b/pandas/tests/indexing/test_scalar.py index 114e969d6f065..362a2c00e6775 100644 --- a/pandas/tests/indexing/test_scalar.py +++ b/pandas/tests/indexing/test_scalar.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series, Timedelta, Timestamp, date_range +import pandas._testing as tm from pandas.tests.indexing.common import Base diff --git a/pandas/tests/indexing/test_timedelta.py b/pandas/tests/indexing/test_timedelta.py index bcd5cc3d90345..dd4750123c0b5 100644 --- a/pandas/tests/indexing/test_timedelta.py +++ b/pandas/tests/indexing/test_timedelta.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestTimedeltaIndexing: diff --git a/pandas/tests/internals/test_internals.py b/pandas/tests/internals/test_internals.py index 6ee23be24b1c9..f20e9ef6d7b57 100644 --- a/pandas/tests/internals/test_internals.py +++ b/pandas/tests/internals/test_internals.py @@ -8,7 +8,6 @@ import pytest from pandas._libs.internals import BlockPlacement -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -20,6 +19,7 @@ Series, SparseArray, ) +import pandas._testing as tm import pandas.core.algorithms as algos from pandas.core.arrays import DatetimeArray, TimedeltaArray from pandas.core.internals import BlockManager, SingleBlockManager, make_block diff --git a/pandas/tests/io/conftest.py b/pandas/tests/io/conftest.py index 1bdf04aeb6670..7810778602e12 100644 --- a/pandas/tests/io/conftest.py +++ b/pandas/tests/io/conftest.py @@ -2,7 +2,7 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/excel/conftest.py b/pandas/tests/io/excel/conftest.py index b169a0c164d6b..a257735dc1ec5 100644 --- a/pandas/tests/io/excel/conftest.py +++ b/pandas/tests/io/excel/conftest.py @@ -1,7 +1,8 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm + +import pandas._testing as tm from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/excel/test_odf.py b/pandas/tests/io/excel/test_odf.py index bf898a5e7ff4a..b9a3e8b59b133 100644 --- a/pandas/tests/io/excel/test_odf.py +++ b/pandas/tests/io/excel/test_odf.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm pytest.importorskip("odf") diff --git a/pandas/tests/io/excel/test_openpyxl.py b/pandas/tests/io/excel/test_openpyxl.py index a0056729e5220..10ed192062d9c 100644 --- a/pandas/tests/io/excel/test_openpyxl.py +++ b/pandas/tests/io/excel/test_openpyxl.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame +import pandas._testing as tm from pandas.io.excel import ExcelWriter, _OpenpyxlWriter diff --git a/pandas/tests/io/excel/test_readers.py b/pandas/tests/io/excel/test_readers.py index 17a43349b8475..f1289292b680c 100644 --- a/pandas/tests/io/excel/test_readers.py +++ b/pandas/tests/io/excel/test_readers.py @@ -10,10 +10,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm @contextlib.contextmanager diff --git a/pandas/tests/io/excel/test_style.py b/pandas/tests/io/excel/test_style.py index 8b49c335357a2..88f4c3736bc0d 100644 --- a/pandas/tests/io/excel/test_style.py +++ b/pandas/tests/io/excel/test_style.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm from pandas.io.excel import ExcelWriter from pandas.io.formats.excel import ExcelFormatter diff --git a/pandas/tests/io/excel/test_writers.py b/pandas/tests/io/excel/test_writers.py index 0599e0953a5e5..55b987a599670 100644 --- a/pandas/tests/io/excel/test_writers.py +++ b/pandas/tests/io/excel/test_writers.py @@ -7,10 +7,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, get_option, set_option +import pandas._testing as tm from pandas.io.excel import ( ExcelFile, diff --git a/pandas/tests/io/excel/test_xlrd.py b/pandas/tests/io/excel/test_xlrd.py index 5d7d12e00a20f..d1f900a2dc58b 100644 --- a/pandas/tests/io/excel/test_xlrd.py +++ b/pandas/tests/io/excel/test_xlrd.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.io.excel import ExcelFile diff --git a/pandas/tests/io/excel/test_xlsxwriter.py b/pandas/tests/io/excel/test_xlsxwriter.py index 3a16d940da9fb..b6f791434a92b 100644 --- a/pandas/tests/io/excel/test_xlsxwriter.py +++ b/pandas/tests/io/excel/test_xlsxwriter.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm from pandas.io.excel import ExcelWriter diff --git a/pandas/tests/io/excel/test_xlwt.py b/pandas/tests/io/excel/test_xlwt.py index bad301084dc99..01feab08eb5e3 100644 --- a/pandas/tests/io/excel/test_xlwt.py +++ b/pandas/tests/io/excel/test_xlwt.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, MultiIndex +import pandas._testing as tm from pandas.io.excel import ExcelWriter, _XlwtWriter diff --git a/pandas/tests/io/formats/test_css.py b/pandas/tests/io/formats/test_css.py index e55475d3d94aa..a6bf56f26d21f 100644 --- a/pandas/tests/io/formats/test_css.py +++ b/pandas/tests/io/formats/test_css.py @@ -1,6 +1,6 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm from pandas.io.formats.css import CSSResolver, CSSWarning diff --git a/pandas/tests/io/formats/test_eng_formatting.py b/pandas/tests/io/formats/test_eng_formatting.py index 0c3bfa2e6b158..6801316ada8a3 100644 --- a/pandas/tests/io/formats/test_eng_formatting.py +++ b/pandas/tests/io/formats/test_eng_formatting.py @@ -1,9 +1,8 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame +import pandas._testing as tm import pandas.io.formats.format as fmt diff --git a/pandas/tests/io/formats/test_format.py b/pandas/tests/io/formats/test_format.py index 5a706a483c700..7fbc1444033c4 100644 --- a/pandas/tests/io/formats/test_format.py +++ b/pandas/tests/io/formats/test_format.py @@ -19,7 +19,6 @@ import pytz from pandas.compat import is_platform_32bit, is_platform_windows -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -36,6 +35,7 @@ reset_option, set_option, ) +import pandas._testing as tm import pandas.io.formats.format as fmt import pandas.io.formats.printing as printing diff --git a/pandas/tests/io/formats/test_style.py b/pandas/tests/io/formats/test_style.py index bbcf2fc6f1a6b..c113198cfdecb 100644 --- a/pandas/tests/io/formats/test_style.py +++ b/pandas/tests/io/formats/test_style.py @@ -6,10 +6,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame +import pandas._testing as tm jinja2 = pytest.importorskip("jinja2") from pandas.io.formats.style import Styler, _get_level_lengths # noqa # isort:skip diff --git a/pandas/tests/io/formats/test_to_csv.py b/pandas/tests/io/formats/test_to_csv.py index 426d6f0e77c67..531c84a2a9908 100644 --- a/pandas/tests/io/formats/test_to_csv.py +++ b/pandas/tests/io/formats/test_to_csv.py @@ -5,10 +5,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, compat +import pandas._testing as tm class TestToCSV: diff --git a/pandas/tests/io/formats/test_to_excel.py b/pandas/tests/io/formats/test_to_excel.py index 58b30085d97b3..a700d5681f47e 100644 --- a/pandas/tests/io/formats/test_to_excel.py +++ b/pandas/tests/io/formats/test_to_excel.py @@ -5,7 +5,7 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm from pandas.io.formats.css import CSSWarning from pandas.io.formats.excel import CSSToExcelConverter diff --git a/pandas/tests/io/formats/test_to_html.py b/pandas/tests/io/formats/test_to_html.py index 669d8bb4fb55a..d6e0b53d4c176 100644 --- a/pandas/tests/io/formats/test_to_html.py +++ b/pandas/tests/io/formats/test_to_html.py @@ -5,10 +5,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, option_context +import pandas._testing as tm import pandas.io.formats.format as fmt diff --git a/pandas/tests/io/formats/test_to_latex.py b/pandas/tests/io/formats/test_to_latex.py index d7e3815990314..bd681032f155d 100644 --- a/pandas/tests/io/formats/test_to_latex.py +++ b/pandas/tests/io/formats/test_to_latex.py @@ -3,10 +3,9 @@ import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm class TestToLatex: diff --git a/pandas/tests/io/json/test_compression.py b/pandas/tests/io/json/test_compression.py index a6f463004aab5..182c21ed1d416 100644 --- a/pandas/tests/io/json/test_compression.py +++ b/pandas/tests/io/json/test_compression.py @@ -1,9 +1,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm def test_compression_roundtrip(compression): diff --git a/pandas/tests/io/json/test_json_table_schema.py b/pandas/tests/io/json/test_json_table_schema.py index 5251fa779dc01..2ac2acc6748d1 100644 --- a/pandas/tests/io/json/test_json_table_schema.py +++ b/pandas/tests/io/json/test_json_table_schema.py @@ -5,12 +5,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype, DatetimeTZDtype, PeriodDtype import pandas as pd from pandas import DataFrame +import pandas._testing as tm from pandas.io.json._table_schema import ( as_json_table_type, diff --git a/pandas/tests/io/json/test_normalize.py b/pandas/tests/io/json/test_normalize.py index 0b895d921c811..efb95a0cb2a42 100644 --- a/pandas/tests/io/json/test_normalize.py +++ b/pandas/tests/io/json/test_normalize.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, json_normalize +import pandas._testing as tm from pandas.io.json._normalize import nested_to_record diff --git a/pandas/tests/io/json/test_pandas.py b/pandas/tests/io/json/test_pandas.py index 516d2861d6341..09d8a1d3f10ea 100644 --- a/pandas/tests/io/json/test_pandas.py +++ b/pandas/tests/io/json/test_pandas.py @@ -9,10 +9,10 @@ from pandas.compat import is_platform_32bit, is_platform_windows import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, Timestamp, read_json +import pandas._testing as tm _seriesd = tm.getSeriesData() _tsd = tm.getTimeSeriesData() diff --git a/pandas/tests/io/json/test_readlines.py b/pandas/tests/io/json/test_readlines.py index e12d48e0320f3..e531457627342 100644 --- a/pandas/tests/io/json/test_readlines.py +++ b/pandas/tests/io/json/test_readlines.py @@ -2,10 +2,9 @@ import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, read_json +import pandas._testing as tm from pandas.io.json._json import JsonReader diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index e3cdae7cb3204..f50492c58a370 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -15,9 +15,9 @@ import pandas._libs.json as ujson from pandas._libs.tslib import Timestamp import pandas.compat as compat -import pandas.util._testing as tm from pandas import DataFrame, DatetimeIndex, Index, NaT, Series, date_range +import pandas._testing as tm def _clean_dict(d): diff --git a/pandas/tests/io/parser/test_c_parser_only.py b/pandas/tests/io/parser/test_c_parser_only.py index 5fd34a6a28f64..2d11f619d508b 100644 --- a/pandas/tests/io/parser/test_c_parser_only.py +++ b/pandas/tests/io/parser/test_c_parser_only.py @@ -15,9 +15,9 @@ from pandas.errors import ParserError import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, concat +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/io/parser/test_comment.py b/pandas/tests/io/parser/test_comment.py index 505b33cf0933d..60e32d7c27200 100644 --- a/pandas/tests/io/parser/test_comment.py +++ b/pandas/tests/io/parser/test_comment.py @@ -7,9 +7,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm @pytest.mark.parametrize("na_values", [None, ["NaN"]]) diff --git a/pandas/tests/io/parser/test_common.py b/pandas/tests/io/parser/test_common.py index 1a2012d142054..1678b1ecf8700 100644 --- a/pandas/tests/io/parser/test_common.py +++ b/pandas/tests/io/parser/test_common.py @@ -16,9 +16,9 @@ from pandas._libs.tslib import Timestamp from pandas.errors import DtypeWarning, EmptyDataError, ParserError -import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex, Series, compat, concat +import pandas._testing as tm from pandas.io.parsers import CParserWrapper, TextFileReader, TextParser diff --git a/pandas/tests/io/parser/test_compression.py b/pandas/tests/io/parser/test_compression.py index 5922034bb9218..e2b6fdd3af2ff 100644 --- a/pandas/tests/io/parser/test_compression.py +++ b/pandas/tests/io/parser/test_compression.py @@ -8,9 +8,8 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/io/parser/test_converters.py b/pandas/tests/io/parser/test_converters.py index 31e4cb45eb35b..88b400d9a11df 100644 --- a/pandas/tests/io/parser/test_converters.py +++ b/pandas/tests/io/parser/test_converters.py @@ -8,10 +8,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index +import pandas._testing as tm def test_converters_type_must_be_dict(all_parsers): diff --git a/pandas/tests/io/parser/test_dialect.py b/pandas/tests/io/parser/test_dialect.py index 29ef1fb2fb3ea..cc65def0fd096 100644 --- a/pandas/tests/io/parser/test_dialect.py +++ b/pandas/tests/io/parser/test_dialect.py @@ -9,9 +9,9 @@ import pytest from pandas.errors import ParserWarning -import pandas.util._testing as tm from pandas import DataFrame +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/io/parser/test_dtypes.py b/pandas/tests/io/parser/test_dtypes.py index b1c0209c1c9df..2133f8116a95e 100644 --- a/pandas/tests/io/parser/test_dtypes.py +++ b/pandas/tests/io/parser/test_dtypes.py @@ -9,12 +9,12 @@ import pytest from pandas.errors import ParserWarning -import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd from pandas import Categorical, DataFrame, Index, MultiIndex, Series, Timestamp, concat +import pandas._testing as tm @pytest.mark.parametrize("dtype", [str, object]) diff --git a/pandas/tests/io/parser/test_header.py b/pandas/tests/io/parser/test_header.py index 8c31c20eca1cd..7dc106ef0c186 100644 --- a/pandas/tests/io/parser/test_header.py +++ b/pandas/tests/io/parser/test_header.py @@ -10,9 +10,9 @@ import pytest from pandas.errors import ParserError -import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex +import pandas._testing as tm def test_read_with_bad_header(all_parsers): diff --git a/pandas/tests/io/parser/test_index_col.py b/pandas/tests/io/parser/test_index_col.py index 34c0677cf0739..7361e2ca6868f 100644 --- a/pandas/tests/io/parser/test_index_col.py +++ b/pandas/tests/io/parser/test_index_col.py @@ -7,9 +7,8 @@ import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex +import pandas._testing as tm @pytest.mark.parametrize("with_header", [True, False]) diff --git a/pandas/tests/io/parser/test_mangle_dupes.py b/pandas/tests/io/parser/test_mangle_dupes.py index dd1720806a811..5c4e642115798 100644 --- a/pandas/tests/io/parser/test_mangle_dupes.py +++ b/pandas/tests/io/parser/test_mangle_dupes.py @@ -7,9 +7,8 @@ import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm @pytest.mark.parametrize("kwargs", [dict(), dict(mangle_dupe_cols=True)]) diff --git a/pandas/tests/io/parser/test_multi_thread.py b/pandas/tests/io/parser/test_multi_thread.py index 7241961e73ddc..64ccaf60ec230 100644 --- a/pandas/tests/io/parser/test_multi_thread.py +++ b/pandas/tests/io/parser/test_multi_thread.py @@ -7,10 +7,9 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame +import pandas._testing as tm def _construct_dataframe(num_rows): diff --git a/pandas/tests/io/parser/test_na_values.py b/pandas/tests/io/parser/test_na_values.py index 87dfd80efceff..c9a0889cdd8b7 100644 --- a/pandas/tests/io/parser/test_na_values.py +++ b/pandas/tests/io/parser/test_na_values.py @@ -8,9 +8,9 @@ import pytest from pandas._libs.parsers import STR_NA_VALUES -import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex +import pandas._testing as tm def test_string_nas(all_parsers): diff --git a/pandas/tests/io/parser/test_network.py b/pandas/tests/io/parser/test_network.py index cd780ba1e02a0..b8d66874bc660 100644 --- a/pandas/tests/io/parser/test_network.py +++ b/pandas/tests/io/parser/test_network.py @@ -9,9 +9,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame +import pandas._testing as tm from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/parser/test_parse_dates.py b/pandas/tests/io/parser/test_parse_dates.py index fc5cdc458c54e..b01b22e811ee3 100644 --- a/pandas/tests/io/parser/test_parse_dates.py +++ b/pandas/tests/io/parser/test_parse_dates.py @@ -17,10 +17,10 @@ from pandas._libs.tslibs.parsing import parse_datetime_string from pandas.compat import is_platform_windows from pandas.compat.numpy import np_array_datetime64_compat -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, Index, MultiIndex, Series +import pandas._testing as tm from pandas.core.indexes.datetimes import date_range import pandas.io.date_converters as conv diff --git a/pandas/tests/io/parser/test_python_parser_only.py b/pandas/tests/io/parser/test_python_parser_only.py index fca4c06cd6e20..7367b19b40dc3 100644 --- a/pandas/tests/io/parser/test_python_parser_only.py +++ b/pandas/tests/io/parser/test_python_parser_only.py @@ -11,9 +11,9 @@ import pytest from pandas.errors import ParserError -import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex +import pandas._testing as tm def test_default_separator(python_parser_only): diff --git a/pandas/tests/io/parser/test_quoting.py b/pandas/tests/io/parser/test_quoting.py index 5f23edf2c6705..14773dfbea20e 100644 --- a/pandas/tests/io/parser/test_quoting.py +++ b/pandas/tests/io/parser/test_quoting.py @@ -9,9 +9,9 @@ import pytest from pandas.errors import ParserError -import pandas.util._testing as tm from pandas import DataFrame +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/io/parser/test_read_fwf.py b/pandas/tests/io/parser/test_read_fwf.py index 35ab8351ce53b..27aef2376e87d 100644 --- a/pandas/tests/io/parser/test_read_fwf.py +++ b/pandas/tests/io/parser/test_read_fwf.py @@ -10,10 +10,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, DatetimeIndex +import pandas._testing as tm from pandas.io.parsers import EmptyDataError, read_csv, read_fwf diff --git a/pandas/tests/io/parser/test_skiprows.py b/pandas/tests/io/parser/test_skiprows.py index ca38d930e727e..fdccef1127c7e 100644 --- a/pandas/tests/io/parser/test_skiprows.py +++ b/pandas/tests/io/parser/test_skiprows.py @@ -10,9 +10,9 @@ import pytest from pandas.errors import EmptyDataError -import pandas.util._testing as tm from pandas import DataFrame, Index +import pandas._testing as tm @pytest.mark.parametrize("skiprows", [list(range(6)), 6]) diff --git a/pandas/tests/io/parser/test_textreader.py b/pandas/tests/io/parser/test_textreader.py index 3928e3b7ffa4d..8d5af85c20d33 100644 --- a/pandas/tests/io/parser/test_textreader.py +++ b/pandas/tests/io/parser/test_textreader.py @@ -10,9 +10,9 @@ import pandas._libs.parsers as parser from pandas._libs.parsers import TextReader -import pandas.util._testing as tm from pandas import DataFrame +import pandas._testing as tm from pandas.io.parsers import TextFileReader, read_csv diff --git a/pandas/tests/io/parser/test_unsupported.py b/pandas/tests/io/parser/test_unsupported.py index cc6e2bcb00620..267fae760398a 100644 --- a/pandas/tests/io/parser/test_unsupported.py +++ b/pandas/tests/io/parser/test_unsupported.py @@ -11,7 +11,8 @@ import pytest from pandas.errors import ParserError -import pandas.util._testing as tm + +import pandas._testing as tm import pandas.io.parsers as parsers from pandas.io.parsers import read_csv diff --git a/pandas/tests/io/parser/test_usecols.py b/pandas/tests/io/parser/test_usecols.py index ca3c9ec64bfdb..979eb4702cc84 100644 --- a/pandas/tests/io/parser/test_usecols.py +++ b/pandas/tests/io/parser/test_usecols.py @@ -8,9 +8,9 @@ import pytest from pandas._libs.tslib import Timestamp -import pandas.util._testing as tm from pandas import DataFrame, Index +import pandas._testing as tm _msg_validate_usecols_arg = ( "'usecols' must either be list-like " diff --git a/pandas/tests/io/pytables/conftest.py b/pandas/tests/io/pytables/conftest.py index 91193b4097c8b..214f95c6fb441 100644 --- a/pandas/tests/io/pytables/conftest.py +++ b/pandas/tests/io/pytables/conftest.py @@ -1,6 +1,6 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/io/pytables/test_compat.py b/pandas/tests/io/pytables/test_compat.py index ad3d9399b1534..c7200385aa998 100644 --- a/pandas/tests/io/pytables/test_compat.py +++ b/pandas/tests/io/pytables/test_compat.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.tests.io.pytables.common import ensure_clean_path tables = pytest.importorskip("tables") diff --git a/pandas/tests/io/pytables/test_complex.py b/pandas/tests/io/pytables/test_complex.py index 702004c0fd8d8..543940e674dba 100644 --- a/pandas/tests/io/pytables/test_complex.py +++ b/pandas/tests/io/pytables/test_complex.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.tests.io.pytables.common import ensure_clean_path, ensure_clean_store from pandas.io.pytables import read_hdf diff --git a/pandas/tests/io/pytables/test_pytables_missing.py b/pandas/tests/io/pytables/test_pytables_missing.py index 2a0ae3d9a8e08..9adb0a6d227da 100644 --- a/pandas/tests/io/pytables/test_pytables_missing.py +++ b/pandas/tests/io/pytables/test_pytables_missing.py @@ -1,9 +1,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm @td.skip_if_installed("tables") diff --git a/pandas/tests/io/pytables/test_store.py b/pandas/tests/io/pytables/test_store.py index 57b601193667b..41b96cea1538c 100644 --- a/pandas/tests/io/pytables/test_store.py +++ b/pandas/tests/io/pytables/test_store.py @@ -12,7 +12,6 @@ from pandas.compat import is_platform_little_endian, is_platform_windows import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.common import is_categorical_dtype @@ -34,6 +33,7 @@ isna, timedelta_range, ) +import pandas._testing as tm from pandas.tests.io.pytables.common import ( _maybe_remove, create_tempfile, diff --git a/pandas/tests/io/pytables/test_timezones.py b/pandas/tests/io/pytables/test_timezones.py index f5c8e602b1ba4..2bf22d982e5fe 100644 --- a/pandas/tests/io/pytables/test_timezones.py +++ b/pandas/tests/io/pytables/test_timezones.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, Timestamp, date_range +import pandas._testing as tm from pandas.tests.io.pytables.common import ( _maybe_remove, ensure_clean_path, diff --git a/pandas/tests/io/sas/test_sas.py b/pandas/tests/io/sas/test_sas.py index fb4c6b856b7dc..5d2643c20ceb2 100644 --- a/pandas/tests/io/sas/test_sas.py +++ b/pandas/tests/io/sas/test_sas.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - from pandas import read_sas +import pandas._testing as tm class TestSas: diff --git a/pandas/tests/io/sas/test_sas7bdat.py b/pandas/tests/io/sas/test_sas7bdat.py index e58bb4b83b4a3..62e9ac6929c8e 100644 --- a/pandas/tests/io/sas/test_sas7bdat.py +++ b/pandas/tests/io/sas/test_sas7bdat.py @@ -8,9 +8,9 @@ from pandas.errors import EmptyDataError import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm # https://github.com/cython/cython/issues/1720 diff --git a/pandas/tests/io/sas/test_xport.py b/pandas/tests/io/sas/test_xport.py index ce4e0edef1643..ee97f08ef9400 100644 --- a/pandas/tests/io/sas/test_xport.py +++ b/pandas/tests/io/sas/test_xport.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.io.sas.sasreader import read_sas diff --git a/pandas/tests/io/test_clipboard.py b/pandas/tests/io/test_clipboard.py index 8c4d26393a588..a69e5556f3e85 100644 --- a/pandas/tests/io/test_clipboard.py +++ b/pandas/tests/io/test_clipboard.py @@ -4,10 +4,9 @@ from numpy.random import randint import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, get_option, read_clipboard +import pandas._testing as tm from pandas.io.clipboard import PyperclipException, clipboard_get, clipboard_set diff --git a/pandas/tests/io/test_common.py b/pandas/tests/io/test_common.py index 72b636ee12d1d..a126f83164ce5 100644 --- a/pandas/tests/io/test_common.py +++ b/pandas/tests/io/test_common.py @@ -10,9 +10,9 @@ from pandas.compat import is_platform_windows import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm import pandas.io.common as icom diff --git a/pandas/tests/io/test_compression.py b/pandas/tests/io/test_compression.py index 3cf43a933bec7..fb81e57912dac 100644 --- a/pandas/tests/io/test_compression.py +++ b/pandas/tests/io/test_compression.py @@ -5,9 +5,8 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm import pandas.io.common as icom diff --git a/pandas/tests/io/test_date_converters.py b/pandas/tests/io/test_date_converters.py index 514484e34eec7..cdb8eca02a3e5 100644 --- a/pandas/tests/io/test_date_converters.py +++ b/pandas/tests/io/test_date_converters.py @@ -2,7 +2,7 @@ import numpy as np -import pandas.util._testing as tm +import pandas._testing as tm import pandas.io.date_converters as conv diff --git a/pandas/tests/io/test_feather.py b/pandas/tests/io/test_feather.py index e3bc2be0c596e..39d6bc69e7c00 100644 --- a/pandas/tests/io/test_feather.py +++ b/pandas/tests/io/test_feather.py @@ -4,9 +4,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.io.feather_format import read_feather, to_feather # noqa: E402 isort:skip diff --git a/pandas/tests/io/test_gcs.py b/pandas/tests/io/test_gcs.py index 96f77f2e4a569..557a9d5c13987 100644 --- a/pandas/tests/io/test_gcs.py +++ b/pandas/tests/io/test_gcs.py @@ -4,9 +4,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, date_range, read_csv +import pandas._testing as tm from pandas.util import _test_decorators as td from pandas.io.common import is_gcs_url diff --git a/pandas/tests/io/test_html.py b/pandas/tests/io/test_html.py index 2ccf34c7fca91..626df839363cb 100644 --- a/pandas/tests/io/test_html.py +++ b/pandas/tests/io/test_html.py @@ -13,9 +13,9 @@ from pandas.compat import is_platform_windows from pandas.errors import ParserError import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range, read_csv +import pandas._testing as tm from pandas.io.common import file_path_to_url import pandas.io.html diff --git a/pandas/tests/io/test_orc.py b/pandas/tests/io/test_orc.py index 944785cf767f1..a1f9c6f6af51a 100644 --- a/pandas/tests/io/test_orc.py +++ b/pandas/tests/io/test_orc.py @@ -5,10 +5,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import read_orc +import pandas._testing as tm pytest.importorskip("pyarrow", minversion="0.13.0") pytest.importorskip("pyarrow.orc") diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py index 6a2ada2dbf4ef..f9bd0df4a9196 100644 --- a/pandas/tests/io/test_parquet.py +++ b/pandas/tests/io/test_parquet.py @@ -8,9 +8,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd +import pandas._testing as tm from pandas.io.parquet import ( FastParquetImpl, diff --git a/pandas/tests/io/test_pickle.py b/pandas/tests/io/test_pickle.py index e835f50406dab..42f904b47a6ee 100644 --- a/pandas/tests/io/test_pickle.py +++ b/pandas/tests/io/test_pickle.py @@ -22,10 +22,10 @@ import pytest from pandas.compat import _get_lzma_file, _import_lzma, is_platform_little_endian -import pandas.util._testing as tm import pandas as pd from pandas import Index +import pandas._testing as tm from pandas.tseries.offsets import Day, MonthEnd diff --git a/pandas/tests/io/test_spss.py b/pandas/tests/io/test_spss.py index 6aeb6dc1fcd3b..013f56f83c5ec 100644 --- a/pandas/tests/io/test_spss.py +++ b/pandas/tests/io/test_spss.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm pyreadstat = pytest.importorskip("pyreadstat") diff --git a/pandas/tests/io/test_sql.py b/pandas/tests/io/test_sql.py index 0c6da4bf603e1..45b3e839a08d1 100644 --- a/pandas/tests/io/test_sql.py +++ b/pandas/tests/io/test_sql.py @@ -26,8 +26,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_datetime64_dtype, is_datetime64tz_dtype import pandas as pd @@ -43,6 +41,7 @@ to_datetime, to_timedelta, ) +import pandas._testing as tm import pandas.io.sql as sql from pandas.io.sql import read_sql_query, read_sql_table diff --git a/pandas/tests/io/test_stata.py b/pandas/tests/io/test_stata.py index a758b763d7b59..9e34abd43ad6b 100644 --- a/pandas/tests/io/test_stata.py +++ b/pandas/tests/io/test_stata.py @@ -9,11 +9,10 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_categorical_dtype import pandas as pd +import pandas._testing as tm from pandas.core.frame import DataFrame, Series from pandas.io.parsers import read_csv diff --git a/pandas/tests/plotting/common.py b/pandas/tests/plotting/common.py index 8eb308550859b..9f43027836eb4 100644 --- a/pandas/tests/plotting/common.py +++ b/pandas/tests/plotting/common.py @@ -9,12 +9,12 @@ from pandas.util._decorators import cache_readonly import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.api import is_list_like import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm """ diff --git a/pandas/tests/plotting/test_boxplot_method.py b/pandas/tests/plotting/test_boxplot_method.py index 195ce0b0825be..8ee279f0e1f38 100644 --- a/pandas/tests/plotting/test_boxplot_method.py +++ b/pandas/tests/plotting/test_boxplot_method.py @@ -8,9 +8,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, MultiIndex, Series, date_range, timedelta_range +import pandas._testing as tm from pandas.tests.plotting.common import TestPlotBase, _check_plot_works import pandas.plotting as plotting diff --git a/pandas/tests/plotting/test_converter.py b/pandas/tests/plotting/test_converter.py index e3a2dc848fb39..8fdf86ddabafe 100644 --- a/pandas/tests/plotting/test_converter.py +++ b/pandas/tests/plotting/test_converter.py @@ -8,9 +8,9 @@ import pandas._config.config as cf from pandas.compat.numpy import np_datetime64_compat -import pandas.util._testing as tm from pandas import Index, Period, Series, Timestamp, date_range +import pandas._testing as tm from pandas.plotting import ( deregister_matplotlib_converters, diff --git a/pandas/tests/plotting/test_datetimelike.py b/pandas/tests/plotting/test_datetimelike.py index 972d8ab7184df..8f855fd0c6cff 100644 --- a/pandas/tests/plotting/test_datetimelike.py +++ b/pandas/tests/plotting/test_datetimelike.py @@ -7,9 +7,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Index, NaT, Series, isna +import pandas._testing as tm from pandas.core.indexes.datetimes import bdate_range, date_range from pandas.core.indexes.period import Period, PeriodIndex, period_range from pandas.core.indexes.timedeltas import timedelta_range diff --git a/pandas/tests/plotting/test_frame.py b/pandas/tests/plotting/test_frame.py index d115cd56d4928..bdf37ac7e83a4 100644 --- a/pandas/tests/plotting/test_frame.py +++ b/pandas/tests/plotting/test_frame.py @@ -12,12 +12,12 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.api import is_list_like import pandas as pd from pandas import DataFrame, MultiIndex, PeriodIndex, Series, bdate_range, date_range +import pandas._testing as tm from pandas.core.arrays import integer_array from pandas.tests.plotting.common import TestPlotBase, _check_plot_works diff --git a/pandas/tests/plotting/test_groupby.py b/pandas/tests/plotting/test_groupby.py index 208ca5c65db79..8fec4bb134cb4 100644 --- a/pandas/tests/plotting/test_groupby.py +++ b/pandas/tests/plotting/test_groupby.py @@ -6,9 +6,9 @@ import numpy as np import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Series +import pandas._testing as tm from pandas.tests.plotting.common import TestPlotBase diff --git a/pandas/tests/plotting/test_hist_method.py b/pandas/tests/plotting/test_hist_method.py index 4c5e8faa03927..50ebbc22f2739 100644 --- a/pandas/tests/plotting/test_hist_method.py +++ b/pandas/tests/plotting/test_hist_method.py @@ -7,9 +7,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Series +import pandas._testing as tm from pandas.tests.plotting.common import TestPlotBase, _check_plot_works diff --git a/pandas/tests/plotting/test_misc.py b/pandas/tests/plotting/test_misc.py index d28051e587af2..c8aa1f23ccf1f 100644 --- a/pandas/tests/plotting/test_misc.py +++ b/pandas/tests/plotting/test_misc.py @@ -8,9 +8,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Series +import pandas._testing as tm from pandas.tests.plotting.common import TestPlotBase, _check_plot_works import pandas.plotting as plotting diff --git a/pandas/tests/plotting/test_series.py b/pandas/tests/plotting/test_series.py index a58687ab33fb0..8463f30bee8f0 100644 --- a/pandas/tests/plotting/test_series.py +++ b/pandas/tests/plotting/test_series.py @@ -11,10 +11,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, date_range +import pandas._testing as tm from pandas.tests.plotting.common import TestPlotBase, _check_plot_works import pandas.plotting as plotting diff --git a/pandas/tests/reductions/test_reductions.py b/pandas/tests/reductions/test_reductions.py index 20ae67eac838e..7400b049961d5 100644 --- a/pandas/tests/reductions/test_reductions.py +++ b/pandas/tests/reductions/test_reductions.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -23,6 +21,7 @@ timedelta_range, to_timedelta, ) +import pandas._testing as tm from pandas.core import nanops diff --git a/pandas/tests/reductions/test_stat_reductions.py b/pandas/tests/reductions/test_stat_reductions.py index d92083107589f..59dbcb9ab9fa0 100644 --- a/pandas/tests/reductions/test_stat_reductions.py +++ b/pandas/tests/reductions/test_stat_reductions.py @@ -7,10 +7,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.arrays import DatetimeArray, PeriodArray, TimedeltaArray diff --git a/pandas/tests/resample/test_base.py b/pandas/tests/resample/test_base.py index 23a9d3c55294f..476643bb3e497 100644 --- a/pandas/tests/resample/test_base.py +++ b/pandas/tests/resample/test_base.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.groupby.groupby import DataError from pandas.core.groupby.grouper import Grouper from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/resample/test_datetime_index.py b/pandas/tests/resample/test_datetime_index.py index b479a8bc30b78..4860329718f54 100644 --- a/pandas/tests/resample/test_datetime_index.py +++ b/pandas/tests/resample/test_datetime_index.py @@ -7,10 +7,10 @@ import pytz from pandas.errors import UnsupportedFunctionCall -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, Timedelta, Timestamp, isna, notna +import pandas._testing as tm from pandas.core.groupby.grouper import Grouper from pandas.core.indexes.datetimes import date_range from pandas.core.indexes.period import Period, period_range diff --git a/pandas/tests/resample/test_period_index.py b/pandas/tests/resample/test_period_index.py index a29d50a269a8c..40226ab2fe9b0 100644 --- a/pandas/tests/resample/test_period_index.py +++ b/pandas/tests/resample/test_period_index.py @@ -7,10 +7,10 @@ from pandas._libs.tslibs.ccalendar import DAYS, MONTHS from pandas._libs.tslibs.period import IncompatibleFrequency -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series, Timestamp +import pandas._testing as tm from pandas.core.indexes.base import InvalidIndexError from pandas.core.indexes.datetimes import date_range from pandas.core.indexes.period import Period, PeriodIndex, period_range diff --git a/pandas/tests/resample/test_resample_api.py b/pandas/tests/resample/test_resample_api.py index f63b316341fae..bc2d6df3755d5 100644 --- a/pandas/tests/resample/test_resample_api.py +++ b/pandas/tests/resample/test_resample_api.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.indexes.datetimes import date_range dti = date_range(start=datetime(2005, 1, 1), end=datetime(2005, 1, 10), freq="Min") diff --git a/pandas/tests/resample/test_resampler_grouper.py b/pandas/tests/resample/test_resampler_grouper.py index f446800c94ff1..95a7654a618b2 100644 --- a/pandas/tests/resample/test_resampler_grouper.py +++ b/pandas/tests/resample/test_resampler_grouper.py @@ -2,10 +2,9 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, Timestamp +import pandas._testing as tm from pandas.core.indexes.datetimes import date_range test_frame = DataFrame( @@ -19,7 +18,7 @@ def test_tab_complete_ipython6_warning(ip): code = dedent( """\ - import pandas.util._testing as tm + import pandas._testing as tm s = tm.makeTimeSeries() rs = s.resample("D") """ diff --git a/pandas/tests/resample/test_time_grouper.py b/pandas/tests/resample/test_time_grouper.py index c6ad995f25eb7..3aa7765954634 100644 --- a/pandas/tests/resample/test_time_grouper.py +++ b/pandas/tests/resample/test_time_grouper.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.groupby.grouper import Grouper from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/resample/test_timedelta.py b/pandas/tests/resample/test_timedelta.py index 199fd64e9cad4..d1bcdc55cb509 100644 --- a/pandas/tests/resample/test_timedelta.py +++ b/pandas/tests/resample/test_timedelta.py @@ -2,10 +2,9 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.indexes.timedeltas import timedelta_range diff --git a/pandas/tests/reshape/merge/test_join.py b/pandas/tests/reshape/merge/test_join.py index 75a94f71d08f5..a660acb143433 100644 --- a/pandas/tests/reshape/merge/test_join.py +++ b/pandas/tests/reshape/merge/test_join.py @@ -3,10 +3,10 @@ import pytest from pandas._libs import join as libjoin -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, concat, merge +import pandas._testing as tm from pandas.tests.reshape.merge.test_merge import NGROUPS, N, get_test_data a_ = np.array diff --git a/pandas/tests/reshape/merge/test_merge.py b/pandas/tests/reshape/merge/test_merge.py index b8597dab4009b..8e0c4766056d3 100644 --- a/pandas/tests/reshape/merge/test_merge.py +++ b/pandas/tests/reshape/merge/test_merge.py @@ -6,8 +6,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_categorical_dtype, is_object_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -27,6 +25,7 @@ TimedeltaIndex, UInt64Index, ) +import pandas._testing as tm from pandas.api.types import CategoricalDtype as CDT from pandas.core.reshape.concat import concat from pandas.core.reshape.merge import MergeError, merge diff --git a/pandas/tests/reshape/merge/test_merge_asof.py b/pandas/tests/reshape/merge/test_merge_asof.py index f582a83bf7667..9ec649cd6dde0 100644 --- a/pandas/tests/reshape/merge/test_merge_asof.py +++ b/pandas/tests/reshape/merge/test_merge_asof.py @@ -4,10 +4,9 @@ import pytest import pytz -import pandas.util._testing as tm - import pandas as pd from pandas import Timedelta, merge_asof, read_csv, to_datetime +import pandas._testing as tm from pandas.core.reshape.merge import MergeError diff --git a/pandas/tests/reshape/merge/test_merge_index_as_string.py b/pandas/tests/reshape/merge/test_merge_index_as_string.py index 605eedf594b18..691f2549c0ece 100644 --- a/pandas/tests/reshape/merge/test_merge_index_as_string.py +++ b/pandas/tests/reshape/merge/test_merge_index_as_string.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/reshape/merge/test_merge_ordered.py b/pandas/tests/reshape/merge/test_merge_ordered.py index 78bccc67d9259..e0063925a03e1 100644 --- a/pandas/tests/reshape/merge/test_merge_ordered.py +++ b/pandas/tests/reshape/merge/test_merge_ordered.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, merge_ordered +import pandas._testing as tm class TestMergeOrdered: diff --git a/pandas/tests/reshape/merge/test_multi.py b/pandas/tests/reshape/merge/test_multi.py index 415d0eb37725d..1f78c1900d237 100644 --- a/pandas/tests/reshape/merge/test_multi.py +++ b/pandas/tests/reshape/merge/test_multi.py @@ -2,10 +2,9 @@ from numpy.random import randn import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm from pandas.core.reshape.concat import concat from pandas.core.reshape.merge import merge diff --git a/pandas/tests/reshape/test_concat.py b/pandas/tests/reshape/test_concat.py index 4d4aeca21e24d..6a26dc474afc8 100644 --- a/pandas/tests/reshape/test_concat.py +++ b/pandas/tests/reshape/test_concat.py @@ -11,8 +11,6 @@ from numpy.random import randn import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.dtypes import CategoricalDtype import pandas as pd @@ -29,6 +27,7 @@ isna, read_csv, ) +import pandas._testing as tm from pandas.core.construction import create_series_with_explicit_dtype from pandas.tests.extension.decimal import to_decimal diff --git a/pandas/tests/reshape/test_cut.py b/pandas/tests/reshape/test_cut.py index 4b5e74dff96e7..e52636d54ebe8 100644 --- a/pandas/tests/reshape/test_cut.py +++ b/pandas/tests/reshape/test_cut.py @@ -1,8 +1,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -21,6 +19,7 @@ timedelta_range, to_datetime, ) +import pandas._testing as tm from pandas.api.types import CategoricalDtype as CDT import pandas.core.reshape.tile as tmod diff --git a/pandas/tests/reshape/test_melt.py b/pandas/tests/reshape/test_melt.py index 5701adc2bcd53..814325844cb4c 100644 --- a/pandas/tests/reshape/test_melt.py +++ b/pandas/tests/reshape/test_melt.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, lreshape, melt, wide_to_long +import pandas._testing as tm class TestMelt: diff --git a/pandas/tests/reshape/test_pivot.py b/pandas/tests/reshape/test_pivot.py index 73c35727bdc3f..054af87b42411 100644 --- a/pandas/tests/reshape/test_pivot.py +++ b/pandas/tests/reshape/test_pivot.py @@ -4,8 +4,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -17,6 +15,7 @@ concat, date_range, ) +import pandas._testing as tm from pandas.api.types import CategoricalDtype as CDT from pandas.core.reshape.pivot import crosstab, pivot_table diff --git a/pandas/tests/reshape/test_qcut.py b/pandas/tests/reshape/test_qcut.py index 84227d6088b83..c5ca05056a306 100644 --- a/pandas/tests/reshape/test_qcut.py +++ b/pandas/tests/reshape/test_qcut.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import ( Categorical, DatetimeIndex, @@ -20,6 +18,7 @@ qcut, timedelta_range, ) +import pandas._testing as tm from pandas.api.types import CategoricalDtype as CDT from pandas.core.algorithms import quantile diff --git a/pandas/tests/reshape/test_reshape.py b/pandas/tests/reshape/test_reshape.py index 1b2f428c1975c..003c74566be71 100644 --- a/pandas/tests/reshape/test_reshape.py +++ b/pandas/tests/reshape/test_reshape.py @@ -3,12 +3,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_integer_dtype import pandas as pd from pandas import Categorical, DataFrame, Index, Series, get_dummies +import pandas._testing as tm from pandas.core.arrays.sparse import SparseArray, SparseDtype diff --git a/pandas/tests/reshape/test_union_categoricals.py b/pandas/tests/reshape/test_union_categoricals.py index 24ea86185b8ee..a503173bd74b1 100644 --- a/pandas/tests/reshape/test_union_categoricals.py +++ b/pandas/tests/reshape/test_union_categoricals.py @@ -1,12 +1,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.concat import union_categoricals import pandas as pd from pandas import Categorical, CategoricalIndex, Series +import pandas._testing as tm class TestUnionCategoricals: diff --git a/pandas/tests/reshape/test_util.py b/pandas/tests/reshape/test_util.py index 25719f68807f8..cd518dda4edbf 100644 --- a/pandas/tests/reshape/test_util.py +++ b/pandas/tests/reshape/test_util.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Index, date_range +import pandas._testing as tm from pandas.core.reshape.util import cartesian_product diff --git a/pandas/tests/scalar/period/test_period.py b/pandas/tests/scalar/period/test_period.py index 4b570d51d89aa..6af9c9884589c 100644 --- a/pandas/tests/scalar/period/test_period.py +++ b/pandas/tests/scalar/period/test_period.py @@ -13,10 +13,10 @@ from pandas._libs.tslibs.period import IncompatibleFrequency from pandas._libs.tslibs.timezones import dateutil_gettz, maybe_get_tz from pandas.compat.numpy import np_datetime64_compat -import pandas.util._testing as tm import pandas as pd from pandas import NaT, Period, Timedelta, Timestamp, offsets +import pandas._testing as tm class TestPeriodConstruction: diff --git a/pandas/tests/scalar/test_na_scalar.py b/pandas/tests/scalar/test_na_scalar.py index 135a8bb86913c..384bf171738bc 100644 --- a/pandas/tests/scalar/test_na_scalar.py +++ b/pandas/tests/scalar/test_na_scalar.py @@ -2,11 +2,11 @@ import pytest from pandas._libs.missing import NA -import pandas.util._testing as tm from pandas.core.dtypes.common import is_scalar import pandas as pd +import pandas._testing as tm def test_singleton(): diff --git a/pandas/tests/scalar/test_nat.py b/pandas/tests/scalar/test_nat.py index ea5301a65ed95..b1594dee9bc34 100644 --- a/pandas/tests/scalar/test_nat.py +++ b/pandas/tests/scalar/test_nat.py @@ -7,7 +7,6 @@ from pandas._libs.tslibs import iNaT import pandas.compat as compat -import pandas.util._testing as tm from pandas.core.dtypes.common import is_datetime64_any_dtype @@ -22,6 +21,7 @@ Timestamp, isna, ) +import pandas._testing as tm from pandas.core.arrays import DatetimeArray, PeriodArray, TimedeltaArray from pandas.core.ops import roperator diff --git a/pandas/tests/scalar/timedelta/test_arithmetic.py b/pandas/tests/scalar/timedelta/test_arithmetic.py index c2a3810d64d31..3764d9b7548fc 100644 --- a/pandas/tests/scalar/timedelta/test_arithmetic.py +++ b/pandas/tests/scalar/timedelta/test_arithmetic.py @@ -7,10 +7,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import NaT, Timedelta, Timestamp, offsets +import pandas._testing as tm from pandas.core import ops diff --git a/pandas/tests/scalar/timedelta/test_timedelta.py b/pandas/tests/scalar/timedelta/test_timedelta.py index f7170ea98e4dd..e1d965bbb14e9 100644 --- a/pandas/tests/scalar/timedelta/test_timedelta.py +++ b/pandas/tests/scalar/timedelta/test_timedelta.py @@ -5,10 +5,10 @@ import pytest from pandas._libs.tslibs import NaT, Timestamp, iNaT -import pandas.util._testing as tm import pandas as pd from pandas import Series, Timedelta, TimedeltaIndex, timedelta_range, to_timedelta +import pandas._testing as tm class TestTimedeltaArithmetic: diff --git a/pandas/tests/scalar/timestamp/test_timestamp.py b/pandas/tests/scalar/timestamp/test_timestamp.py index a84b1ed97ad31..18a8d4b4ad708 100644 --- a/pandas/tests/scalar/timestamp/test_timestamp.py +++ b/pandas/tests/scalar/timestamp/test_timestamp.py @@ -17,9 +17,9 @@ from pandas.compat.numpy import np_datetime64_compat from pandas.errors import OutOfBoundsDatetime import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import NaT, Period, Timedelta, Timestamp +import pandas._testing as tm from pandas.tseries import offsets diff --git a/pandas/tests/scalar/timestamp/test_unary_ops.py b/pandas/tests/scalar/timestamp/test_unary_ops.py index bac7df8727264..65066fd0099ba 100644 --- a/pandas/tests/scalar/timestamp/test_unary_ops.py +++ b/pandas/tests/scalar/timestamp/test_unary_ops.py @@ -8,9 +8,9 @@ from pandas._libs.tslibs import conversion from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import NaT, Timestamp +import pandas._testing as tm from pandas.tseries.frequencies import to_offset diff --git a/pandas/tests/series/conftest.py b/pandas/tests/series/conftest.py index e131b5307aea1..ff0b0c71f88b0 100644 --- a/pandas/tests/series/conftest.py +++ b/pandas/tests/series/conftest.py @@ -1,6 +1,6 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm @pytest.fixture diff --git a/pandas/tests/series/indexing/test_alter_index.py b/pandas/tests/series/indexing/test_alter_index.py index fd7916e60644c..47f40e24e1637 100644 --- a/pandas/tests/series/indexing/test_alter_index.py +++ b/pandas/tests/series/indexing/test_alter_index.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, Series, date_range, isna +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/series/indexing/test_boolean.py b/pandas/tests/series/indexing/test_boolean.py index ca7b9125c7ebd..d8abb87d1f173 100644 --- a/pandas/tests/series/indexing/test_boolean.py +++ b/pandas/tests/series/indexing/test_boolean.py @@ -1,12 +1,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_integer import pandas as pd from pandas import Index, Series, Timestamp, date_range, isna +import pandas._testing as tm from pandas.core.indexing import IndexingError from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/indexing/test_callable.py b/pandas/tests/series/indexing/test_callable.py index ab0d4f87fa779..fe575cf146641 100644 --- a/pandas/tests/series/indexing/test_callable.py +++ b/pandas/tests/series/indexing/test_callable.py @@ -1,6 +1,5 @@ -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm def test_getitem_callable(): diff --git a/pandas/tests/series/indexing/test_datetime.py b/pandas/tests/series/indexing/test_datetime.py index 791fcb24e48f9..15ff5f6b343d1 100644 --- a/pandas/tests/series/indexing/test_datetime.py +++ b/pandas/tests/series/indexing/test_datetime.py @@ -5,10 +5,10 @@ from pandas._libs import iNaT import pandas._libs.index as _index -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, DatetimeIndex, NaT, Series, Timestamp, date_range +import pandas._testing as tm """ diff --git a/pandas/tests/series/indexing/test_iloc.py b/pandas/tests/series/indexing/test_iloc.py index 914037571ba7c..f276eb5b0b23d 100644 --- a/pandas/tests/series/indexing/test_iloc.py +++ b/pandas/tests/series/indexing/test_iloc.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import Series +import pandas._testing as tm def test_iloc(): diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py index 4f287ef0ec8e5..e62963bcfb5f9 100644 --- a/pandas/tests/series/indexing/test_indexing.py +++ b/pandas/tests/series/indexing/test_indexing.py @@ -5,12 +5,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_scalar import pandas as pd from pandas import Categorical, DataFrame, MultiIndex, Series, Timedelta, Timestamp +import pandas._testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/indexing/test_loc.py b/pandas/tests/series/indexing/test_loc.py index 0a1276ba09ab9..7d6b6c78cc492 100644 --- a/pandas/tests/series/indexing/test_loc.py +++ b/pandas/tests/series/indexing/test_loc.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series, Timestamp +import pandas._testing as tm @pytest.mark.parametrize("val,expected", [(2 ** 63 - 1, 3), (2 ** 63, 4)]) diff --git a/pandas/tests/series/indexing/test_numeric.py b/pandas/tests/series/indexing/test_numeric.py index 144635a35ea58..ce0d04ff99077 100644 --- a/pandas/tests/series/indexing/test_numeric.py +++ b/pandas/tests/series/indexing/test_numeric.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series +import pandas._testing as tm def test_get(): diff --git a/pandas/tests/series/methods/test_append.py b/pandas/tests/series/methods/test_append.py index 9a554e49e96bf..dc0fca4bba067 100644 --- a/pandas/tests/series/methods/test_append.py +++ b/pandas/tests/series/methods/test_append.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, DatetimeIndex, Series, date_range +import pandas._testing as tm class TestSeriesAppend: diff --git a/pandas/tests/series/methods/test_argsort.py b/pandas/tests/series/methods/test_argsort.py index 2abab4b6f8a79..1fc98ded0d3d2 100644 --- a/pandas/tests/series/methods/test_argsort.py +++ b/pandas/tests/series/methods/test_argsort.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Series, Timestamp, isna +import pandas._testing as tm class TestSeriesArgsort: diff --git a/pandas/tests/series/methods/test_asof.py b/pandas/tests/series/methods/test_asof.py index e832ca471a146..b121efd202744 100644 --- a/pandas/tests/series/methods/test_asof.py +++ b/pandas/tests/series/methods/test_asof.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Series, Timestamp, date_range, isna, notna, offsets +import pandas._testing as tm class TestSeriesAsof: diff --git a/pandas/tests/series/methods/test_clip.py b/pandas/tests/series/methods/test_clip.py index 99252fc2f76db..37764d3b82c2d 100644 --- a/pandas/tests/series/methods/test_clip.py +++ b/pandas/tests/series/methods/test_clip.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series, Timestamp, isna, notna +import pandas._testing as tm class TestSeriesClip: diff --git a/pandas/tests/series/methods/test_count.py b/pandas/tests/series/methods/test_count.py index 74bf29a8f83b1..1ca48eeb7c441 100644 --- a/pandas/tests/series/methods/test_count.py +++ b/pandas/tests/series/methods/test_count.py @@ -1,9 +1,8 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, MultiIndex, Series +import pandas._testing as tm class TestSeriesCount: diff --git a/pandas/tests/series/methods/test_cov_corr.py b/pandas/tests/series/methods/test_cov_corr.py index 41f198671db3a..1f6033d435323 100644 --- a/pandas/tests/series/methods/test_cov_corr.py +++ b/pandas/tests/series/methods/test_cov_corr.py @@ -2,10 +2,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import Series, isna +import pandas._testing as tm class TestSeriesCov: diff --git a/pandas/tests/series/methods/test_describe.py b/pandas/tests/series/methods/test_describe.py index f8f207eb4d049..b147a04b11090 100644 --- a/pandas/tests/series/methods/test_describe.py +++ b/pandas/tests/series/methods/test_describe.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import Series, Timestamp, date_range +import pandas._testing as tm class TestSeriesDescribe: diff --git a/pandas/tests/series/methods/test_diff.py b/pandas/tests/series/methods/test_diff.py index b4d97a57eb94b..033f75e95f11b 100644 --- a/pandas/tests/series/methods/test_diff.py +++ b/pandas/tests/series/methods/test_diff.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Series, TimedeltaIndex, date_range +import pandas._testing as tm class TestSeriesDiff: diff --git a/pandas/tests/series/methods/test_drop_duplicates.py b/pandas/tests/series/methods/test_drop_duplicates.py index 7626738145667..2d052505d5ecc 100644 --- a/pandas/tests/series/methods/test_drop_duplicates.py +++ b/pandas/tests/series/methods/test_drop_duplicates.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, Series +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/series/methods/test_duplicated.py b/pandas/tests/series/methods/test_duplicated.py index d391c92f4274b..5cc297913e851 100644 --- a/pandas/tests/series/methods/test_duplicated.py +++ b/pandas/tests/series/methods/test_duplicated.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Series +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/series/methods/test_explode.py b/pandas/tests/series/methods/test_explode.py index 41904d3612d74..979199e1efc62 100644 --- a/pandas/tests/series/methods/test_explode.py +++ b/pandas/tests/series/methods/test_explode.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm def test_basic(): diff --git a/pandas/tests/series/methods/test_isin.py b/pandas/tests/series/methods/test_isin.py index c4ca7cca1f9e3..ca93e989ba6b5 100644 --- a/pandas/tests/series/methods/test_isin.py +++ b/pandas/tests/series/methods/test_isin.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series, date_range +import pandas._testing as tm class TestSeriesIsIn: diff --git a/pandas/tests/series/methods/test_nlargest.py b/pandas/tests/series/methods/test_nlargest.py index 32ebbc6315c13..a029965c7394f 100644 --- a/pandas/tests/series/methods/test_nlargest.py +++ b/pandas/tests/series/methods/test_nlargest.py @@ -7,10 +7,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series +import pandas._testing as tm main_dtypes = [ "datetime", diff --git a/pandas/tests/series/methods/test_pct_change.py b/pandas/tests/series/methods/test_pct_change.py index 5c2a282965e9d..7bc8e1a0428d6 100644 --- a/pandas/tests/series/methods/test_pct_change.py +++ b/pandas/tests/series/methods/test_pct_change.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Series, date_range +import pandas._testing as tm class TestSeriesPctChange: diff --git a/pandas/tests/series/methods/test_quantile.py b/pandas/tests/series/methods/test_quantile.py index b44ef5028fb45..79f50afca658f 100644 --- a/pandas/tests/series/methods/test_quantile.py +++ b/pandas/tests/series/methods/test_quantile.py @@ -1,12 +1,11 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_integer import pandas as pd from pandas import Index, Series +import pandas._testing as tm from pandas.core.indexes.datetimes import Timestamp diff --git a/pandas/tests/series/methods/test_rank.py b/pandas/tests/series/methods/test_rank.py index a33cadc30b7e2..1d538e06ccc4e 100644 --- a/pandas/tests/series/methods/test_rank.py +++ b/pandas/tests/series/methods/test_rank.py @@ -6,9 +6,9 @@ from pandas._libs.algos import Infinity, NegInfinity from pandas._libs.tslib import iNaT import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import NaT, Series, Timestamp, date_range +import pandas._testing as tm from pandas.api.types import CategoricalDtype diff --git a/pandas/tests/series/methods/test_replace.py b/pandas/tests/series/methods/test_replace.py index 135e93fe35557..b20baa2836363 100644 --- a/pandas/tests/series/methods/test_replace.py +++ b/pandas/tests/series/methods/test_replace.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm class TestSeriesReplace: diff --git a/pandas/tests/series/methods/test_round.py b/pandas/tests/series/methods/test_round.py index e20aa32e26710..7f0711a0f30d7 100644 --- a/pandas/tests/series/methods/test_round.py +++ b/pandas/tests/series/methods/test_round.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Series +import pandas._testing as tm class TestSeriesRound: diff --git a/pandas/tests/series/methods/test_searchsorted.py b/pandas/tests/series/methods/test_searchsorted.py index 90754586851ba..fd6c6f74a9136 100644 --- a/pandas/tests/series/methods/test_searchsorted.py +++ b/pandas/tests/series/methods/test_searchsorted.py @@ -1,8 +1,7 @@ import numpy as np -import pandas.util._testing as tm - from pandas import Series, Timestamp, date_range +import pandas._testing as tm from pandas.api.types import is_scalar diff --git a/pandas/tests/series/methods/test_shift.py b/pandas/tests/series/methods/test_shift.py index a965a62c7b9b2..8256e2f33b936 100644 --- a/pandas/tests/series/methods/test_shift.py +++ b/pandas/tests/series/methods/test_shift.py @@ -2,7 +2,6 @@ import pytest from pandas.errors import NullFrequencyError -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -14,6 +13,7 @@ date_range, offsets, ) +import pandas._testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/methods/test_sort_index.py b/pandas/tests/series/methods/test_sort_index.py index 091d9f1b0f456..10db286be648b 100644 --- a/pandas/tests/series/methods/test_sort_index.py +++ b/pandas/tests/series/methods/test_sort_index.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import IntervalIndex, MultiIndex, Series +import pandas._testing as tm class TestSeriesSortIndex: diff --git a/pandas/tests/series/methods/test_sort_values.py b/pandas/tests/series/methods/test_sort_values.py index a100672aae73f..1ced9cab0791e 100644 --- a/pandas/tests/series/methods/test_sort_values.py +++ b/pandas/tests/series/methods/test_sort_values.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, DataFrame, Series +import pandas._testing as tm class TestSeriesSortValues: diff --git a/pandas/tests/series/methods/test_to_dict.py b/pandas/tests/series/methods/test_to_dict.py index 51aeb2245d07a..2fbf3e8d39cf3 100644 --- a/pandas/tests/series/methods/test_to_dict.py +++ b/pandas/tests/series/methods/test_to_dict.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - from pandas import Series +import pandas._testing as tm class TestSeriesToDict: diff --git a/pandas/tests/series/methods/test_truncate.py b/pandas/tests/series/methods/test_truncate.py index 02b4033dcb5b0..d4e2890ed8bf0 100644 --- a/pandas/tests/series/methods/test_truncate.py +++ b/pandas/tests/series/methods/test_truncate.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm from pandas.tseries.offsets import BDay diff --git a/pandas/tests/series/methods/test_value_counts.py b/pandas/tests/series/methods/test_value_counts.py index 1cacfac84d19b..fdb35befeb0c2 100644 --- a/pandas/tests/series/methods/test_value_counts.py +++ b/pandas/tests/series/methods/test_value_counts.py @@ -1,9 +1,8 @@ import numpy as np -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, CategoricalIndex, Series +import pandas._testing as tm class TestSeriesValueCounts: diff --git a/pandas/tests/series/test_alter_axes.py b/pandas/tests/series/test_alter_axes.py index a7af095f8367e..62ff0a075d2ca 100644 --- a/pandas/tests/series/test_alter_axes.py +++ b/pandas/tests/series/test_alter_axes.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, RangeIndex, Series +import pandas._testing as tm class TestSeriesAlterAxes: diff --git a/pandas/tests/series/test_analytics.py b/pandas/tests/series/test_analytics.py index a6f964af9683e..c29bd3ea0cb7d 100644 --- a/pandas/tests/series/test_analytics.py +++ b/pandas/tests/series/test_analytics.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, MultiIndex, Series +import pandas._testing as tm class TestSeriesAnalytics: diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index 0c495e580dc5e..32587c6afee73 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -5,8 +5,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -21,6 +19,7 @@ period_range, timedelta_range, ) +import pandas._testing as tm from pandas.core.arrays import PeriodArray import pandas.io.formats.printing as printing diff --git a/pandas/tests/series/test_apply.py b/pandas/tests/series/test_apply.py index 5033f9130c769..a997e2e0a3ab9 100644 --- a/pandas/tests/series/test_apply.py +++ b/pandas/tests/series/test_apply.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, isna +import pandas._testing as tm from pandas.conftest import _get_cython_table_params from pandas.core.base import SpecificationError diff --git a/pandas/tests/series/test_arithmetic.py b/pandas/tests/series/test_arithmetic.py index 582d19148fe47..edb1d2d98fa2e 100644 --- a/pandas/tests/series/test_arithmetic.py +++ b/pandas/tests/series/test_arithmetic.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Series +import pandas._testing as tm from pandas.core.indexes.period import IncompatibleFrequency diff --git a/pandas/tests/series/test_combine_concat.py b/pandas/tests/series/test_combine_concat.py index dd2a61a0b6f84..239353d3955b4 100644 --- a/pandas/tests/series/test_combine_concat.py +++ b/pandas/tests/series/test_combine_concat.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm class TestSeriesCombine: diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index 3cfef79c3a3f2..a36b1de2ba04e 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -7,7 +7,6 @@ from pandas._libs import lib from pandas._libs.tslib import iNaT -import pandas.util._testing as tm from pandas.core.dtypes.common import is_categorical_dtype, is_datetime64tz_dtype from pandas.core.dtypes.dtypes import CategoricalDtype @@ -27,6 +26,7 @@ period_range, timedelta_range, ) +import pandas._testing as tm from pandas.core.arrays import period_array diff --git a/pandas/tests/series/test_cumulative.py b/pandas/tests/series/test_cumulative.py index 1582480b9c536..885b5bf0476f2 100644 --- a/pandas/tests/series/test_cumulative.py +++ b/pandas/tests/series/test_cumulative.py @@ -10,9 +10,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm def _check_accum_op(name, series, check_dtype=True): diff --git a/pandas/tests/series/test_datetime_values.py b/pandas/tests/series/test_datetime_values.py index f810495cde4f1..b8be4ea137e3d 100644 --- a/pandas/tests/series/test_datetime_values.py +++ b/pandas/tests/series/test_datetime_values.py @@ -8,7 +8,6 @@ import pytz from pandas._libs.tslibs.timezones import maybe_get_tz -import pandas.util._testing as tm from pandas.core.dtypes.common import is_integer_dtype, is_list_like @@ -25,6 +24,7 @@ period_range, timedelta_range, ) +import pandas._testing as tm from pandas.core.arrays import PeriodArray import pandas.core.common as com diff --git a/pandas/tests/series/test_dtypes.py b/pandas/tests/series/test_dtypes.py index b3a5594b664cb..4bf2f1bd82eff 100644 --- a/pandas/tests/series/test_dtypes.py +++ b/pandas/tests/series/test_dtypes.py @@ -7,7 +7,6 @@ import pytest from pandas._libs.tslibs import iNaT -import pandas.util._testing as tm from pandas.core.dtypes.dtypes import CategoricalDtype @@ -21,6 +20,7 @@ Timestamp, date_range, ) +import pandas._testing as tm class TestSeriesDtypes: diff --git a/pandas/tests/series/test_duplicates.py b/pandas/tests/series/test_duplicates.py index 9888ee2b9bfe0..3513db6177951 100644 --- a/pandas/tests/series/test_duplicates.py +++ b/pandas/tests/series/test_duplicates.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, Series +import pandas._testing as tm from pandas.core.construction import create_series_with_explicit_dtype diff --git a/pandas/tests/series/test_internals.py b/pandas/tests/series/test_internals.py index 5aab3d05d350c..4c817ed2e2d59 100644 --- a/pandas/tests/series/test_internals.py +++ b/pandas/tests/series/test_internals.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import NaT, Series, Timestamp +import pandas._testing as tm from pandas.core.internals.blocks import IntBlock diff --git a/pandas/tests/series/test_io.py b/pandas/tests/series/test_io.py index a790808e5d2c5..510c11a51ca38 100644 --- a/pandas/tests/series/test_io.py +++ b/pandas/tests/series/test_io.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.io.common import get_handle diff --git a/pandas/tests/series/test_missing.py b/pandas/tests/series/test_missing.py index 5d5fc7f05404e..128aea84fc967 100644 --- a/pandas/tests/series/test_missing.py +++ b/pandas/tests/series/test_missing.py @@ -6,7 +6,6 @@ from pandas._libs.tslib import iNaT import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -22,6 +21,7 @@ date_range, isna, ) +import pandas._testing as tm def _simple_ts(start, end, freq="D"): diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py index b2555e4f07949..bdd9f92d92d3f 100644 --- a/pandas/tests/series/test_operators.py +++ b/pandas/tests/series/test_operators.py @@ -4,10 +4,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import Categorical, DataFrame, Index, Series, bdate_range, date_range, isna +import pandas._testing as tm from pandas.core import ops import pandas.core.nanops as nanops diff --git a/pandas/tests/series/test_period.py b/pandas/tests/series/test_period.py index 7cdaedf991620..03fee389542e3 100644 --- a/pandas/tests/series/test_period.py +++ b/pandas/tests/series/test_period.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Period, Series, period_range +import pandas._testing as tm from pandas.core.arrays import PeriodArray diff --git a/pandas/tests/series/test_repr.py b/pandas/tests/series/test_repr.py index 2b3d56e064ac9..64a8c4569406e 100644 --- a/pandas/tests/series/test_repr.py +++ b/pandas/tests/series/test_repr.py @@ -3,8 +3,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import ( Categorical, @@ -17,6 +15,7 @@ period_range, timedelta_range, ) +import pandas._testing as tm class TestSeriesRepr: diff --git a/pandas/tests/series/test_subclass.py b/pandas/tests/series/test_subclass.py index 06b38bd3c5058..73247bbf8b3d6 100644 --- a/pandas/tests/series/test_subclass.py +++ b/pandas/tests/series/test_subclass.py @@ -1,4 +1,4 @@ -import pandas.util._testing as tm +import pandas._testing as tm class TestSeriesSubclassing: diff --git a/pandas/tests/series/test_timeseries.py b/pandas/tests/series/test_timeseries.py index 2cdd5d102fca9..d7468667b4a16 100644 --- a/pandas/tests/series/test_timeseries.py +++ b/pandas/tests/series/test_timeseries.py @@ -8,7 +8,6 @@ from pandas._libs.tslib import iNaT from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import ( @@ -22,6 +21,7 @@ timedelta_range, to_datetime, ) +import pandas._testing as tm from pandas.tseries.offsets import BDay, BMonthEnd diff --git a/pandas/tests/series/test_timezones.py b/pandas/tests/series/test_timezones.py index 22ebfb681de18..a363f927d10a9 100644 --- a/pandas/tests/series/test_timezones.py +++ b/pandas/tests/series/test_timezones.py @@ -9,9 +9,9 @@ import pytz from pandas._libs.tslibs import conversion, timezones -import pandas.util._testing as tm from pandas import DatetimeIndex, Index, NaT, Series, Timestamp +import pandas._testing as tm from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/series/test_ufunc.py b/pandas/tests/series/test_ufunc.py index 0eded2c2195e4..f3c3dd876d87a 100644 --- a/pandas/tests/series/test_ufunc.py +++ b/pandas/tests/series/test_ufunc.py @@ -4,9 +4,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm UNARY_UFUNCS = [np.positive, np.floor, np.exp] BINARY_UFUNCS = [np.add, np.logaddexp] # dunder op diff --git a/pandas/tests/test_algos.py b/pandas/tests/test_algos.py index b20d430146e68..2b46f86d49c5e 100644 --- a/pandas/tests/test_algos.py +++ b/pandas/tests/test_algos.py @@ -9,7 +9,6 @@ from pandas._libs import algos as libalgos, groupby as libgroupby, hashtable as ht from pandas.compat.numpy import np_array_datetime64_compat import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.common import ( is_bool_dtype, @@ -31,6 +30,7 @@ Timestamp, compat, ) +import pandas._testing as tm from pandas.conftest import BYTES_DTYPES, STRING_DTYPES import pandas.core.algorithms as algos from pandas.core.arrays import DatetimeArray diff --git a/pandas/tests/test_downstream.py b/pandas/tests/test_downstream.py index 91ff2a9f5cccd..ee006233c4c1b 100644 --- a/pandas/tests/test_downstream.py +++ b/pandas/tests/test_downstream.py @@ -8,9 +8,8 @@ import numpy as np # noqa import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm def import_module(name): diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py index d694eb3463416..fadab5d821470 100644 --- a/pandas/tests/test_expressions.py +++ b/pandas/tests/test_expressions.py @@ -5,8 +5,7 @@ from numpy.random import randn import pytest -import pandas.util._testing as tm - +import pandas._testing as tm from pandas.core.api import DataFrame from pandas.core.computation import expressions as expr diff --git a/pandas/tests/test_join.py b/pandas/tests/test_join.py index 053305ee882d6..129dc275c4d5a 100644 --- a/pandas/tests/test_join.py +++ b/pandas/tests/test_join.py @@ -2,9 +2,9 @@ import pytest from pandas._libs import join as _join -import pandas.util._testing as tm from pandas import Categorical, DataFrame, Index, merge +import pandas._testing as tm class TestIndexer: diff --git a/pandas/tests/test_lib.py b/pandas/tests/test_lib.py index fa79c1f5cc0fd..f839aa198d03f 100644 --- a/pandas/tests/test_lib.py +++ b/pandas/tests/test_lib.py @@ -2,9 +2,9 @@ import pytest from pandas._libs import lib, writers as libwriters -import pandas.util._testing as tm from pandas import Index +import pandas._testing as tm class TestMisc: diff --git a/pandas/tests/test_multilevel.py b/pandas/tests/test_multilevel.py index a315760dce213..2e8fe0c266f6b 100644 --- a/pandas/tests/test_multilevel.py +++ b/pandas/tests/test_multilevel.py @@ -8,12 +8,11 @@ import pytest import pytz -import pandas.util._testing as tm - from pandas.core.dtypes.common import is_float_dtype, is_integer_dtype import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, isna +import pandas._testing as tm AGG_FUNCTIONS = [ "sum", diff --git a/pandas/tests/test_nanops.py b/pandas/tests/test_nanops.py index 410e3484a6640..b2bccbeb82c27 100644 --- a/pandas/tests/test_nanops.py +++ b/pandas/tests/test_nanops.py @@ -6,12 +6,12 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas.core.dtypes.common import is_integer_dtype import pandas as pd from pandas import Series, isna +import pandas._testing as tm from pandas.core.arrays import DatetimeArray import pandas.core.nanops as nanops diff --git a/pandas/tests/test_optional_dependency.py b/pandas/tests/test_optional_dependency.py index 41435b8839c07..ce527214e55e7 100644 --- a/pandas/tests/test_optional_dependency.py +++ b/pandas/tests/test_optional_dependency.py @@ -4,7 +4,8 @@ import pytest from pandas.compat._optional import VERSIONS, import_optional_dependency -import pandas.util._testing as tm + +import pandas._testing as tm def test_import_optional(): diff --git a/pandas/tests/test_register_accessor.py b/pandas/tests/test_register_accessor.py index dffc7a031d547..08a5581886522 100644 --- a/pandas/tests/test_register_accessor.py +++ b/pandas/tests/test_register_accessor.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - import pandas as pd +import pandas._testing as tm @contextlib.contextmanager diff --git a/pandas/tests/test_sorting.py b/pandas/tests/test_sorting.py index 7c277d945627d..98297474243e4 100644 --- a/pandas/tests/test_sorting.py +++ b/pandas/tests/test_sorting.py @@ -5,9 +5,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, MultiIndex, Series, array, concat, merge +import pandas._testing as tm from pandas.core.algorithms import safe_sort import pandas.core.common as com from pandas.core.sorting import ( diff --git a/pandas/tests/test_strings.py b/pandas/tests/test_strings.py index 796f7aeb31946..7f3375070d7d9 100644 --- a/pandas/tests/test_strings.py +++ b/pandas/tests/test_strings.py @@ -6,9 +6,9 @@ import pytest from pandas._libs import lib -import pandas.util._testing as tm from pandas import DataFrame, Index, MultiIndex, Series, concat, isna, notna +import pandas._testing as tm import pandas.core.strings as strings diff --git a/pandas/tests/test_take.py b/pandas/tests/test_take.py index 4511637055627..465296a6f9e51 100644 --- a/pandas/tests/test_take.py +++ b/pandas/tests/test_take.py @@ -5,8 +5,8 @@ import pytest from pandas._libs.tslib import iNaT -import pandas.util._testing as tm +import pandas._testing as tm import pandas.core.algorithms as algos diff --git a/pandas/tests/tools/test_numeric.py b/pandas/tests/tools/test_numeric.py index bc46bde8779e0..2fd39d5a7b703 100644 --- a/pandas/tests/tools/test_numeric.py +++ b/pandas/tests/tools/test_numeric.py @@ -4,10 +4,9 @@ from numpy import iinfo import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, Series, to_numeric +import pandas._testing as tm @pytest.fixture(params=[None, "ignore", "raise", "coerce"]) diff --git a/pandas/tests/tseries/frequencies/test_inference.py b/pandas/tests/tseries/frequencies/test_inference.py index babd9117e3be1..c4660417599a8 100644 --- a/pandas/tests/tseries/frequencies/test_inference.py +++ b/pandas/tests/tseries/frequencies/test_inference.py @@ -6,9 +6,9 @@ from pandas._libs.tslibs.ccalendar import DAYS, MONTHS from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG from pandas.compat import is_platform_windows -import pandas.util._testing as tm from pandas import DatetimeIndex, Index, Series, Timestamp, date_range, period_range +import pandas._testing as tm from pandas.core.tools.datetimes import to_datetime import pandas.tseries.frequencies as frequencies diff --git a/pandas/tests/tseries/holiday/test_calendar.py b/pandas/tests/tseries/holiday/test_calendar.py index becb7ce8cf414..5b4a7c74b1af1 100644 --- a/pandas/tests/tseries/holiday/test_calendar.py +++ b/pandas/tests/tseries/holiday/test_calendar.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - from pandas import DatetimeIndex, offsets, to_datetime +import pandas._testing as tm from pandas.tseries.holiday import ( AbstractHolidayCalendar, diff --git a/pandas/tests/tseries/holiday/test_holiday.py b/pandas/tests/tseries/holiday/test_holiday.py index 927266a3efc2a..a2c146dbd65e8 100644 --- a/pandas/tests/tseries/holiday/test_holiday.py +++ b/pandas/tests/tseries/holiday/test_holiday.py @@ -3,7 +3,7 @@ import pytest from pytz import utc -import pandas.util._testing as tm +import pandas._testing as tm from pandas.tseries.holiday import ( MO, diff --git a/pandas/tests/tseries/offsets/test_fiscal.py b/pandas/tests/tseries/offsets/test_fiscal.py index ae083ddfe7b60..5686119593e18 100644 --- a/pandas/tests/tseries/offsets/test_fiscal.py +++ b/pandas/tests/tseries/offsets/test_fiscal.py @@ -7,9 +7,9 @@ import pytest from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG -import pandas.util._testing as tm from pandas import Timestamp +import pandas._testing as tm from pandas.tseries.frequencies import get_offset from pandas.tseries.offsets import FY5253, FY5253Quarter diff --git a/pandas/tests/tseries/offsets/test_offsets.py b/pandas/tests/tseries/offsets/test_offsets.py index 3e54cd01d6f58..e98699f6b4ec9 100644 --- a/pandas/tests/tseries/offsets/test_offsets.py +++ b/pandas/tests/tseries/offsets/test_offsets.py @@ -21,8 +21,8 @@ import pandas.compat as compat from pandas.compat.numpy import np_datetime64_compat from pandas.errors import PerformanceWarning -import pandas.util._testing as tm +import pandas._testing as tm from pandas.core.indexes.datetimes import DatetimeIndex, _to_M8, date_range from pandas.core.series import Series diff --git a/pandas/tests/tseries/offsets/test_ticks.py b/pandas/tests/tseries/offsets/test_ticks.py index 993737b2c50d9..297e5c3178379 100644 --- a/pandas/tests/tseries/offsets/test_ticks.py +++ b/pandas/tests/tseries/offsets/test_ticks.py @@ -7,9 +7,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Timedelta, Timestamp +import pandas._testing as tm from pandas.tseries import offsets from pandas.tseries.offsets import Hour, Micro, Milli, Minute, Nano, Second diff --git a/pandas/tests/tslibs/test_array_to_datetime.py b/pandas/tests/tslibs/test_array_to_datetime.py index 30743c349b187..a40fcd725d604 100644 --- a/pandas/tests/tslibs/test_array_to_datetime.py +++ b/pandas/tests/tslibs/test_array_to_datetime.py @@ -7,9 +7,9 @@ from pandas._libs import iNaT, tslib from pandas.compat.numpy import np_array_datetime64_compat -import pandas.util._testing as tm from pandas import Timestamp +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/tslibs/test_conversion.py b/pandas/tests/tslibs/test_conversion.py index cd6bbf512218e..2beeae85de683 100644 --- a/pandas/tests/tslibs/test_conversion.py +++ b/pandas/tests/tslibs/test_conversion.py @@ -6,9 +6,9 @@ from pandas._libs.tslib import iNaT from pandas._libs.tslibs import conversion, timezones, tzconversion -import pandas.util._testing as tm from pandas import Timestamp, date_range +import pandas._testing as tm def _compare_utc_to_local(tz_didx): diff --git a/pandas/tests/tslibs/test_fields.py b/pandas/tests/tslibs/test_fields.py index 92497c0506afd..943f4207df543 100644 --- a/pandas/tests/tslibs/test_fields.py +++ b/pandas/tests/tslibs/test_fields.py @@ -1,7 +1,8 @@ import numpy as np from pandas._libs.tslibs import fields -import pandas.util._testing as tm + +import pandas._testing as tm def test_fields_readonly(): diff --git a/pandas/tests/tslibs/test_parsing.py b/pandas/tests/tslibs/test_parsing.py index 85f5b12563a61..36f7ada7326bf 100644 --- a/pandas/tests/tslibs/test_parsing.py +++ b/pandas/tests/tslibs/test_parsing.py @@ -10,7 +10,8 @@ from pandas._libs.tslibs import parsing from pandas._libs.tslibs.parsing import parse_time_string import pandas.util._test_decorators as td -import pandas.util._testing as tm + +import pandas._testing as tm def test_parse_time_string(): diff --git a/pandas/tests/util/test_assert_almost_equal.py b/pandas/tests/util/test_assert_almost_equal.py index e43fed6aac3d7..ffa49f6ba442b 100644 --- a/pandas/tests/util/test_assert_almost_equal.py +++ b/pandas/tests/util/test_assert_almost_equal.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, Series, Timestamp +import pandas._testing as tm def _assert_almost_equal_both(a, b, **kwargs): diff --git a/pandas/tests/util/test_assert_categorical_equal.py b/pandas/tests/util/test_assert_categorical_equal.py index 7d939c3d9a76d..6ae16cee89ee3 100644 --- a/pandas/tests/util/test_assert_categorical_equal.py +++ b/pandas/tests/util/test_assert_categorical_equal.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - from pandas import Categorical +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/util/test_assert_extension_array_equal.py b/pandas/tests/util/test_assert_extension_array_equal.py index c9da990be6360..320d5a4de9d08 100644 --- a/pandas/tests/util/test_assert_extension_array_equal.py +++ b/pandas/tests/util/test_assert_extension_array_equal.py @@ -1,8 +1,7 @@ import numpy as np import pytest -import pandas.util._testing as tm - +import pandas._testing as tm from pandas.core.arrays.sparse import SparseArray diff --git a/pandas/tests/util/test_assert_frame_equal.py b/pandas/tests/util/test_assert_frame_equal.py index ad98dfa361282..0aa450f5f96d1 100644 --- a/pandas/tests/util/test_assert_frame_equal.py +++ b/pandas/tests/util/test_assert_frame_equal.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - from pandas import DataFrame +import pandas._testing as tm @pytest.fixture(params=[True, False]) diff --git a/pandas/tests/util/test_assert_index_equal.py b/pandas/tests/util/test_assert_index_equal.py index 282b1552e369e..9257e52fe34ab 100644 --- a/pandas/tests/util/test_assert_index_equal.py +++ b/pandas/tests/util/test_assert_index_equal.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Categorical, Index, MultiIndex, NaT +import pandas._testing as tm def test_index_equal_levels_mismatch(): diff --git a/pandas/tests/util/test_assert_interval_array_equal.py b/pandas/tests/util/test_assert_interval_array_equal.py index 580a44ed2a70e..96f2973a1528c 100644 --- a/pandas/tests/util/test_assert_interval_array_equal.py +++ b/pandas/tests/util/test_assert_interval_array_equal.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - from pandas import interval_range +import pandas._testing as tm @pytest.mark.parametrize( diff --git a/pandas/tests/util/test_assert_numpy_array_equal.py b/pandas/tests/util/test_assert_numpy_array_equal.py index b8639dd96f799..a6b32610f592d 100644 --- a/pandas/tests/util/test_assert_numpy_array_equal.py +++ b/pandas/tests/util/test_assert_numpy_array_equal.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import Timestamp +import pandas._testing as tm def test_assert_numpy_array_equal_shape_mismatch(): diff --git a/pandas/tests/util/test_assert_produces_warning.py b/pandas/tests/util/test_assert_produces_warning.py index 95a2c401dcd3f..87765c909938d 100644 --- a/pandas/tests/util/test_assert_produces_warning.py +++ b/pandas/tests/util/test_assert_produces_warning.py @@ -2,7 +2,7 @@ import pytest -import pandas.util._testing as tm +import pandas._testing as tm def f(): diff --git a/pandas/tests/util/test_assert_series_equal.py b/pandas/tests/util/test_assert_series_equal.py index 8699ecdb4c7b9..eaf0824f52927 100644 --- a/pandas/tests/util/test_assert_series_equal.py +++ b/pandas/tests/util/test_assert_series_equal.py @@ -1,8 +1,7 @@ import pytest -import pandas.util._testing as tm - from pandas import Categorical, DataFrame, Series +import pandas._testing as tm def _assert_series_equal_both(a, b, **kwargs): diff --git a/pandas/tests/util/test_deprecate.py b/pandas/tests/util/test_deprecate.py index 21b00809956e1..ee4f7e3f34f2e 100644 --- a/pandas/tests/util/test_deprecate.py +++ b/pandas/tests/util/test_deprecate.py @@ -3,7 +3,8 @@ import pytest from pandas.util._decorators import deprecate -import pandas.util._testing as tm + +import pandas._testing as tm def new_func(): diff --git a/pandas/tests/util/test_deprecate_kwarg.py b/pandas/tests/util/test_deprecate_kwarg.py index ebdaaaacc537c..b165e9fba0e4f 100644 --- a/pandas/tests/util/test_deprecate_kwarg.py +++ b/pandas/tests/util/test_deprecate_kwarg.py @@ -1,7 +1,8 @@ import pytest from pandas.util._decorators import deprecate_kwarg -import pandas.util._testing as tm + +import pandas._testing as tm @deprecate_kwarg("old", "new") diff --git a/pandas/tests/util/test_hashing.py b/pandas/tests/util/test_hashing.py index dcdaff984c7ca..c915edad4bb8e 100644 --- a/pandas/tests/util/test_hashing.py +++ b/pandas/tests/util/test_hashing.py @@ -3,10 +3,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Index, MultiIndex, Series +import pandas._testing as tm from pandas.core.util.hashing import _hash_scalar, hash_tuple, hash_tuples from pandas.util import hash_array, hash_pandas_object diff --git a/pandas/tests/util/test_util.py b/pandas/tests/util/test_util.py index 1659bffcfc5fe..6a19adef728e4 100644 --- a/pandas/tests/util/test_util.py +++ b/pandas/tests/util/test_util.py @@ -3,7 +3,8 @@ import pytest import pandas.compat as compat -import pandas.util._testing as tm + +import pandas._testing as tm def test_rands(): diff --git a/pandas/tests/window/common.py b/pandas/tests/window/common.py index 1194d792abe86..677092922ed2b 100644 --- a/pandas/tests/window/common.py +++ b/pandas/tests/window/common.py @@ -3,9 +3,8 @@ import numpy as np from numpy.random import randn -import pandas.util._testing as tm - from pandas import DataFrame, Series, bdate_range, notna +import pandas._testing as tm N, K = 100, 10 diff --git a/pandas/tests/window/moments/test_moments_ewm.py b/pandas/tests/window/moments/test_moments_ewm.py index 1fd3e60c7c936..5836349eb8890 100644 --- a/pandas/tests/window/moments/test_moments_ewm.py +++ b/pandas/tests/window/moments/test_moments_ewm.py @@ -2,10 +2,9 @@ from numpy.random import randn import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series, concat +import pandas._testing as tm from pandas.tests.window.common import Base, ConsistencyBase diff --git a/pandas/tests/window/moments/test_moments_expanding.py b/pandas/tests/window/moments/test_moments_expanding.py index 41654056930b2..4596552d8f255 100644 --- a/pandas/tests/window/moments/test_moments_expanding.py +++ b/pandas/tests/window/moments/test_moments_expanding.py @@ -4,9 +4,8 @@ from numpy.random import randn import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Index, MultiIndex, Series, isna, notna +import pandas._testing as tm from pandas.tests.window.common import ConsistencyBase diff --git a/pandas/tests/window/moments/test_moments_rolling.py b/pandas/tests/window/moments/test_moments_rolling.py index 4eeb3e4ce32bb..9495d2bc7d51d 100644 --- a/pandas/tests/window/moments/test_moments_rolling.py +++ b/pandas/tests/window/moments/test_moments_rolling.py @@ -7,10 +7,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series, isna, notna +import pandas._testing as tm from pandas.core.window.common import _flex_binary_moment from pandas.tests.window.common import Base, ConsistencyBase diff --git a/pandas/tests/window/test_api.py b/pandas/tests/window/test_api.py index 09265245c9ca0..5e70e13209de5 100644 --- a/pandas/tests/window/test_api.py +++ b/pandas/tests/window/test_api.py @@ -4,10 +4,10 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series, Timestamp, concat +import pandas._testing as tm from pandas.core.base import SpecificationError from pandas.tests.window.common import Base diff --git a/pandas/tests/window/test_apply.py b/pandas/tests/window/test_apply.py index a8dc2d72ee156..7132e64c1191c 100644 --- a/pandas/tests/window/test_apply.py +++ b/pandas/tests/window/test_apply.py @@ -2,9 +2,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import DataFrame, Series, Timestamp, date_range +import pandas._testing as tm @pytest.mark.parametrize("bad_raw", [None, 1, 0]) diff --git a/pandas/tests/window/test_base_indexer.py b/pandas/tests/window/test_base_indexer.py index ada15c652dad0..606520c6d68ca 100644 --- a/pandas/tests/window/test_base_indexer.py +++ b/pandas/tests/window/test_base_indexer.py @@ -1,9 +1,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm from pandas.api.indexers import BaseIndexer from pandas.core.window.indexers import ExpandingIndexer diff --git a/pandas/tests/window/test_dtypes.py b/pandas/tests/window/test_dtypes.py index cb9234525c5bc..b1c9b66ab09d3 100644 --- a/pandas/tests/window/test_dtypes.py +++ b/pandas/tests/window/test_dtypes.py @@ -3,9 +3,8 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.base import DataError # gh-12373 : rolling functions error on float32 data diff --git a/pandas/tests/window/test_expanding.py b/pandas/tests/window/test_expanding.py index 60c227d03a569..fc4bd50f25c73 100644 --- a/pandas/tests/window/test_expanding.py +++ b/pandas/tests/window/test_expanding.py @@ -2,10 +2,10 @@ import pytest from pandas.errors import UnsupportedFunctionCall -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.window import Expanding from pandas.tests.window.common import Base diff --git a/pandas/tests/window/test_grouper.py b/pandas/tests/window/test_grouper.py index 353516733480e..355ef3a90d424 100644 --- a/pandas/tests/window/test_grouper.py +++ b/pandas/tests/window/test_grouper.py @@ -1,10 +1,9 @@ import numpy as np import pytest -import pandas.util._testing as tm - import pandas as pd from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.groupby.groupby import get_groupby diff --git a/pandas/tests/window/test_numba.py b/pandas/tests/window/test_numba.py index 52dabc948502e..cc8aef1779b46 100644 --- a/pandas/tests/window/test_numba.py +++ b/pandas/tests/window/test_numba.py @@ -2,9 +2,9 @@ import pytest import pandas.util._test_decorators as td -import pandas.util._testing as tm from pandas import Series +import pandas._testing as tm @td.skip_if_no("numba", "0.46.0") diff --git a/pandas/tests/window/test_pairwise.py b/pandas/tests/window/test_pairwise.py index f1237d9c0863a..717273cff64ea 100644 --- a/pandas/tests/window/test_pairwise.py +++ b/pandas/tests/window/test_pairwise.py @@ -2,9 +2,8 @@ import pytest -import pandas.util._testing as tm - from pandas import DataFrame, Series +import pandas._testing as tm from pandas.core.algorithms import safe_sort diff --git a/pandas/tests/window/test_rolling.py b/pandas/tests/window/test_rolling.py index 2dae4e938db03..04fab93b71c4a 100644 --- a/pandas/tests/window/test_rolling.py +++ b/pandas/tests/window/test_rolling.py @@ -5,10 +5,10 @@ from pandas.errors import UnsupportedFunctionCall import pandas.util._test_decorators as td -import pandas.util._testing as tm import pandas as pd from pandas import DataFrame, Index, Series +import pandas._testing as tm from pandas.core.window import Rolling from pandas.tests.window.common import Base diff --git a/pandas/tests/window/test_timeseries_window.py b/pandas/tests/window/test_timeseries_window.py index 36e3b9f703a14..5f5e10b5dd497 100644 --- a/pandas/tests/window/test_timeseries_window.py +++ b/pandas/tests/window/test_timeseries_window.py @@ -1,8 +1,6 @@ import numpy as np import pytest -import pandas.util._testing as tm - from pandas import ( DataFrame, Index, @@ -12,6 +10,7 @@ date_range, to_datetime, ) +import pandas._testing as tm import pandas.tseries.offsets as offsets diff --git a/pandas/util/testing/__init__.py b/pandas/util/testing/__init__.py index 201ef28757191..3f15b9a40f2ef 100644 --- a/pandas/util/testing/__init__.py +++ b/pandas/util/testing/__init__.py @@ -142,4 +142,4 @@ "zipfile", ] -testing = _DeprecatedModule("pandas.util._testing", "pandas.testing", _removals) +testing = _DeprecatedModule("pandas._testing", "pandas.testing", _removals) diff --git a/scripts/list_future_warnings.sh b/scripts/list_future_warnings.sh index 3f6c311c412fe..121f4f5a92abb 100755 --- a/scripts/list_future_warnings.sh +++ b/scripts/list_future_warnings.sh @@ -25,7 +25,7 @@ EXCLUDE="^pandas/tests/|" # tests validate that FutureWarnings are raised EXCLUDE+="^pandas/util/_decorators.py$|" # generic deprecate function that raises warning EXCLUDE+="^pandas/util/_depr_module.py$|" # generic deprecate module that raises warnings -EXCLUDE+="^pandas.util._testing.py$|" # contains function to evaluate if warning is raised +EXCLUDE+="^pandas._testing.py$|" # contains function to evaluate if warning is raised EXCLUDE+="^pandas/io/parsers.py$" # implements generic deprecation system in io reading BASE_DIR="$(dirname $0)/.." diff --git a/setup.cfg b/setup.cfg index 2694f25fd20ae..1484198929973 100644 --- a/setup.cfg +++ b/setup.cfg @@ -340,5 +340,5 @@ check_untyped_defs=False [mypy-pandas.tseries.offsets] check_untyped_defs=False -[mypy-pandas.util._testing] +[mypy-pandas._testing] check_untyped_defs=False From 7f5fad07f8cb6b750a5acd9ac14ed09ebd5131e9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jan 2020 15:19:16 -0600 Subject: [PATCH 14/17] fix api test --- pandas/tests/api/test_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index c7b9358d6b5ad..82bf0c0fff9c0 100644 --- a/pandas/tests/api/test_api.py +++ b/pandas/tests/api/test_api.py @@ -193,6 +193,7 @@ class TestPDApi(Base): "_np_version_under1p16", "_np_version_under1p17", "_np_version_under1p18", + "_testing", "_tslib", "_typing", "_version", From 5c640a794a9c2fc0c12ce865c3b6b1a14688efaa Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Jan 2020 08:02:32 -0600 Subject: [PATCH 15/17] update --- pandas/tests/indexing/test_na_indexing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/indexing/test_na_indexing.py b/pandas/tests/indexing/test_na_indexing.py index 4b92df581d164..befe4fee8ecf8 100644 --- a/pandas/tests/indexing/test_na_indexing.py +++ b/pandas/tests/indexing/test_na_indexing.py @@ -1,7 +1,7 @@ import pytest import pandas as pd -import pandas.util.testing as tm +import pandas._testing as tm @pytest.mark.parametrize( From e98702d6bbd5e71c43d1c8e90360cc4f64d71602 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Jan 2020 08:05:42 -0600 Subject: [PATCH 16/17] remove removal --- pandas/util/testing/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/util/testing/__init__.py b/pandas/util/testing/__init__.py index 3f15b9a40f2ef..02cbd19a9a888 100644 --- a/pandas/util/testing/__init__.py +++ b/pandas/util/testing/__init__.py @@ -38,7 +38,6 @@ "assert_dict_equal", "assert_is_sorted", "assert_is_valid_plot_return_object", - "assert_period_array_equal", "assert_produces_warning", "bdate_range", "box_expected", From 8924296ab78ec6cb092d98fac2bc88042a29149e Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Jan 2020 08:47:27 -0600 Subject: [PATCH 17/17] trigger ci