Skip to content

Commit 153ec91

Browse files
update to newer version of pandas and associated code changes
1 parent df7ad2c commit 153ec91

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
numpy>=1.20.3 # For compatibility with recent versions of Pandas
2-
pandas>=1.0.3
1+
numpy>=1.23.5 # For compatibility with recent versions of Pandas
2+
pandas>=2.2.3
33
pyarrow>=1.0.0
44
regex
55
# TODO: The following dependency is to support compatibility with Python 3.6, and should be removed when that version's support is dropped

text_extensions_for_pandas/array/tensor.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
from pandas.core.dtypes.generic import ABCIndexClass as ABCIndex
3939
from pandas.core.indexers import check_array_indexer, validate_indices
4040

41-
""" Begin Patching of ExtensionArrayFormatter """
42-
from pandas.io.formats.format import ExtensionArrayFormatter
41+
""" Begin Patching of _ExtensionArrayFormatter """
42+
from pandas.io.formats.format import _ExtensionArrayFormatter
4343

4444

4545
def _format_strings_patched(self) -> List[str]:
@@ -147,14 +147,14 @@ def _format(x):
147147
_FORMATTER_ENABLED_KEY = "TEXT_EXTENSIONS_FOR_PANDAS_FORMATTER_ENABLED"
148148

149149
if os.getenv(_FORMATTER_ENABLED_KEY, "true").lower() == "true":
150-
ExtensionArrayFormatter._format_strings_orig = \
151-
ExtensionArrayFormatter._format_strings
150+
_ExtensionArrayFormatter._format_strings_orig = \
151+
_ExtensionArrayFormatter._format_strings
152152
if Version("1.1.0") <= Version(pd.__version__) < Version("1.3.0"):
153-
ExtensionArrayFormatter._format_strings = _format_strings_patched
153+
_ExtensionArrayFormatter._format_strings = _format_strings_patched
154154
else:
155-
ExtensionArrayFormatter._format_strings = _format_strings_patched_v1_0_0
156-
ExtensionArrayFormatter._patched_by_text_extensions_for_pandas = True
157-
""" End Patching of ExtensionArrayFormatter """
155+
_ExtensionArrayFormatter._format_strings = _format_strings_patched_v1_0_0
156+
_ExtensionArrayFormatter._patched_by_text_extensions_for_pandas = True
157+
""" End Patching of _ExtensionArrayFormatter """
158158

159159

160160
@pd.api.extensions.register_extension_dtype

text_extensions_for_pandas/array/test_tensor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -703,9 +703,9 @@ def test_large_display_numeric(self):
703703
def test_numeric_display_3D(self):
704704

705705
# Verify using patched method
706-
from pandas.io.formats.format import ExtensionArrayFormatter
706+
from pandas.io.formats.format import _ExtensionArrayFormatter
707707
self.assertTrue(
708-
ExtensionArrayFormatter._patched_by_text_extensions_for_pandas)
708+
_ExtensionArrayFormatter._patched_by_text_extensions_for_pandas)
709709

710710
# Test integer format 3D values, uses IntArrayFormatter
711711
df = pd.DataFrame({"foo": TensorArray([[[1, 1], [2, 2]],
@@ -737,9 +737,9 @@ def test_large_display_string(self):
737737

738738
# Verify using patched method
739739
# Unpatched method doesn't work for Pandas 1.0.x but fixed in later versions
740-
from pandas.io.formats.format import ExtensionArrayFormatter
740+
from pandas.io.formats.format import _ExtensionArrayFormatter
741741
self.assertTrue(
742-
ExtensionArrayFormatter._patched_by_text_extensions_for_pandas)
742+
_ExtensionArrayFormatter._patched_by_text_extensions_for_pandas)
743743

744744
# Uses the GenericArrayFormatter
745745
df = pd.DataFrame({"foo": TensorArray(np.array([["Hello", "world"]] * 100))})
@@ -767,9 +767,9 @@ def test_large_display_string(self):
767767
def test_display_time(self):
768768

769769
# Verify using patched method
770-
from pandas.io.formats.format import ExtensionArrayFormatter
770+
from pandas.io.formats.format import _ExtensionArrayFormatter
771771
self.assertTrue(
772-
ExtensionArrayFormatter._patched_by_text_extensions_for_pandas)
772+
_ExtensionArrayFormatter._patched_by_text_extensions_for_pandas)
773773

774774
# datetime64 2D, Uses Datetime64Formatter
775775
times = pd.date_range('2018-01-01', periods=5, freq='H').to_numpy()

text_extensions_for_pandas/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ def to_int_array(arr: Any) -> np.ndarray:
7676
if isinstance(arr, np.ndarray) and np.issubdtype(arr.dtype, np.integer):
7777
return arr # Avoid making a copy even if the input is an unusual integer dtype
7878
else:
79-
return np.array(arr, dtype=np.int32, copy=False)
79+
return np.asarray(arr, dtype=np.int32)

0 commit comments

Comments
 (0)