diff --git a/integration_tests/src/main/python/cache_test.py b/integration_tests/src/main/python/cache_test.py index 6297e0d176c..67ab41b0e8f 100644 --- a/integration_tests/src/main/python/cache_test.py +++ b/integration_tests/src/main/python/cache_test.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ from data_gen import * from datetime import date import pyspark.sql.functions as f -from spark_session import with_cpu_session, with_gpu_session, is_spark_300, is_before_spark_310 +from spark_session import with_cpu_session, with_gpu_session, is_spark_300 from join_test import create_df from generate_expr_test import four_op_df from marks import incompat, allow_non_gpu, ignore_order diff --git a/integration_tests/src/main/python/date_time_test.py b/integration_tests/src/main/python/date_time_test.py index 2f5636e8329..4ac34b608aa 100644 --- a/integration_tests/src/main/python/date_time_test.py +++ b/integration_tests/src/main/python/date_time_test.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ from datetime import date, datetime, timezone from marks import incompat from pyspark.sql.types import * -from spark_session import with_spark_session, is_before_spark_310 +from spark_session import with_spark_session import pyspark.sql.functions as f # We only support literal intervals for TimeSub diff --git a/integration_tests/src/main/python/generate_expr_test.py b/integration_tests/src/main/python/generate_expr_test.py index 2abc75688a6..b9c516f3f1a 100644 --- a/integration_tests/src/main/python/generate_expr_test.py +++ b/integration_tests/src/main/python/generate_expr_test.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,6 @@ import pytest -from spark_session import is_before_spark_310 from asserts import assert_gpu_and_cpu_are_equal_collect from data_gen import * from marks import ignore_order diff --git a/integration_tests/src/main/python/parquet_write_test.py b/integration_tests/src/main/python/parquet_write_test.py index e53af274eb8..62bdcfc5b7e 100644 --- a/integration_tests/src/main/python/parquet_write_test.py +++ b/integration_tests/src/main/python/parquet_write_test.py @@ -19,7 +19,7 @@ from data_gen import * from marks import * from pyspark.sql.types import * -from spark_session import with_cpu_session, with_gpu_session, is_before_spark_310 +from spark_session import with_cpu_session, with_gpu_session import random # test with original parquet file reader, the multi-file parallel reader for cloud, and coalesce file reader for diff --git a/integration_tests/src/main/python/qa_nightly_sql.py b/integration_tests/src/main/python/qa_nightly_sql.py index e628e05a02c..4d750bf9413 100644 --- a/integration_tests/src/main/python/qa_nightly_sql.py +++ b/integration_tests/src/main/python/qa_nightly_sql.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2021, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. from conftest import is_databricks_runtime -from spark_session import with_spark_session, is_before_spark_310 +from spark_session import with_spark_session import pytest SELECT_SQL = [ diff --git a/integration_tests/src/main/python/tpch_test.py b/integration_tests/src/main/python/tpch_test.py index 2e17145242f..fee8f665314 100644 --- a/integration_tests/src/main/python/tpch_test.py +++ b/integration_tests/src/main/python/tpch_test.py @@ -17,7 +17,7 @@ from asserts import assert_gpu_and_cpu_are_equal_collect from conftest import is_databricks_runtime from marks import approximate_float, incompat, ignore_order, allow_non_gpu, allow_non_gpu_databricks -from spark_session import with_spark_session, is_before_spark_310 +from spark_session import with_spark_session _base_conf = {'spark.rapids.sql.variableFloatAgg.enabled': 'true', 'spark.rapids.sql.hasNans': 'false',