diff --git a/orangecontrib/survival_analysis/__init__.py b/orangecontrib/survival_analysis/__init__.py index 596063e..21fbee4 100644 --- a/orangecontrib/survival_analysis/__init__.py +++ b/orangecontrib/survival_analysis/__init__.py @@ -1,18 +1 @@ -from Orange.data import Table - from .evaluation import scoring # noqa: F401 - -# Remove this when we require Orange 3.34 -if not hasattr(Table, "get_column"): - import scipy.sparse as sp - import numpy as np - - def get_column(self, column): - col, _ = self.get_column_view(column) - if sp.issparse(col): - col = col.toarray().reshape(-1) - if self.domain[column].is_primitive(): - col = col.astype(np.float64) - return col - - Table.get_column = get_column diff --git a/orangecontrib/survival_analysis/tests/test_deprecation.py b/orangecontrib/survival_analysis/tests/test_deprecation.py deleted file mode 100644 index f922304..0000000 --- a/orangecontrib/survival_analysis/tests/test_deprecation.py +++ /dev/null @@ -1,18 +0,0 @@ -import unittest - - -class TestDeprecations(unittest.TestCase): - def test_remove_get_column_workaround(self): - """ - When this tests start to fail: - 1. remove this test - 2. set minimum version of Orange to 3.34 if not set yet - 3. remove workaround from __inint__.py - """ - from datetime import datetime - - self.assertLess(datetime.today(), datetime(2024, 1, 1)) - - -if __name__ == "__main__": - unittest.main() diff --git a/setup.cfg b/setup.cfg index 9b983af..8e8ed9e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,7 +25,7 @@ setup_requires = setuptools>=42.0 setuptools-scm install_requires = - Orange3>=3.32.0 + Orange3>=3.34.0 lifelines statsmodels diff --git a/tox.ini b/tox.ini index ef6514d..59effcf 100644 --- a/tox.ini +++ b/tox.ini @@ -22,10 +22,10 @@ deps = {env:PYQT_PYPI_NAME:PyQt5}=={env:PYQT_PYPI_VERSION:5.15.*} {env:WEBENGINE_PYPI_NAME:PyQtWebEngine}=={env:WEBENGINE_PYPI_VERSION:5.15.*} oldest: scikit-learn==1.0.1 - oldest: orange3==3.32.0 + oldest: orange3==3.34.0 # Use newer canvas-core and widget-base to avoid segfaults on windows - oldest: orange-canvas-core==0.1.24 - oldest: orange-widget-base==4.16.1 + oldest: orange-canvas-core==0.1.28 + oldest: orange-widget-base==4.19.0 oldest: pandas==1.3 latest: git+https://github.com/biolab/orange3.git#egg=orange3 latest: git+https://github.com/biolab/orange-canvas-core.git#egg=orange-canvas-core