diff --git a/AUTHORS.md b/AUTHORS.md index 6efebccb8..b59812dad 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -108,5 +108,7 @@ Contributors - [@gahjelle](https://github.com/gahjelle) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Agahjelle) - [@ethompsy](https://github.com/ethompsy) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Aethompsy) - [@apatao](https://github.com/apatao) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Aapatao) -- [@OdinTech3](https://github.com/OdinTech3) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/pull/1094) -- [@asmirnov69](https://github.com/asmirnov69) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues/1059) +- [@OdinTech3](https://github.com/OdinTech3) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%OdinTech3) +- [@asmirnov69](https://github.com/asmirnov69) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%asmirnov69) +- [@xujiboy](https://github.com/xujiboy) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%xujiboy) +- [@joranbeasley](https://github.com/joranbeasley) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%joranbeasley) diff --git a/CHANGELOG.md b/CHANGELOG.md index 019bdbca9..04e46020f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [INF] Replace `pytest.ini` file with `pyproject.toml` file. PR #1204 @Zeroto521 - [INF] Extract docstrings tests from all tests. PR #1205 @Zeroto521 +- [BUG] address the `TypeError` when importing v0.24.0 (issue #1201 @xujiboy and @joranbeasley) ## [v0.24.0] - 2022-11-12 diff --git a/janitor/functions/conditional_join.py b/janitor/functions/conditional_join.py index 5a0fe2b6a..dff1e16c0 100644 --- a/janitor/functions/conditional_join.py +++ b/janitor/functions/conditional_join.py @@ -1,7 +1,7 @@ +from __future__ import annotations import operator from enum import Enum from typing import Union, Any, Optional, Hashable, Literal - import numpy as np import pandas as pd import pandas_flavor as pf diff --git a/janitor/functions/utils.py b/janitor/functions/utils.py index f51fe9962..e60a38b05 100644 --- a/janitor/functions/utils.py +++ b/janitor/functions/utils.py @@ -1,4 +1,6 @@ """Utility functions for all of the functions submodule.""" + +from __future__ import annotations import fnmatch import warnings from collections.abc import Callable as dispatch_callable diff --git a/janitor/utils.py b/janitor/utils.py index 3101bed0f..1254c8946 100644 --- a/janitor/utils.py +++ b/janitor/utils.py @@ -3,10 +3,11 @@ Lazy loading used here to speed up imports. """ +from __future__ import annotations import os import sys import socket -from typing import Callable, Dict, Iterable, Union +from typing import Callable, Dict, Iterable, Union, List from functools import singledispatch, wraps from warnings import warn @@ -213,7 +214,7 @@ def idempotent(func: Callable, df: pd.DataFrame, *args, **kwargs): def deprecated_kwargs( - *arguments: list[str], + *arguments: List[str], message: str = ( "The keyword argument '{argument}' of '{func_name}' is deprecated." ),