Merge branch 'fix-integration' of https://github.com/aimclub/Fedot.In…

…dustrial into fix-integration
aimclub · Jul 30, 2024 · 134c230 · 134c230
2 parents 99b1044 + 55c88bb
commit 134c230
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -39,7 +39,7 @@ jobs:
         run: poetry install
 
       - name: Bump up FEDOT to a stable revision (temporary)
-        run: poetry add git+https://github.com/aimclub/FEDOT.git@master
+        run: poetry add git+https://github.com/aimclub/FEDOT.git@e0b4ee7
       - name: Run tests with pytest
         run: poetry run pytest --cov=fedot_ind -s tests/integration
 

diff --git a/.github/workflows/poetry_unit_test.yml b/.github/workflows/poetry_unit_test.yml
@@ -39,7 +39,7 @@ jobs:
         run: poetry install
 
       - name: Bump up FEDOT to a stable revision (temporary)
-        run: poetry add git+https://github.com/aimclub/FEDOT.git@master
+        run: poetry add git+https://github.com/aimclub/FEDOT.git@e0b4ee7
 
       - name: Run tests with pytest
         run: poetry run pytest --cov=fedot_ind --cov-report xml:coverage.xml tests/unit

diff --git a/tests/integration/integration_test_utils.py b/tests/integration/integration_test_utils.py
@@ -1,4 +1,3 @@
-from fedot_ind.tools.loader import DataLoader
 from fedot_ind.api.main import FedotIndustrial
 
 from fedot.core.pipelines.pipeline_builder import PipelineBuilder

diff --git a/tests/integration/ts_classification/test_ts_classification_basic.py b/tests/integration/ts_classification/test_ts_classification_basic.py
@@ -8,6 +8,7 @@
     'multivariate': 'Epilepsy'
 }
 
+
 @pytest.mark.parametrize('type_', ['univariate', 'multivariate'])
 def test_basic_clf_test(type_):
     probs = basic_launch(TASK, *data(DATASETS[type_]))[1]

diff --git a/tests/integration/ts_forecast/test_forecast_advanced.py b/tests/integration/ts_forecast/test_forecast_advanced.py
@@ -56,15 +56,15 @@ def test_forecasting_exogenous():
         api_config = dict(problem=TASK,
                           metric='rmse',
                           timeout=0.05,
-                          task_params={'forecast_length': FORECAST_LENGTH, 'data_type': 'time_series', 
+                          task_params={'forecast_length': FORECAST_LENGTH, 'data_type': 'time_series',
                                        'supplementary_data': {'feature_name': exog_var}},
                           n_jobs=-1,
                           industrial_strategy='forecasting_exogenous',
                           initial_assumption=INITIAL_ASSUMPTIONS[assumption],
                           industrial_strategy_params={'exog_variable': exog_ts, 'data_type': 'time_series', 
                                                       'supplementary_data': {'feature_name': exog_var}},
                           logging_level=0)
-        
+
         industrial = FedotIndustrial(**api_config)
         industrial.fit(input_data)
         assert not np.isnan(industrial.predict(input_data)).any()
diff --git a/tests/integration/ts_regression/test_ts_regression_advanced.py b/tests/integration/ts_regression/test_ts_regression_advanced.py
@@ -9,12 +9,11 @@
     'multivariate': 'EthereumSentiment'
 }
 STRATEGIES = [
-    'kernel_automl', 
+    'kernel_automl',
     'federated_automl'
 ]
 
+
 @pytest.mark.parametrize('type_,strategy', list((product(DATASETS.keys(), STRATEGIES))))
 def test_regr_advanced(type_, strategy):
     launch_api(TASK, strategy, DATASETS[type_])
-
-
diff --git a/tests/integration/ts_regression/test_ts_regression_basic.py b/tests/integration/ts_regression/test_ts_regression_basic.py
@@ -8,6 +8,7 @@
     'multivariate': 'EthereumSentiment'
 }
 
+
 @pytest.mark.parametrize('type_', ['univariate', 'multivariate'])
 def test_basic_reg_test(type_):
     train_data, test_data = data(DATASETS[type_])