Skip to content

Commit 653b82d

Browse files
committed
fixed unit tests
1 parent 07dc35b commit 653b82d

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

tests/unitary/with_extras/evaluator/test_evaluator.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@
66
"""
77
Contains tests for ads.evaluations.evaluator
88
"""
9-
import pytest
10-
import unittest
119
import tempfile
12-
from ads.evaluations.evaluator import Evaluator
10+
import unittest
1311

14-
from sklearn.datasets import make_regression
15-
from sklearn.datasets import make_classification
16-
from sklearn.model_selection import train_test_split
12+
import pandas as pd
13+
import pytest
1714
from lightgbm import LGBMClassifier, LGBMRegressor
18-
from sklearn.tree import DecisionTreeClassifier
15+
from sklearn.datasets import make_classification, make_regression
1916
from sklearn.linear_model import LinearRegression
20-
import pandas as pd
17+
from sklearn.model_selection import train_test_split
18+
from sklearn.tree import DecisionTreeClassifier
19+
2120
from ads.common.model_metadata import UseCaseType
21+
from ads.evaluations.evaluator import Evaluator
2222
from ads.model.framework.lightgbm_model import LightGBMModel
2323
from ads.model.framework.sklearn_model import SklearnModel
2424

25+
DEFAULT_PYTHON_VERSION = "3.12"
2526

2627
def test_model_types():
2728
with pytest.raises(ValueError):
@@ -39,6 +40,7 @@ def test_pandas_input():
3940
model.prepare(
4041
inference_conda_env="generalml_p38_cpu_v1",
4142
training_conda_env="generalml_p38_cpu_v1",
43+
inference_python_version=DEFAULT_PYTHON_VERSION,
4244
X_sample=X,
4345
y_sample=y,
4446
use_case_type=UseCaseType.MULTINOMIAL_CLASSIFICATION,
@@ -100,6 +102,7 @@ def train_eval_model(self, data, model, use_case):
100102
my_model.prepare(
101103
inference_conda_env="generalml_p38_cpu_v1",
102104
training_conda_env="generalml_p38_cpu_v1",
105+
inference_python_version=DEFAULT_PYTHON_VERSION,
103106
X_sample=X_test,
104107
y_sample=y_test,
105108
use_case_type=use_case,

tests/unitary/with_extras/model/test_model_metadata_mixin.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33
# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
55

6+
import os
7+
import shutil
68
from unittest.mock import patch
9+
710
import numpy as np
811
import pytest
12+
import sklearn
13+
import xgboost
914
from sklearn import datasets, linear_model
1015

11-
from ads.model.generic_model import GenericModel
16+
from ads.feature_engineering.schema import Schema
1217
from ads.model.framework.sklearn_model import SklearnModel
1318
from ads.model.framework.xgboost_model import XGBoostModel
14-
from ads.feature_engineering.schema import Schema
15-
import sklearn
16-
import os
17-
import shutil
18-
import xgboost
19+
from ads.model.generic_model import GenericModel
1920

21+
DEFAULT_PYTHON_VERSION = "3.12"
2022

2123
class TestMetadataMixin:
2224
def setup_method(cls):
@@ -49,6 +51,7 @@ def test_metadata_generic_model(self):
4951
model.prepare(
5052
inference_conda_env="dataexpl_p37_cpu_v3",
5153
namespace="ociodscdev",
54+
inference_python_version=DEFAULT_PYTHON_VERSION,
5255
model_file_name="model.joblib",
5356
force_overwrite=True,
5457
)

0 commit comments

Comments
 (0)