This is an automated email from the ASF dual-hosted git repository.
tvalentyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new fe8ddfc [BEAM-7372] remove usage of future package from coders and
dataframe (#14163)
fe8ddfc is described below
commit fe8ddfc211b661ab1dc66a3f2932d04a9428b906
Author: yoshiki.obata <[email protected]>
AuthorDate: Thu Mar 11 16:54:27 2021 +0900
[BEAM-7372] remove usage of future package from coders and dataframe
(#14163)
---
sdks/python/apache_beam/coders/__init__.py | 2 --
sdks/python/apache_beam/coders/avro_record.py | 2 --
sdks/python/apache_beam/coders/coder_impl.py | 3 ---
sdks/python/apache_beam/coders/coders.py | 2 --
sdks/python/apache_beam/coders/coders_test.py | 2 --
sdks/python/apache_beam/coders/coders_test_common.py | 2 --
sdks/python/apache_beam/coders/fast_coders_test.py | 2 --
sdks/python/apache_beam/coders/observable.py | 2 --
sdks/python/apache_beam/coders/observable_test.py | 2 --
sdks/python/apache_beam/coders/row_coder.py | 2 --
sdks/python/apache_beam/coders/row_coder_test.py | 2 --
sdks/python/apache_beam/coders/slow_coders_test.py | 2 --
sdks/python/apache_beam/coders/slow_stream.py | 2 --
sdks/python/apache_beam/coders/standard_coders_test.py | 3 ---
sdks/python/apache_beam/coders/stream_test.py | 3 ---
sdks/python/apache_beam/coders/typecoders.py | 2 --
sdks/python/apache_beam/coders/typecoders_test.py | 2 --
sdks/python/apache_beam/dataframe/__init__.py | 2 --
sdks/python/apache_beam/dataframe/convert.py | 2 --
sdks/python/apache_beam/dataframe/convert_test.py | 2 --
sdks/python/apache_beam/dataframe/doctests.py | 4 ----
sdks/python/apache_beam/dataframe/doctests_test.py | 2 --
sdks/python/apache_beam/dataframe/expressions.py | 2 --
sdks/python/apache_beam/dataframe/expressions_test.py | 2 --
sdks/python/apache_beam/dataframe/frame_base.py | 2 --
sdks/python/apache_beam/dataframe/frame_base_test.py | 2 --
sdks/python/apache_beam/dataframe/frames.py | 2 --
sdks/python/apache_beam/dataframe/frames_test.py | 2 --
sdks/python/apache_beam/dataframe/io.py | 2 --
sdks/python/apache_beam/dataframe/io_test.py | 3 ---
sdks/python/apache_beam/dataframe/pandas_docs_test.py | 3 ---
sdks/python/apache_beam/dataframe/pandas_doctests_test.py | 2 --
sdks/python/apache_beam/dataframe/partitionings.py | 2 --
sdks/python/apache_beam/dataframe/partitionings_test.py | 2 --
sdks/python/apache_beam/dataframe/schemas.py | 2 --
sdks/python/apache_beam/dataframe/schemas_test.py | 3 ---
sdks/python/apache_beam/dataframe/transforms.py | 2 --
sdks/python/apache_beam/dataframe/transforms_test.py | 3 ---
38 files changed, 85 deletions(-)
diff --git a/sdks/python/apache_beam/coders/__init__.py
b/sdks/python/apache_beam/coders/__init__.py
index 680f1c7..8063099 100644
--- a/sdks/python/apache_beam/coders/__init__.py
+++ b/sdks/python/apache_beam/coders/__init__.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-from __future__ import absolute_import
-
from apache_beam.coders.coders import *
from apache_beam.coders.row_coder import *
from apache_beam.coders.typecoders import registry
diff --git a/sdks/python/apache_beam/coders/avro_record.py
b/sdks/python/apache_beam/coders/avro_record.py
index efbaca8..c9ed26d 100644
--- a/sdks/python/apache_beam/coders/avro_record.py
+++ b/sdks/python/apache_beam/coders/avro_record.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
__all__ = ['AvroRecord']
diff --git a/sdks/python/apache_beam/coders/coder_impl.py
b/sdks/python/apache_beam/coders/coder_impl.py
index 9ef22c5..f262f1f 100644
--- a/sdks/python/apache_beam/coders/coder_impl.py
+++ b/sdks/python/apache_beam/coders/coder_impl.py
@@ -33,9 +33,6 @@ For internal use only; no backwards-compatibility guarantees.
"""
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import json
from builtins import chr
from builtins import object
diff --git a/sdks/python/apache_beam/coders/coders.py
b/sdks/python/apache_beam/coders/coders.py
index 6c570b0..e5c6f61 100644
--- a/sdks/python/apache_beam/coders/coders.py
+++ b/sdks/python/apache_beam/coders/coders.py
@@ -21,8 +21,6 @@ Only those coders listed in __all__ are part of the public
API of this module.
"""
# pytype: skip-file
-from __future__ import absolute_import
-
import base64
from builtins import object
from typing import TYPE_CHECKING
diff --git a/sdks/python/apache_beam/coders/coders_test.py
b/sdks/python/apache_beam/coders/coders_test.py
index 084e0d1..02e996e 100644
--- a/sdks/python/apache_beam/coders/coders_test.py
+++ b/sdks/python/apache_beam/coders/coders_test.py
@@ -16,8 +16,6 @@
#
# pytype: skip-file
-from __future__ import absolute_import
-
import base64
import logging
import unittest
diff --git a/sdks/python/apache_beam/coders/coders_test_common.py
b/sdks/python/apache_beam/coders/coders_test_common.py
index 3250f6b..55fcda0 100644
--- a/sdks/python/apache_beam/coders/coders_test_common.py
+++ b/sdks/python/apache_beam/coders/coders_test_common.py
@@ -18,8 +18,6 @@
"""Tests common to all coder implementations."""
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import math
import unittest
diff --git a/sdks/python/apache_beam/coders/fast_coders_test.py
b/sdks/python/apache_beam/coders/fast_coders_test.py
index 5a3f4e6..c7112e0 100644
--- a/sdks/python/apache_beam/coders/fast_coders_test.py
+++ b/sdks/python/apache_beam/coders/fast_coders_test.py
@@ -18,8 +18,6 @@
"""Unit tests for compiled implementation of coder impls."""
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/coders/observable.py
b/sdks/python/apache_beam/coders/observable.py
index e0edf12..94104a0 100644
--- a/sdks/python/apache_beam/coders/observable.py
+++ b/sdks/python/apache_beam/coders/observable.py
@@ -21,8 +21,6 @@ For internal use only; no backwards-compatibility guarantees.
"""
# pytype: skip-file
-from __future__ import absolute_import
-
from builtins import object
diff --git a/sdks/python/apache_beam/coders/observable_test.py
b/sdks/python/apache_beam/coders/observable_test.py
index 2ef0fe1..46f5186 100644
--- a/sdks/python/apache_beam/coders/observable_test.py
+++ b/sdks/python/apache_beam/coders/observable_test.py
@@ -18,8 +18,6 @@
"""Tests for the Observable mixin class."""
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
from typing import List
diff --git a/sdks/python/apache_beam/coders/row_coder.py
b/sdks/python/apache_beam/coders/row_coder.py
index ecb2bf3..7879d82 100644
--- a/sdks/python/apache_beam/coders/row_coder.py
+++ b/sdks/python/apache_beam/coders/row_coder.py
@@ -17,8 +17,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import itertools
from array import array
diff --git a/sdks/python/apache_beam/coders/row_coder_test.py
b/sdks/python/apache_beam/coders/row_coder_test.py
index 9f087a1..210e31b 100644
--- a/sdks/python/apache_beam/coders/row_coder_test.py
+++ b/sdks/python/apache_beam/coders/row_coder_test.py
@@ -16,8 +16,6 @@
#
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import typing
import unittest
diff --git a/sdks/python/apache_beam/coders/slow_coders_test.py
b/sdks/python/apache_beam/coders/slow_coders_test.py
index 348205f..fe1c707 100644
--- a/sdks/python/apache_beam/coders/slow_coders_test.py
+++ b/sdks/python/apache_beam/coders/slow_coders_test.py
@@ -18,8 +18,6 @@
"""Unit tests for uncompiled implementation of coder impls."""
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/coders/slow_stream.py
b/sdks/python/apache_beam/coders/slow_stream.py
index 5840e24..b485309 100644
--- a/sdks/python/apache_beam/coders/slow_stream.py
+++ b/sdks/python/apache_beam/coders/slow_stream.py
@@ -21,8 +21,6 @@ For internal use only; no backwards-compatibility guarantees.
"""
# pytype: skip-file
-from __future__ import absolute_import
-
import struct
from builtins import chr
from builtins import object
diff --git a/sdks/python/apache_beam/coders/standard_coders_test.py
b/sdks/python/apache_beam/coders/standard_coders_test.py
index 87320c8..385790d 100644
--- a/sdks/python/apache_beam/coders/standard_coders_test.py
+++ b/sdks/python/apache_beam/coders/standard_coders_test.py
@@ -19,9 +19,6 @@
"""
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import print_function
-
import json
import logging
import math
diff --git a/sdks/python/apache_beam/coders/stream_test.py
b/sdks/python/apache_beam/coders/stream_test.py
index b84d338..900d037 100644
--- a/sdks/python/apache_beam/coders/stream_test.py
+++ b/sdks/python/apache_beam/coders/stream_test.py
@@ -18,9 +18,6 @@
"""Tests for the stream implementations."""
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import logging
import math
import unittest
diff --git a/sdks/python/apache_beam/coders/typecoders.py
b/sdks/python/apache_beam/coders/typecoders.py
index ba57c84..844110c 100644
--- a/sdks/python/apache_beam/coders/typecoders.py
+++ b/sdks/python/apache_beam/coders/typecoders.py
@@ -66,8 +66,6 @@ See apache_beam.typehints.decorators module for more details.
# pytype: skip-file
-from __future__ import absolute_import
-
from builtins import object
from typing import Any
from typing import Dict
diff --git a/sdks/python/apache_beam/coders/typecoders_test.py
b/sdks/python/apache_beam/coders/typecoders_test.py
index dec478f..dd2156a 100644
--- a/sdks/python/apache_beam/coders/typecoders_test.py
+++ b/sdks/python/apache_beam/coders/typecoders_test.py
@@ -18,8 +18,6 @@
"""Unit tests for the typecoders module."""
# pytype: skip-file
-from __future__ import absolute_import
-
import unittest
from builtins import object
diff --git a/sdks/python/apache_beam/dataframe/__init__.py
b/sdks/python/apache_beam/dataframe/__init__.py
index 9071a88..e0aa42b 100644
--- a/sdks/python/apache_beam/dataframe/__init__.py
+++ b/sdks/python/apache_beam/dataframe/__init__.py
@@ -14,6 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
from apache_beam.dataframe.expressions import allow_non_parallel_operations
diff --git a/sdks/python/apache_beam/dataframe/convert.py
b/sdks/python/apache_beam/dataframe/convert.py
index aad15ac1..2b207dd 100644
--- a/sdks/python/apache_beam/dataframe/convert.py
+++ b/sdks/python/apache_beam/dataframe/convert.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import inspect
import weakref
from typing import TYPE_CHECKING
diff --git a/sdks/python/apache_beam/dataframe/convert_test.py
b/sdks/python/apache_beam/dataframe/convert_test.py
index 638accf..06a1001 100644
--- a/sdks/python/apache_beam/dataframe/convert_test.py
+++ b/sdks/python/apache_beam/dataframe/convert_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import unittest
import pandas as pd
diff --git a/sdks/python/apache_beam/dataframe/doctests.py
b/sdks/python/apache_beam/dataframe/doctests.py
index 8cb2d8f..ca547da 100644
--- a/sdks/python/apache_beam/dataframe/doctests.py
+++ b/sdks/python/apache_beam/dataframe/doctests.py
@@ -37,10 +37,6 @@ The (novel) sequence of events when running a doctest is as
follows.
values.
"""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
import collections
import contextlib
import doctest
diff --git a/sdks/python/apache_beam/dataframe/doctests_test.py
b/sdks/python/apache_beam/dataframe/doctests_test.py
index d3030fb..1adff65 100644
--- a/sdks/python/apache_beam/dataframe/doctests_test.py
+++ b/sdks/python/apache_beam/dataframe/doctests_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import doctest
import os
import tempfile
diff --git a/sdks/python/apache_beam/dataframe/expressions.py
b/sdks/python/apache_beam/dataframe/expressions.py
index 0c04944..1c3aed7 100644
--- a/sdks/python/apache_beam/dataframe/expressions.py
+++ b/sdks/python/apache_beam/dataframe/expressions.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import contextlib
import random
import threading
diff --git a/sdks/python/apache_beam/dataframe/expressions_test.py
b/sdks/python/apache_beam/dataframe/expressions_test.py
index fbbf025..7033783 100644
--- a/sdks/python/apache_beam/dataframe/expressions_test.py
+++ b/sdks/python/apache_beam/dataframe/expressions_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import unittest
from apache_beam.dataframe import expressions
diff --git a/sdks/python/apache_beam/dataframe/frame_base.py
b/sdks/python/apache_beam/dataframe/frame_base.py
index 7674fb2..433856e 100644
--- a/sdks/python/apache_beam/dataframe/frame_base.py
+++ b/sdks/python/apache_beam/dataframe/frame_base.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import functools
from inspect import getfullargspec
from inspect import unwrap
diff --git a/sdks/python/apache_beam/dataframe/frame_base_test.py
b/sdks/python/apache_beam/dataframe/frame_base_test.py
index 557fedb..82d5b65 100644
--- a/sdks/python/apache_beam/dataframe/frame_base_test.py
+++ b/sdks/python/apache_beam/dataframe/frame_base_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import unittest
import pandas as pd
diff --git a/sdks/python/apache_beam/dataframe/frames.py
b/sdks/python/apache_beam/dataframe/frames.py
index 994048e..148d1a2 100644
--- a/sdks/python/apache_beam/dataframe/frames.py
+++ b/sdks/python/apache_beam/dataframe/frames.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import collections
import inspect
import math
diff --git a/sdks/python/apache_beam/dataframe/frames_test.py
b/sdks/python/apache_beam/dataframe/frames_test.py
index 7b888d1..98ad565 100644
--- a/sdks/python/apache_beam/dataframe/frames_test.py
+++ b/sdks/python/apache_beam/dataframe/frames_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import sys
import unittest
diff --git a/sdks/python/apache_beam/dataframe/io.py
b/sdks/python/apache_beam/dataframe/io.py
index b51e85e..162e023 100644
--- a/sdks/python/apache_beam/dataframe/io.py
+++ b/sdks/python/apache_beam/dataframe/io.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import itertools
import re
from io import BytesIO
diff --git a/sdks/python/apache_beam/dataframe/io_test.py
b/sdks/python/apache_beam/dataframe/io_test.py
index 6ae16f2..32a0d9c 100644
--- a/sdks/python/apache_beam/dataframe/io_test.py
+++ b/sdks/python/apache_beam/dataframe/io_test.py
@@ -14,9 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-from __future__ import print_function
-
import glob
import importlib
import math
diff --git a/sdks/python/apache_beam/dataframe/pandas_docs_test.py
b/sdks/python/apache_beam/dataframe/pandas_docs_test.py
index 449656e..d52773c 100644
--- a/sdks/python/apache_beam/dataframe/pandas_docs_test.py
+++ b/sdks/python/apache_beam/dataframe/pandas_docs_test.py
@@ -20,9 +20,6 @@ dataframe implementation.
Run as python -m apache_beam.dataframe.pandas_docs_test [getting_started ...]
"""
-from __future__ import absolute_import
-from __future__ import print_function
-
import argparse
import contextlib
import io
diff --git a/sdks/python/apache_beam/dataframe/pandas_doctests_test.py
b/sdks/python/apache_beam/dataframe/pandas_doctests_test.py
index 1144d42..e48b38a 100644
--- a/sdks/python/apache_beam/dataframe/pandas_doctests_test.py
+++ b/sdks/python/apache_beam/dataframe/pandas_doctests_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import sys
import unittest
diff --git a/sdks/python/apache_beam/dataframe/partitionings.py
b/sdks/python/apache_beam/dataframe/partitionings.py
index a67bbac..aa3d1c1 100644
--- a/sdks/python/apache_beam/dataframe/partitionings.py
+++ b/sdks/python/apache_beam/dataframe/partitionings.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import random
from typing import Any
from typing import Iterable
diff --git a/sdks/python/apache_beam/dataframe/partitionings_test.py
b/sdks/python/apache_beam/dataframe/partitionings_test.py
index 70a5e99..85f6112 100644
--- a/sdks/python/apache_beam/dataframe/partitionings_test.py
+++ b/sdks/python/apache_beam/dataframe/partitionings_test.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import unittest
import pandas as pd
diff --git a/sdks/python/apache_beam/dataframe/schemas.py
b/sdks/python/apache_beam/dataframe/schemas.py
index 32acbd9..cc30cec 100644
--- a/sdks/python/apache_beam/dataframe/schemas.py
+++ b/sdks/python/apache_beam/dataframe/schemas.py
@@ -57,8 +57,6 @@ types may be given special consideration.
#TODO: Mapping for date/time types
#https://pandas.pydata.org/docs/user_guide/timeseries.html#overview
-from __future__ import absolute_import
-
from typing import Any
from typing import NamedTuple
from typing import Optional
diff --git a/sdks/python/apache_beam/dataframe/schemas_test.py
b/sdks/python/apache_beam/dataframe/schemas_test.py
index a52ef0e..6011475 100644
--- a/sdks/python/apache_beam/dataframe/schemas_test.py
+++ b/sdks/python/apache_beam/dataframe/schemas_test.py
@@ -19,12 +19,9 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import typing
import unittest
-import future.tests.base # pylint: disable=unused-import
import numpy as np
# patches unittest.testcase to be python3 compatible
import pandas as pd
diff --git a/sdks/python/apache_beam/dataframe/transforms.py
b/sdks/python/apache_beam/dataframe/transforms.py
index b403f32..d46a340 100644
--- a/sdks/python/apache_beam/dataframe/transforms.py
+++ b/sdks/python/apache_beam/dataframe/transforms.py
@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-
import collections
from typing import TYPE_CHECKING
from typing import Any
diff --git a/sdks/python/apache_beam/dataframe/transforms_test.py
b/sdks/python/apache_beam/dataframe/transforms_test.py
index 20815c2..9b846a8 100644
--- a/sdks/python/apache_beam/dataframe/transforms_test.py
+++ b/sdks/python/apache_beam/dataframe/transforms_test.py
@@ -14,9 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from __future__ import absolute_import
-from __future__ import division
-
import typing
import unittest
