Skip to content

Commit

Permalink
Remove get_column workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
PrimozGodec committed Mar 19, 2024
1 parent 4e61945 commit 7cbea82
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 39 deletions.
17 changes: 0 additions & 17 deletions orangecontrib/survival_analysis/__init__.py
Original file line number Diff line number Diff line change
@@ -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
18 changes: 0 additions & 18 deletions orangecontrib/survival_analysis/tests/test_deprecation.py

This file was deleted.

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ setup_requires =
setuptools>=42.0
setuptools-scm
install_requires =
Orange3>=3.32.0
Orange3>=3.34.0
lifelines
statsmodels

Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7cbea82

Please sign in to comment.