From 7153d7640432fc5300121140ebac3261affba6c4 Mon Sep 17 00:00:00 2001 From: Zero Date: Sat, 28 May 2022 14:43:05 +0800 Subject: [PATCH 1/3] MAINT: Remove `__futre__` --- doc/source/conf.py | 2 -- dtoolkit/accessor/dataframe/cols.py | 2 -- dtoolkit/accessor/dataframe/decompose.py | 2 -- dtoolkit/accessor/dataframe/drop_inf.py | 2 -- dtoolkit/accessor/dataframe/expand.py | 2 -- dtoolkit/accessor/dataframe/fillna_regression.py | 2 -- dtoolkit/accessor/dataframe/filter_in.py | 2 -- dtoolkit/accessor/dataframe/repeat.py | 2 -- dtoolkit/accessor/dataframe/to_series.py | 2 -- dtoolkit/accessor/dataframe/values_to_dict.py | 2 -- dtoolkit/accessor/register.py | 4 ---- dtoolkit/accessor/series/cols.py | 2 -- dtoolkit/accessor/series/drop_inf.py | 2 -- dtoolkit/accessor/series/error_report.py | 2 -- dtoolkit/accessor/series/expand.py | 2 -- dtoolkit/accessor/series/len.py | 2 -- dtoolkit/accessor/series/values_to_dict.py | 2 -- dtoolkit/geoaccessor/dataframe/from_wkt.py | 2 -- dtoolkit/geoaccessor/dataframe/from_xy.py | 2 -- dtoolkit/geoaccessor/geodataframe/geobuffer.py | 2 -- dtoolkit/geoaccessor/geodataframe/utm_crs.py | 2 -- dtoolkit/geoaccessor/geoseries/geobuffer.py | 2 -- dtoolkit/transformer/_util.py | 2 -- dtoolkit/transformer/base.py | 2 -- dtoolkit/transformer/factory.py | 2 -- dtoolkit/transformer/numpy/RavelTF.py | 2 -- dtoolkit/transformer/pipeline/make_pipeline.py | 2 -- dtoolkit/transformer/pipeline/make_union.py | 2 -- dtoolkit/transformer/sklearn/OneHotEncoder.py | 2 -- dtoolkit/util/_decorator/deprecated_kwargs.py | 2 -- test/transformer/test_factory.py | 2 -- 31 files changed, 64 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index ef241812d..1c04f0b95 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,8 +10,6 @@ # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -from __future__ import annotations - import inspect import os import sys diff --git a/dtoolkit/accessor/dataframe/cols.py b/dtoolkit/accessor/dataframe/cols.py index 9fb965386..acf6aae26 100644 --- a/dtoolkit/accessor/dataframe/cols.py +++ b/dtoolkit/accessor/dataframe/cols.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/dataframe/decompose.py b/dtoolkit/accessor/dataframe/decompose.py index e915f2c70..44d57f8aa 100644 --- a/dtoolkit/accessor/dataframe/decompose.py +++ b/dtoolkit/accessor/dataframe/decompose.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from itertools import chain from typing import TYPE_CHECKING diff --git a/dtoolkit/accessor/dataframe/drop_inf.py b/dtoolkit/accessor/dataframe/drop_inf.py index 3a9c2eb52..c9d1d9a3a 100644 --- a/dtoolkit/accessor/dataframe/drop_inf.py +++ b/dtoolkit/accessor/dataframe/drop_inf.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd from pandas.util._validators import validate_bool_kwarg diff --git a/dtoolkit/accessor/dataframe/expand.py b/dtoolkit/accessor/dataframe/expand.py index 21eaadcda..4ed7a483d 100644 --- a/dtoolkit/accessor/dataframe/expand.py +++ b/dtoolkit/accessor/dataframe/expand.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent import pandas as pd diff --git a/dtoolkit/accessor/dataframe/fillna_regression.py b/dtoolkit/accessor/dataframe/fillna_regression.py index 4a20b336e..2f0cf4678 100644 --- a/dtoolkit/accessor/dataframe/fillna_regression.py +++ b/dtoolkit/accessor/dataframe/fillna_regression.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import pandas as pd diff --git a/dtoolkit/accessor/dataframe/filter_in.py b/dtoolkit/accessor/dataframe/filter_in.py index 7ef2e6086..e548ac0ab 100644 --- a/dtoolkit/accessor/dataframe/filter_in.py +++ b/dtoolkit/accessor/dataframe/filter_in.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Iterable import pandas as pd diff --git a/dtoolkit/accessor/dataframe/repeat.py b/dtoolkit/accessor/dataframe/repeat.py index e64ae48cd..8ffe30997 100644 --- a/dtoolkit/accessor/dataframe/repeat.py +++ b/dtoolkit/accessor/dataframe/repeat.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd diff --git a/dtoolkit/accessor/dataframe/to_series.py b/dtoolkit/accessor/dataframe/to_series.py index b2fa686e1..94115203a 100644 --- a/dtoolkit/accessor/dataframe/to_series.py +++ b/dtoolkit/accessor/dataframe/to_series.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/dataframe/values_to_dict.py b/dtoolkit/accessor/dataframe/values_to_dict.py index cd1ceb51f..c8b4e67a3 100644 --- a/dtoolkit/accessor/dataframe/values_to_dict.py +++ b/dtoolkit/accessor/dataframe/values_to_dict.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/register.py b/dtoolkit/accessor/register.py index 8550be4cd..107cd178d 100644 --- a/dtoolkit/accessor/register.py +++ b/dtoolkit/accessor/register.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import wraps from typing import Callable @@ -95,8 +93,6 @@ def register_series_method(name: str = None): -------- In your library code:: - from __future__ import annotations - from dtoolkit.accessor import register_dataframe_method from dtoolkit.accessor import register_series_method from dtoolkit.accessor import register_index_method diff --git a/dtoolkit/accessor/series/cols.py b/dtoolkit/accessor/series/cols.py index 1ed1402d3..b1832dce1 100644 --- a/dtoolkit/accessor/series/cols.py +++ b/dtoolkit/accessor/series/cols.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/series/drop_inf.py b/dtoolkit/accessor/series/drop_inf.py index d5db526f1..9f2e87ac6 100644 --- a/dtoolkit/accessor/series/drop_inf.py +++ b/dtoolkit/accessor/series/drop_inf.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd from pandas.util._validators import validate_bool_kwarg diff --git a/dtoolkit/accessor/series/error_report.py b/dtoolkit/accessor/series/error_report.py index c980866bd..6f4d57a8b 100644 --- a/dtoolkit/accessor/series/error_report.py +++ b/dtoolkit/accessor/series/error_report.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/series/expand.py b/dtoolkit/accessor/series/expand.py index c6a98538c..488aa5380 100644 --- a/dtoolkit/accessor/series/expand.py +++ b/dtoolkit/accessor/series/expand.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent from typing import Iterable diff --git a/dtoolkit/accessor/series/len.py b/dtoolkit/accessor/series/len.py index f39eec1d3..01273f3bb 100644 --- a/dtoolkit/accessor/series/len.py +++ b/dtoolkit/accessor/series/len.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from pandas.api.types import is_number diff --git a/dtoolkit/accessor/series/values_to_dict.py b/dtoolkit/accessor/series/values_to_dict.py index 80c450cba..f174ce6a7 100644 --- a/dtoolkit/accessor/series/values_to_dict.py +++ b/dtoolkit/accessor/series/values_to_dict.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit.accessor.register import register_series_method # noqa diff --git a/dtoolkit/geoaccessor/dataframe/from_wkt.py b/dtoolkit/geoaccessor/dataframe/from_wkt.py index b73aeedc8..84cd21c56 100644 --- a/dtoolkit/geoaccessor/dataframe/from_wkt.py +++ b/dtoolkit/geoaccessor/dataframe/from_wkt.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/dataframe/from_xy.py b/dtoolkit/geoaccessor/dataframe/from_xy.py index f61d7faae..9390df43b 100644 --- a/dtoolkit/geoaccessor/dataframe/from_xy.py +++ b/dtoolkit/geoaccessor/dataframe/from_xy.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/geobuffer.py b/dtoolkit/geoaccessor/geodataframe/geobuffer.py index 1a32008fb..f3ebca268 100644 --- a/dtoolkit/geoaccessor/geodataframe/geobuffer.py +++ b/dtoolkit/geoaccessor/geodataframe/geobuffer.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/utm_crs.py b/dtoolkit/geoaccessor/geodataframe/utm_crs.py index 243fff425..205a652a9 100644 --- a/dtoolkit/geoaccessor/geodataframe/utm_crs.py +++ b/dtoolkit/geoaccessor/geodataframe/utm_crs.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import geopandas as gpd import pandas as pd from pandas.util._decorators import doc diff --git a/dtoolkit/geoaccessor/geoseries/geobuffer.py b/dtoolkit/geoaccessor/geoseries/geobuffer.py index 6733ecb56..3fe482518 100644 --- a/dtoolkit/geoaccessor/geoseries/geobuffer.py +++ b/dtoolkit/geoaccessor/geoseries/geobuffer.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent import geopandas as gpd diff --git a/dtoolkit/transformer/_util.py b/dtoolkit/transformer/_util.py index 6c8c33107..caceef648 100644 --- a/dtoolkit/transformer/_util.py +++ b/dtoolkit/transformer/_util.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd diff --git a/dtoolkit/transformer/base.py b/dtoolkit/transformer/base.py index 3fe6bca34..162795104 100644 --- a/dtoolkit/transformer/base.py +++ b/dtoolkit/transformer/base.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent from typing import Any from typing import Callable diff --git a/dtoolkit/transformer/factory.py b/dtoolkit/transformer/factory.py index d552e609d..d457567d9 100644 --- a/dtoolkit/transformer/factory.py +++ b/dtoolkit/transformer/factory.py @@ -23,8 +23,6 @@ def methodtf_factory( -------- In your library code:: - from __future__ import annotations - import numpy as np from dtoolkit.transformer.factory import methodtf_factory diff --git a/dtoolkit/transformer/numpy/RavelTF.py b/dtoolkit/transformer/numpy/RavelTF.py index ffa3221f0..59a1e2617 100644 --- a/dtoolkit/transformer/numpy/RavelTF.py +++ b/dtoolkit/transformer/numpy/RavelTF.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd diff --git a/dtoolkit/transformer/pipeline/make_pipeline.py b/dtoolkit/transformer/pipeline/make_pipeline.py index 7224f21c7..51511121b 100644 --- a/dtoolkit/transformer/pipeline/make_pipeline.py +++ b/dtoolkit/transformer/pipeline/make_pipeline.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from sklearn.pipeline import _name_estimators from dtoolkit.transformer import Transformer diff --git a/dtoolkit/transformer/pipeline/make_union.py b/dtoolkit/transformer/pipeline/make_union.py index 42997d90a..83a1d3f39 100644 --- a/dtoolkit/transformer/pipeline/make_union.py +++ b/dtoolkit/transformer/pipeline/make_union.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from sklearn.pipeline import _name_estimators from dtoolkit.transformer import Transformer diff --git a/dtoolkit/transformer/sklearn/OneHotEncoder.py b/dtoolkit/transformer/sklearn/OneHotEncoder.py index ac1ea2708..9251986ad 100644 --- a/dtoolkit/transformer/sklearn/OneHotEncoder.py +++ b/dtoolkit/transformer/sklearn/OneHotEncoder.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent from typing import TYPE_CHECKING diff --git a/dtoolkit/util/_decorator/deprecated_kwargs.py b/dtoolkit/util/_decorator/deprecated_kwargs.py index 25e002ea9..43a193ff4 100644 --- a/dtoolkit/util/_decorator/deprecated_kwargs.py +++ b/dtoolkit/util/_decorator/deprecated_kwargs.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import wraps from warnings import warn diff --git a/test/transformer/test_factory.py b/test/transformer/test_factory.py index 512f5dd9e..080deeb1d 100644 --- a/test/transformer/test_factory.py +++ b/test/transformer/test_factory.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pytest From a002a1a72e981dd264afc436dad657ab9cfd02d9 Mon Sep 17 00:00:00 2001 From: Zero Date: Sat, 28 May 2022 15:01:55 +0800 Subject: [PATCH 2/3] Revert "MAINT: Remove `__futre__`" This reverts commit 7153d7640432fc5300121140ebac3261affba6c4. --- doc/source/conf.py | 2 ++ dtoolkit/accessor/dataframe/cols.py | 2 ++ dtoolkit/accessor/dataframe/decompose.py | 2 ++ dtoolkit/accessor/dataframe/drop_inf.py | 2 ++ dtoolkit/accessor/dataframe/fillna_regression.py | 2 ++ dtoolkit/accessor/dataframe/filter_in.py | 2 ++ dtoolkit/accessor/dataframe/repeat.py | 2 ++ dtoolkit/accessor/dataframe/values_to_dict.py | 2 ++ dtoolkit/accessor/register.py | 4 ++++ dtoolkit/accessor/series/cols.py | 2 ++ dtoolkit/accessor/series/drop_inf.py | 2 ++ dtoolkit/accessor/series/error_report.py | 2 ++ dtoolkit/accessor/series/len.py | 2 ++ dtoolkit/geoaccessor/dataframe/from_wkt.py | 2 ++ dtoolkit/geoaccessor/dataframe/from_xy.py | 2 ++ dtoolkit/geoaccessor/geodataframe/geobuffer.py | 2 ++ dtoolkit/geoaccessor/geoseries/geobuffer.py | 2 ++ dtoolkit/transformer/_util.py | 2 ++ dtoolkit/transformer/factory.py | 2 ++ dtoolkit/transformer/numpy/RavelTF.py | 2 ++ dtoolkit/transformer/sklearn/OneHotEncoder.py | 2 ++ test/transformer/test_factory.py | 2 ++ 22 files changed, 46 insertions(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 1c04f0b95..ef241812d 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,6 +10,8 @@ # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. +from __future__ import annotations + import inspect import os import sys diff --git a/dtoolkit/accessor/dataframe/cols.py b/dtoolkit/accessor/dataframe/cols.py index acf6aae26..9fb965386 100644 --- a/dtoolkit/accessor/dataframe/cols.py +++ b/dtoolkit/accessor/dataframe/cols.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/dataframe/decompose.py b/dtoolkit/accessor/dataframe/decompose.py index 44d57f8aa..e915f2c70 100644 --- a/dtoolkit/accessor/dataframe/decompose.py +++ b/dtoolkit/accessor/dataframe/decompose.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from itertools import chain from typing import TYPE_CHECKING diff --git a/dtoolkit/accessor/dataframe/drop_inf.py b/dtoolkit/accessor/dataframe/drop_inf.py index c9d1d9a3a..3a9c2eb52 100644 --- a/dtoolkit/accessor/dataframe/drop_inf.py +++ b/dtoolkit/accessor/dataframe/drop_inf.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np import pandas as pd from pandas.util._validators import validate_bool_kwarg diff --git a/dtoolkit/accessor/dataframe/fillna_regression.py b/dtoolkit/accessor/dataframe/fillna_regression.py index 2f0cf4678..4a20b336e 100644 --- a/dtoolkit/accessor/dataframe/fillna_regression.py +++ b/dtoolkit/accessor/dataframe/fillna_regression.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from typing import TYPE_CHECKING import pandas as pd diff --git a/dtoolkit/accessor/dataframe/filter_in.py b/dtoolkit/accessor/dataframe/filter_in.py index e548ac0ab..7ef2e6086 100644 --- a/dtoolkit/accessor/dataframe/filter_in.py +++ b/dtoolkit/accessor/dataframe/filter_in.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from typing import Iterable import pandas as pd diff --git a/dtoolkit/accessor/dataframe/repeat.py b/dtoolkit/accessor/dataframe/repeat.py index 8ffe30997..e64ae48cd 100644 --- a/dtoolkit/accessor/dataframe/repeat.py +++ b/dtoolkit/accessor/dataframe/repeat.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np import pandas as pd diff --git a/dtoolkit/accessor/dataframe/values_to_dict.py b/dtoolkit/accessor/dataframe/values_to_dict.py index c8b4e67a3..cd1ceb51f 100644 --- a/dtoolkit/accessor/dataframe/values_to_dict.py +++ b/dtoolkit/accessor/dataframe/values_to_dict.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/register.py b/dtoolkit/accessor/register.py index 107cd178d..8550be4cd 100644 --- a/dtoolkit/accessor/register.py +++ b/dtoolkit/accessor/register.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from functools import wraps from typing import Callable @@ -93,6 +95,8 @@ def register_series_method(name: str = None): -------- In your library code:: + from __future__ import annotations + from dtoolkit.accessor import register_dataframe_method from dtoolkit.accessor import register_series_method from dtoolkit.accessor import register_index_method diff --git a/dtoolkit/accessor/series/cols.py b/dtoolkit/accessor/series/cols.py index b1832dce1..1ed1402d3 100644 --- a/dtoolkit/accessor/series/cols.py +++ b/dtoolkit/accessor/series/cols.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/series/drop_inf.py b/dtoolkit/accessor/series/drop_inf.py index 9f2e87ac6..d5db526f1 100644 --- a/dtoolkit/accessor/series/drop_inf.py +++ b/dtoolkit/accessor/series/drop_inf.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np import pandas as pd from pandas.util._validators import validate_bool_kwarg diff --git a/dtoolkit/accessor/series/error_report.py b/dtoolkit/accessor/series/error_report.py index 6f4d57a8b..c980866bd 100644 --- a/dtoolkit/accessor/series/error_report.py +++ b/dtoolkit/accessor/series/error_report.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pandas as pd from dtoolkit._typing import IntOrStr diff --git a/dtoolkit/accessor/series/len.py b/dtoolkit/accessor/series/len.py index 01273f3bb..f39eec1d3 100644 --- a/dtoolkit/accessor/series/len.py +++ b/dtoolkit/accessor/series/len.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import pandas as pd from pandas.api.types import is_number diff --git a/dtoolkit/geoaccessor/dataframe/from_wkt.py b/dtoolkit/geoaccessor/dataframe/from_wkt.py index 84cd21c56..b73aeedc8 100644 --- a/dtoolkit/geoaccessor/dataframe/from_wkt.py +++ b/dtoolkit/geoaccessor/dataframe/from_wkt.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/dataframe/from_xy.py b/dtoolkit/geoaccessor/dataframe/from_xy.py index 9390df43b..f61d7faae 100644 --- a/dtoolkit/geoaccessor/dataframe/from_xy.py +++ b/dtoolkit/geoaccessor/dataframe/from_xy.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/geobuffer.py b/dtoolkit/geoaccessor/geodataframe/geobuffer.py index f3ebca268..1a32008fb 100644 --- a/dtoolkit/geoaccessor/geodataframe/geobuffer.py +++ b/dtoolkit/geoaccessor/geodataframe/geobuffer.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from textwrap import dedent import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/geobuffer.py b/dtoolkit/geoaccessor/geoseries/geobuffer.py index 3fe482518..6733ecb56 100644 --- a/dtoolkit/geoaccessor/geoseries/geobuffer.py +++ b/dtoolkit/geoaccessor/geoseries/geobuffer.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from textwrap import dedent import geopandas as gpd diff --git a/dtoolkit/transformer/_util.py b/dtoolkit/transformer/_util.py index caceef648..6c8c33107 100644 --- a/dtoolkit/transformer/_util.py +++ b/dtoolkit/transformer/_util.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np import pandas as pd diff --git a/dtoolkit/transformer/factory.py b/dtoolkit/transformer/factory.py index d457567d9..d552e609d 100644 --- a/dtoolkit/transformer/factory.py +++ b/dtoolkit/transformer/factory.py @@ -23,6 +23,8 @@ def methodtf_factory( -------- In your library code:: + from __future__ import annotations + import numpy as np from dtoolkit.transformer.factory import methodtf_factory diff --git a/dtoolkit/transformer/numpy/RavelTF.py b/dtoolkit/transformer/numpy/RavelTF.py index 59a1e2617..ffa3221f0 100644 --- a/dtoolkit/transformer/numpy/RavelTF.py +++ b/dtoolkit/transformer/numpy/RavelTF.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np import pandas as pd diff --git a/dtoolkit/transformer/sklearn/OneHotEncoder.py b/dtoolkit/transformer/sklearn/OneHotEncoder.py index 9251986ad..ac1ea2708 100644 --- a/dtoolkit/transformer/sklearn/OneHotEncoder.py +++ b/dtoolkit/transformer/sklearn/OneHotEncoder.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from textwrap import dedent from typing import TYPE_CHECKING diff --git a/test/transformer/test_factory.py b/test/transformer/test_factory.py index 080deeb1d..512f5dd9e 100644 --- a/test/transformer/test_factory.py +++ b/test/transformer/test_factory.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import numpy as np import pytest From 2061c7176d1fbbb299d2eaa09f81f098dc0a6d9a Mon Sep 17 00:00:00 2001 From: 40% Date: Thu, 22 Feb 2024 13:09:32 +0800 Subject: [PATCH 3/3] remove `__future__` --- doc/source/conf.py | 2 -- doc/source/guide/build_transformer.ipynb | 2 -- doc/source/guide/tips_about_accessor.ipynb | 2 -- dtoolkit/accessor/dataframe/boolean.py | 2 -- dtoolkit/accessor/dataframe/cols.py | 2 -- dtoolkit/accessor/dataframe/decompose.py | 2 -- dtoolkit/accessor/dataframe/drop_inf.py | 2 -- dtoolkit/accessor/dataframe/drop_not_duplicates.py | 2 -- dtoolkit/accessor/dataframe/fillna_regression.py | 2 -- dtoolkit/accessor/dataframe/filter_in.py | 2 -- dtoolkit/accessor/dataframe/repeat.py | 2 -- dtoolkit/accessor/dataframe/top_n.py | 2 -- dtoolkit/accessor/dataframe/values_to_dict.py | 2 -- dtoolkit/accessor/dataframe/weighted_mean.py | 2 -- dtoolkit/accessor/index/len.py | 2 -- dtoolkit/accessor/index/to_set.py | 2 -- dtoolkit/accessor/register.py | 4 ---- dtoolkit/accessor/series/cols.py | 2 -- dtoolkit/accessor/series/drop_inf.py | 2 -- dtoolkit/accessor/series/error_report.py | 2 -- dtoolkit/accessor/series/jenks_breaks.py | 2 -- dtoolkit/accessor/series/textdistance.py | 2 -- dtoolkit/accessor/series/textdistance_matrix.py | 2 -- dtoolkit/accessor/series/top_n.py | 2 -- dtoolkit/geoaccessor/accessor.py | 2 +- dtoolkit/geoaccessor/dataframe/from_wkb.py | 2 -- dtoolkit/geoaccessor/dataframe/from_wkt.py | 2 -- dtoolkit/geoaccessor/dataframe/from_xy.py | 2 -- dtoolkit/geoaccessor/dataframe/geocode.py | 2 -- dtoolkit/geoaccessor/dataframe/to_geoframe.py | 2 -- dtoolkit/geoaccessor/geodataframe/drop_duplicates_geometry.py | 2 -- dtoolkit/geoaccessor/geodataframe/duplicated_geometry.py | 2 -- dtoolkit/geoaccessor/geodataframe/filter_geometry.py | 2 -- dtoolkit/geoaccessor/geodataframe/geobuffer.py | 2 -- dtoolkit/geoaccessor/geodataframe/geocentroid.py | 2 -- dtoolkit/geoaccessor/geodataframe/geodistance.py | 2 -- dtoolkit/geoaccessor/geodataframe/geodistance_matrix.py | 2 -- dtoolkit/geoaccessor/geodataframe/reverse_geocode.py | 2 -- dtoolkit/geoaccessor/geodataframe/toposimplify.py | 2 -- dtoolkit/geoaccessor/geodataframe/voronoi.py | 2 -- dtoolkit/geoaccessor/geodataframe/xy.py | 2 -- dtoolkit/geoaccessor/geoseries/cncrs_offset.py | 2 -- dtoolkit/geoaccessor/geoseries/drop_duplicates_geometry.py | 2 -- dtoolkit/geoaccessor/geoseries/duplicated_geometry.py | 2 -- dtoolkit/geoaccessor/geoseries/filter_geometry.py | 2 -- dtoolkit/geoaccessor/geoseries/geobuffer.py | 2 -- dtoolkit/geoaccessor/geoseries/geodistance.py | 2 -- dtoolkit/geoaccessor/geoseries/geodistance_matrix.py | 2 -- dtoolkit/geoaccessor/geoseries/reverse_geocode.py | 2 -- dtoolkit/geoaccessor/geoseries/select_geom_type.py | 2 -- dtoolkit/geoaccessor/geoseries/toposimplify.py | 2 -- dtoolkit/geoaccessor/geoseries/voronoi.py | 2 -- dtoolkit/geoaccessor/geoseries/xy.py | 2 -- dtoolkit/geoaccessor/index/is_h3.py | 2 -- dtoolkit/geoaccessor/register.py | 2 +- dtoolkit/geoaccessor/series/from_wkb.py | 2 -- dtoolkit/geoaccessor/series/from_wkt.py | 2 -- dtoolkit/geoaccessor/series/geocode.py | 2 -- dtoolkit/geoaccessor/series/to_geoframe.py | 2 -- dtoolkit/geoaccessor/series/to_geoseries.py | 2 -- dtoolkit/pipeline.py | 2 -- dtoolkit/transformer/_util.py | 2 -- dtoolkit/transformer/factory.py | 2 +- dtoolkit/transformer/numpy/RavelTF.py | 2 -- dtoolkit/transformer/sklearn/OneHotEncoder.py | 2 -- dtoolkit/util/parallelize.py | 2 -- test/geoaccessor/test_register.py | 2 -- test/transformer/test_factory.py | 2 -- 68 files changed, 3 insertions(+), 135 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index f48fa8209..7dc92528a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,8 +10,6 @@ # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -from __future__ import annotations - import inspect import os import sys diff --git a/doc/source/guide/build_transformer.ipynb b/doc/source/guide/build_transformer.ipynb index 3a44c5541..778aade43 100644 --- a/doc/source/guide/build_transformer.ipynb +++ b/doc/source/guide/build_transformer.ipynb @@ -20,8 +20,6 @@ "metadata": {}, "outputs": [], "source": [ - "from __future__ import annotations\n", - "\n", "import numpy as np\n", "\n", "from dtoolkit.transformer.factory import methodtf_factory" diff --git a/doc/source/guide/tips_about_accessor.ipynb b/doc/source/guide/tips_about_accessor.ipynb index e41e23d0a..90a3bdede 100644 --- a/doc/source/guide/tips_about_accessor.ipynb +++ b/doc/source/guide/tips_about_accessor.ipynb @@ -57,8 +57,6 @@ "metadata": {}, "outputs": [], "source": [ - "from __future__ import annotations\n", - "\n", "import pandas as pd\n", "import numpy as np\n", "\n", diff --git a/dtoolkit/accessor/dataframe/boolean.py b/dtoolkit/accessor/dataframe/boolean.py index 9f387b388..0d876ad40 100644 --- a/dtoolkit/accessor/dataframe/boolean.py +++ b/dtoolkit/accessor/dataframe/boolean.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import pandas as pd diff --git a/dtoolkit/accessor/dataframe/cols.py b/dtoolkit/accessor/dataframe/cols.py index 37ecb72be..34e9d669c 100644 --- a/dtoolkit/accessor/dataframe/cols.py +++ b/dtoolkit/accessor/dataframe/cols.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import pandas as pd diff --git a/dtoolkit/accessor/dataframe/decompose.py b/dtoolkit/accessor/dataframe/decompose.py index 6744bdb65..28fec42fa 100644 --- a/dtoolkit/accessor/dataframe/decompose.py +++ b/dtoolkit/accessor/dataframe/decompose.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/accessor/dataframe/drop_inf.py b/dtoolkit/accessor/dataframe/drop_inf.py index cb59160d6..dc74fc0bf 100644 --- a/dtoolkit/accessor/dataframe/drop_inf.py +++ b/dtoolkit/accessor/dataframe/drop_inf.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import numpy as np diff --git a/dtoolkit/accessor/dataframe/drop_not_duplicates.py b/dtoolkit/accessor/dataframe/drop_not_duplicates.py index 96b914811..55579250c 100644 --- a/dtoolkit/accessor/dataframe/drop_not_duplicates.py +++ b/dtoolkit/accessor/dataframe/drop_not_duplicates.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import Literal from typing import Sequence diff --git a/dtoolkit/accessor/dataframe/fillna_regression.py b/dtoolkit/accessor/dataframe/fillna_regression.py index 822c9d0b5..66266b216 100644 --- a/dtoolkit/accessor/dataframe/fillna_regression.py +++ b/dtoolkit/accessor/dataframe/fillna_regression.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import Literal from typing import TYPE_CHECKING diff --git a/dtoolkit/accessor/dataframe/filter_in.py b/dtoolkit/accessor/dataframe/filter_in.py index 869067111..008e8b4c2 100644 --- a/dtoolkit/accessor/dataframe/filter_in.py +++ b/dtoolkit/accessor/dataframe/filter_in.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import Iterable from typing import Literal diff --git a/dtoolkit/accessor/dataframe/repeat.py b/dtoolkit/accessor/dataframe/repeat.py index 5efb6b01b..112016ce0 100644 --- a/dtoolkit/accessor/dataframe/repeat.py +++ b/dtoolkit/accessor/dataframe/repeat.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import pandas as pd diff --git a/dtoolkit/accessor/dataframe/top_n.py b/dtoolkit/accessor/dataframe/top_n.py index 006e5cc3d..108ccac49 100644 --- a/dtoolkit/accessor/dataframe/top_n.py +++ b/dtoolkit/accessor/dataframe/top_n.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import pandas as pd diff --git a/dtoolkit/accessor/dataframe/values_to_dict.py b/dtoolkit/accessor/dataframe/values_to_dict.py index 219b36fe6..a29b3419b 100644 --- a/dtoolkit/accessor/dataframe/values_to_dict.py +++ b/dtoolkit/accessor/dataframe/values_to_dict.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import pandas as pd diff --git a/dtoolkit/accessor/dataframe/weighted_mean.py b/dtoolkit/accessor/dataframe/weighted_mean.py index b120eb5d3..50002eb9e 100644 --- a/dtoolkit/accessor/dataframe/weighted_mean.py +++ b/dtoolkit/accessor/dataframe/weighted_mean.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import pandas as pd diff --git a/dtoolkit/accessor/index/len.py b/dtoolkit/accessor/index/len.py index 7539c02e5..6feebd8ca 100644 --- a/dtoolkit/accessor/index/len.py +++ b/dtoolkit/accessor/index/len.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import partial import pandas as pd diff --git a/dtoolkit/accessor/index/to_set.py b/dtoolkit/accessor/index/to_set.py index ed73c28c2..dedbd0390 100644 --- a/dtoolkit/accessor/index/to_set.py +++ b/dtoolkit/accessor/index/to_set.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import pandas as pd diff --git a/dtoolkit/accessor/register.py b/dtoolkit/accessor/register.py index 7a9142b4e..0e5963b3a 100644 --- a/dtoolkit/accessor/register.py +++ b/dtoolkit/accessor/register.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import wraps from typing import Callable @@ -96,8 +94,6 @@ def register_series_method(name: str = None): -------- In your library code:: - from __future__ import annotations - from dtoolkit.accessor import register_dataframe_method from dtoolkit.accessor import register_series_method from dtoolkit.accessor import register_index_method diff --git a/dtoolkit/accessor/series/cols.py b/dtoolkit/accessor/series/cols.py index d2c39c256..9ad1c0e0d 100644 --- a/dtoolkit/accessor/series/cols.py +++ b/dtoolkit/accessor/series/cols.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import pandas as pd diff --git a/dtoolkit/accessor/series/drop_inf.py b/dtoolkit/accessor/series/drop_inf.py index 796cedc33..56fc61ceb 100644 --- a/dtoolkit/accessor/series/drop_inf.py +++ b/dtoolkit/accessor/series/drop_inf.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import numpy as np diff --git a/dtoolkit/accessor/series/error_report.py b/dtoolkit/accessor/series/error_report.py index 5239372fb..a8a402db7 100644 --- a/dtoolkit/accessor/series/error_report.py +++ b/dtoolkit/accessor/series/error_report.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit._typing import Number diff --git a/dtoolkit/accessor/series/jenks_breaks.py b/dtoolkit/accessor/series/jenks_breaks.py index 55a11dae4..e2ee06ee0 100644 --- a/dtoolkit/accessor/series/jenks_breaks.py +++ b/dtoolkit/accessor/series/jenks_breaks.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import pandas as pd from dtoolkit.accessor.register import register_series_method diff --git a/dtoolkit/accessor/series/textdistance.py b/dtoolkit/accessor/series/textdistance.py index 31ea2761e..b1e9c2d9a 100644 --- a/dtoolkit/accessor/series/textdistance.py +++ b/dtoolkit/accessor/series/textdistance.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import lru_cache from typing import Callable from warnings import warn diff --git a/dtoolkit/accessor/series/textdistance_matrix.py b/dtoolkit/accessor/series/textdistance_matrix.py index cd21ff5d6..b9ba85fe6 100644 --- a/dtoolkit/accessor/series/textdistance_matrix.py +++ b/dtoolkit/accessor/series/textdistance_matrix.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Callable import pandas as pd diff --git a/dtoolkit/accessor/series/top_n.py b/dtoolkit/accessor/series/top_n.py index cf3890072..cf19767fa 100644 --- a/dtoolkit/accessor/series/top_n.py +++ b/dtoolkit/accessor/series/top_n.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import pandas as pd diff --git a/dtoolkit/geoaccessor/accessor.py b/dtoolkit/geoaccessor/accessor.py index acd8780cc..25a3e3ef4 100644 --- a/dtoolkit/geoaccessor/accessor.py +++ b/dtoolkit/geoaccessor/accessor.py @@ -55,7 +55,7 @@ def __init__(self, geopandas_object): # noqa: E999 -------- In your library code:: - from __future__ import annotations + from dataclasses import dataclass diff --git a/dtoolkit/geoaccessor/dataframe/from_wkb.py b/dtoolkit/geoaccessor/dataframe/from_wkb.py index 4f7914120..1d4a75800 100644 --- a/dtoolkit/geoaccessor/dataframe/from_wkb.py +++ b/dtoolkit/geoaccessor/dataframe/from_wkb.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/dataframe/from_wkt.py b/dtoolkit/geoaccessor/dataframe/from_wkt.py index 8e80fb599..ce0cd5a75 100644 --- a/dtoolkit/geoaccessor/dataframe/from_wkt.py +++ b/dtoolkit/geoaccessor/dataframe/from_wkt.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/dataframe/from_xy.py b/dtoolkit/geoaccessor/dataframe/from_xy.py index a8e35ecc3..728af5be2 100644 --- a/dtoolkit/geoaccessor/dataframe/from_xy.py +++ b/dtoolkit/geoaccessor/dataframe/from_xy.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/dataframe/geocode.py b/dtoolkit/geoaccessor/dataframe/geocode.py index 4cbbe3de1..48e6f2369 100644 --- a/dtoolkit/geoaccessor/dataframe/geocode.py +++ b/dtoolkit/geoaccessor/dataframe/geocode.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/dataframe/to_geoframe.py b/dtoolkit/geoaccessor/dataframe/to_geoframe.py index 41c5a8a51..e31194977 100644 --- a/dtoolkit/geoaccessor/dataframe/to_geoframe.py +++ b/dtoolkit/geoaccessor/dataframe/to_geoframe.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/geodataframe/drop_duplicates_geometry.py b/dtoolkit/geoaccessor/geodataframe/drop_duplicates_geometry.py index d9f1384e7..d6ecfe60e 100644 --- a/dtoolkit/geoaccessor/geodataframe/drop_duplicates_geometry.py +++ b/dtoolkit/geoaccessor/geodataframe/drop_duplicates_geometry.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/duplicated_geometry.py b/dtoolkit/geoaccessor/geodataframe/duplicated_geometry.py index b48c1e006..e8f1fc1ba 100644 --- a/dtoolkit/geoaccessor/geodataframe/duplicated_geometry.py +++ b/dtoolkit/geoaccessor/geodataframe/duplicated_geometry.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/filter_geometry.py b/dtoolkit/geoaccessor/geodataframe/filter_geometry.py index 35edf45db..6d0e94073 100644 --- a/dtoolkit/geoaccessor/geodataframe/filter_geometry.py +++ b/dtoolkit/geoaccessor/geodataframe/filter_geometry.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/geobuffer.py b/dtoolkit/geoaccessor/geodataframe/geobuffer.py index d24d3e5e6..9e43bb481 100644 --- a/dtoolkit/geoaccessor/geodataframe/geobuffer.py +++ b/dtoolkit/geoaccessor/geodataframe/geobuffer.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/geocentroid.py b/dtoolkit/geoaccessor/geodataframe/geocentroid.py index 36a4c0f4f..0f5dab311 100644 --- a/dtoolkit/geoaccessor/geodataframe/geocentroid.py +++ b/dtoolkit/geoaccessor/geodataframe/geocentroid.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/geodistance.py b/dtoolkit/geoaccessor/geodataframe/geodistance.py index 56661edd3..ba3b56f1d 100644 --- a/dtoolkit/geoaccessor/geodataframe/geodistance.py +++ b/dtoolkit/geoaccessor/geodataframe/geodistance.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import geopandas as gpd import pandas as pd from pandas.util._decorators import doc diff --git a/dtoolkit/geoaccessor/geodataframe/geodistance_matrix.py b/dtoolkit/geoaccessor/geodataframe/geodistance_matrix.py index 4f9caf9d2..1d93a77cf 100644 --- a/dtoolkit/geoaccessor/geodataframe/geodistance_matrix.py +++ b/dtoolkit/geoaccessor/geodataframe/geodistance_matrix.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import geopandas as gpd import pandas as pd from pandas.util._decorators import doc diff --git a/dtoolkit/geoaccessor/geodataframe/reverse_geocode.py b/dtoolkit/geoaccessor/geodataframe/reverse_geocode.py index 4b0bd5272..698720058 100644 --- a/dtoolkit/geoaccessor/geodataframe/reverse_geocode.py +++ b/dtoolkit/geoaccessor/geodataframe/reverse_geocode.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/geodataframe/toposimplify.py b/dtoolkit/geoaccessor/geodataframe/toposimplify.py index 87970fe8d..448b90206 100644 --- a/dtoolkit/geoaccessor/geodataframe/toposimplify.py +++ b/dtoolkit/geoaccessor/geodataframe/toposimplify.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/voronoi.py b/dtoolkit/geoaccessor/geodataframe/voronoi.py index 91cf9085b..56dae47cf 100644 --- a/dtoolkit/geoaccessor/geodataframe/voronoi.py +++ b/dtoolkit/geoaccessor/geodataframe/voronoi.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geodataframe/xy.py b/dtoolkit/geoaccessor/geodataframe/xy.py index 207f19f2e..0ec1ad446 100644 --- a/dtoolkit/geoaccessor/geodataframe/xy.py +++ b/dtoolkit/geoaccessor/geodataframe/xy.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/cncrs_offset.py b/dtoolkit/geoaccessor/geoseries/cncrs_offset.py index 75a29a017..ed3dbd9e6 100644 --- a/dtoolkit/geoaccessor/geoseries/cncrs_offset.py +++ b/dtoolkit/geoaccessor/geoseries/cncrs_offset.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import get_args from typing import Literal diff --git a/dtoolkit/geoaccessor/geoseries/drop_duplicates_geometry.py b/dtoolkit/geoaccessor/geoseries/drop_duplicates_geometry.py index a61004748..b6a70ac52 100644 --- a/dtoolkit/geoaccessor/geoseries/drop_duplicates_geometry.py +++ b/dtoolkit/geoaccessor/geoseries/drop_duplicates_geometry.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/duplicated_geometry.py b/dtoolkit/geoaccessor/geoseries/duplicated_geometry.py index 340327668..417883ff2 100644 --- a/dtoolkit/geoaccessor/geoseries/duplicated_geometry.py +++ b/dtoolkit/geoaccessor/geoseries/duplicated_geometry.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/filter_geometry.py b/dtoolkit/geoaccessor/geoseries/filter_geometry.py index 05e491d8b..28cfe56ab 100644 --- a/dtoolkit/geoaccessor/geoseries/filter_geometry.py +++ b/dtoolkit/geoaccessor/geoseries/filter_geometry.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import get_args from typing import Literal from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/geoseries/geobuffer.py b/dtoolkit/geoaccessor/geoseries/geobuffer.py index 1c99a4f70..37443bece 100644 --- a/dtoolkit/geoaccessor/geoseries/geobuffer.py +++ b/dtoolkit/geoaccessor/geoseries/geobuffer.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from warnings import catch_warnings from warnings import simplefilter diff --git a/dtoolkit/geoaccessor/geoseries/geodistance.py b/dtoolkit/geoaccessor/geoseries/geodistance.py index fa25649b4..66c38ae4f 100644 --- a/dtoolkit/geoaccessor/geoseries/geodistance.py +++ b/dtoolkit/geoaccessor/geoseries/geodistance.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from warnings import warn import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/geodistance_matrix.py b/dtoolkit/geoaccessor/geoseries/geodistance_matrix.py index 5b3c025ad..db9a0ebf5 100644 --- a/dtoolkit/geoaccessor/geoseries/geodistance_matrix.py +++ b/dtoolkit/geoaccessor/geoseries/geodistance_matrix.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import geopandas as gpd import numpy as np import pandas as pd diff --git a/dtoolkit/geoaccessor/geoseries/reverse_geocode.py b/dtoolkit/geoaccessor/geoseries/reverse_geocode.py index e8fac6ef1..f86082989 100644 --- a/dtoolkit/geoaccessor/geoseries/reverse_geocode.py +++ b/dtoolkit/geoaccessor/geoseries/reverse_geocode.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/geoseries/select_geom_type.py b/dtoolkit/geoaccessor/geoseries/select_geom_type.py index e12d36475..0fd281fd0 100644 --- a/dtoolkit/geoaccessor/geoseries/select_geom_type.py +++ b/dtoolkit/geoaccessor/geoseries/select_geom_type.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/toposimplify.py b/dtoolkit/geoaccessor/geoseries/toposimplify.py index 654701d93..df773fffe 100644 --- a/dtoolkit/geoaccessor/geoseries/toposimplify.py +++ b/dtoolkit/geoaccessor/geoseries/toposimplify.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Literal import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/voronoi.py b/dtoolkit/geoaccessor/geoseries/voronoi.py index 2e0161047..205a20d41 100644 --- a/dtoolkit/geoaccessor/geoseries/voronoi.py +++ b/dtoolkit/geoaccessor/geoseries/voronoi.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/geoseries/xy.py b/dtoolkit/geoaccessor/geoseries/xy.py index 3cf2180a1..023b7e640 100644 --- a/dtoolkit/geoaccessor/geoseries/xy.py +++ b/dtoolkit/geoaccessor/geoseries/xy.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable import geopandas as gpd diff --git a/dtoolkit/geoaccessor/index/is_h3.py b/dtoolkit/geoaccessor/index/is_h3.py index abc547460..b4823436c 100644 --- a/dtoolkit/geoaccessor/index/is_h3.py +++ b/dtoolkit/geoaccessor/index/is_h3.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import partial import pandas as pd diff --git a/dtoolkit/geoaccessor/register.py b/dtoolkit/geoaccessor/register.py index 59be1f647..188d5133a 100644 --- a/dtoolkit/geoaccessor/register.py +++ b/dtoolkit/geoaccessor/register.py @@ -29,7 +29,7 @@ def register_geoseries_method(name: str = None): -------- In your library code:: - from __future__ import annotations + import geopandas as gpd import pandas as pd diff --git a/dtoolkit/geoaccessor/series/from_wkb.py b/dtoolkit/geoaccessor/series/from_wkb.py index 5e7faf39d..b8297af81 100644 --- a/dtoolkit/geoaccessor/series/from_wkb.py +++ b/dtoolkit/geoaccessor/series/from_wkb.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/series/from_wkt.py b/dtoolkit/geoaccessor/series/from_wkt.py index 8894acc69..0c7489c30 100644 --- a/dtoolkit/geoaccessor/series/from_wkt.py +++ b/dtoolkit/geoaccessor/series/from_wkt.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/series/geocode.py b/dtoolkit/geoaccessor/series/geocode.py index 11c2fdddf..6c13095dd 100644 --- a/dtoolkit/geoaccessor/series/geocode.py +++ b/dtoolkit/geoaccessor/series/geocode.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import Hashable from typing import TYPE_CHECKING diff --git a/dtoolkit/geoaccessor/series/to_geoframe.py b/dtoolkit/geoaccessor/series/to_geoframe.py index be963e16b..a627ae381 100644 --- a/dtoolkit/geoaccessor/series/to_geoframe.py +++ b/dtoolkit/geoaccessor/series/to_geoframe.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/geoaccessor/series/to_geoseries.py b/dtoolkit/geoaccessor/series/to_geoseries.py index 097b147ae..19f167d7b 100644 --- a/dtoolkit/geoaccessor/series/to_geoseries.py +++ b/dtoolkit/geoaccessor/series/to_geoseries.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import TYPE_CHECKING import geopandas as gpd diff --git a/dtoolkit/pipeline.py b/dtoolkit/pipeline.py index 731e8c305..8b8a83de7 100644 --- a/dtoolkit/pipeline.py +++ b/dtoolkit/pipeline.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd from pandas.util._decorators import doc diff --git a/dtoolkit/transformer/_util.py b/dtoolkit/transformer/_util.py index f3d88e9b4..c78afff35 100644 --- a/dtoolkit/transformer/_util.py +++ b/dtoolkit/transformer/_util.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd diff --git a/dtoolkit/transformer/factory.py b/dtoolkit/transformer/factory.py index d552e609d..648873605 100644 --- a/dtoolkit/transformer/factory.py +++ b/dtoolkit/transformer/factory.py @@ -23,7 +23,7 @@ def methodtf_factory( -------- In your library code:: - from __future__ import annotations + import numpy as np diff --git a/dtoolkit/transformer/numpy/RavelTF.py b/dtoolkit/transformer/numpy/RavelTF.py index ffa3221f0..59a1e2617 100644 --- a/dtoolkit/transformer/numpy/RavelTF.py +++ b/dtoolkit/transformer/numpy/RavelTF.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pandas as pd diff --git a/dtoolkit/transformer/sklearn/OneHotEncoder.py b/dtoolkit/transformer/sklearn/OneHotEncoder.py index 2e02949f5..598d61bea 100644 --- a/dtoolkit/transformer/sklearn/OneHotEncoder.py +++ b/dtoolkit/transformer/sklearn/OneHotEncoder.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from textwrap import dedent from typing import Literal from typing import TYPE_CHECKING diff --git a/dtoolkit/util/parallelize.py b/dtoolkit/util/parallelize.py index 5ec61e2f5..68a138481 100644 --- a/dtoolkit/util/parallelize.py +++ b/dtoolkit/util/parallelize.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from functools import partial from typing import Callable from typing import Iterable diff --git a/test/geoaccessor/test_register.py b/test/geoaccessor/test_register.py index cb43be328..3563d0b56 100644 --- a/test/geoaccessor/test_register.py +++ b/test/geoaccessor/test_register.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import geopandas as gpd import pandas as pd import pytest diff --git a/test/transformer/test_factory.py b/test/transformer/test_factory.py index 512f5dd9e..080deeb1d 100644 --- a/test/transformer/test_factory.py +++ b/test/transformer/test_factory.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import numpy as np import pytest