Skip to content

Commit

Permalink
Merge pull request #6559 from PrimozGodec/adapt-to-pandas-2.1
Browse files Browse the repository at this point in the history
[FIX] Adapt to newly released pandas 2.1
  • Loading branch information
PrimozGodec authored Aug 30, 2023
2 parents 0a9c762 + 4942598 commit 823b650
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion Orange/data/pandas_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
from unittest.mock import patch

import numpy as np
from pandas import SparseDtype
from scipy import sparse as sp
from scipy.sparse import csr_matrix
import pandas as pd
from pandas.core.arrays import SparseArray
from pandas.core.arrays.sparse.dtype import SparseDtype
from pandas.api.types import (
is_categorical_dtype, is_object_dtype,
is_datetime64_any_dtype, is_numeric_dtype, is_integer_dtype
Expand Down
5 changes: 0 additions & 5 deletions Orange/data/tests/test_pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,6 @@ def test_table_from_frame_date(self):
self.assertEqual(table.domain.variables[0].have_time, 0)
self.assertEqual(table.domain.variables[0].have_date, 1)

@skipIf(
datetime.today() < datetime(2023, 10, 1),
"Temporarily skipping because of pandas issue",
)
# https://github.com/pandas-dev/pandas/issues/53134#issuecomment-1546011517
def test_table_from_frame_time(self):
df = pd.DataFrame(
[[pd.Timestamp("00:00:00.25")], [pd.Timestamp("20:20:20.30")], [np.nan]]
Expand Down

0 comments on commit 823b650

Please sign in to comment.