From efb200ac5e236defc0cd59b1be1bfe0a155f3719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Royer?= Date: Fri, 16 Aug 2024 19:39:25 +0200 Subject: [PATCH 1/2] Remove mention of former `compat` modules --- river/conftest.py | 6 ------ river/test_estimators.py | 9 --------- 2 files changed, 15 deletions(-) diff --git a/river/conftest.py b/river/conftest.py index e8c824541e..8ea097838f 100644 --- a/river/conftest.py +++ b/river/conftest.py @@ -5,7 +5,6 @@ try: import sklearn # noqa: F401 except ImportError: - collect_ignore.append("compat/sklearn.py") collect_ignore.append("compat/test_sklearn.py") try: @@ -14,11 +13,6 @@ collect_ignore.append("stream/iter_sql.py") collect_ignore.append("stream/test_sql.py") -try: - import torch # noqa: F401 -except ImportError: - collect_ignore.append("compat/pytorch.py") - try: import vaex # noqa: F401 except ImportError: diff --git a/river/test_estimators.py b/river/test_estimators.py index 18aacf32f2..6e73bd792a 100644 --- a/river/test_estimators.py +++ b/river/test_estimators.py @@ -25,12 +25,6 @@ time_series, ) -try: - from river.compat.pytorch import PyTorch2RiverBase - - PYTORCH_INSTALLED = True -except ImportError: - PYTORCH_INSTALLED = False from sklearn import linear_model as sk_linear_model from river.compat.river_to_sklearn import River2SKLBase @@ -84,9 +78,6 @@ def iter_estimators_which_can_be_tested(): time_series.base.Forecaster, ) - if PYTORCH_INSTALLED: - ignored = (*ignored, PyTorch2RiverBase) - def can_be_tested(estimator): return not inspect.isabstract(estimator) and not issubclass(estimator, ignored) From 0c2b925341cad955127f14f78f4c59c6642e51f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20Royer?= Date: Fri, 16 Aug 2024 19:46:01 +0200 Subject: [PATCH 2/2] Format test_estimators.py --- river/test_estimators.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/river/test_estimators.py b/river/test_estimators.py index 6e73bd792a..09b40ea0ff 100644 --- a/river/test_estimators.py +++ b/river/test_estimators.py @@ -5,6 +5,7 @@ import inspect import pytest +from sklearn import linear_model as sk_linear_model from river import ( anomaly, @@ -24,9 +25,6 @@ preprocessing, time_series, ) - -from sklearn import linear_model as sk_linear_model - from river.compat.river_to_sklearn import River2SKLBase from river.compat.sklearn_to_river import SKL2RiverBase