summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHernan Grecco <hgrecco@gmail.com>2023-05-12 18:44:25 -0300
committerHernan Grecco <hgrecco@gmail.com>2023-05-12 18:44:25 -0300
commitaaac228fbdb2fc0d9f0f5431efc2252e3f9bbb80 (patch)
tree786103bf9aa6a7df59a9c4ca8b39e9800c83048d
parent70d7ceefbc9dbe40703c85154adb3c4d3961ba25 (diff)
parentea4bfbb4f112c5ad491ff417583a8cddfb2f1c13 (diff)
downloadpint-aaac228fbdb2fc0d9f0f5431efc2252e3f9bbb80.tar.gz
Merge branch 'master' of github.com:hgrecco/pint
-rw-r--r--pint/compat.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pint/compat.py b/pint/compat.py
index 5998fa4..f4ffeae 100644
--- a/pint/compat.py
+++ b/pint/compat.py
@@ -215,12 +215,12 @@ except ImportError:
#: List upcast type names
upcast_type_names = (
- "pint_pandas.PintArray",
- "pandas.Series",
+ "pint_pandas.pint_array.PintArray",
"xarray.core.dataarray.DataArray",
"xarray.core.dataset.Dataset",
"xarray.core.variable.Variable",
"pandas.core.series.Series",
+ "pandas.core.frame.DataFrame",
"xarray.core.dataarray.DataArray",
)