Skip to content

Commit a844da2

Browse files
authored
Merge pull request #234 from sassoftware/testingUpdates
Change default testing versions to mirror currently supported python versions
2 parents 9d10504 + 4993d5e commit a844da2

11 files changed

Lines changed: 105 additions & 34 deletions

‎.github/workflows/build-test-deploy.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
LANG: en_US.UTF-8
2222
strategy:
2323
matrix:
24-
python-version: ['3.8', '3.9', '3.10', '3.11']
24+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
2525
os-version: ['ubuntu-latest', 'windows-latest', 'macos-latest']
2626
# os-version: [ubuntu-latest, windows-latest, macos-latest]
2727

@@ -40,11 +40,15 @@ jobs:
4040
sudo apt-get update
4141
sudo apt-get install build-essential libkrb5-dev
4242
43+
- name: Install dependencies (macOS)
44+
if: startsWith(matrix.os-version, 'macos')
45+
run: brew install libomp
46+
4347
- name: Install dependencies (Common)
4448
run: |
4549
# Setup tox & code coverage
4650
pip install --upgrade pip
47-
pip install tox tox-gh-actions pytest pytest-cov 'scikit-learn<=1.5.0' 'numpy<2.0.0'
51+
pip install tox tox-gh-actions pytest pytest-cov 'scikit-learn' 'numpy'
4852
4953
- name: Run Tests
5054
run: |

‎src/sasctl/_services/score_definitions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def create_score_definition(
102102
# Checking if the model exists and if it's in a project
103103

104104
try:
105-
inputMapping = []
105+
mappings = []
106106
for input_item in model.get("inputVariables"):
107107
if input_mapping and input_item["name"] in input_mapping:
108108
var = {
@@ -116,7 +116,7 @@ def create_score_definition(
116116
"mappingType": "datasource",
117117
"variableName": input_item["name"],
118118
}
119-
inputMapping.append(var)
119+
mappings.append(var)
120120

121121
except:
122122
print("This model does not have the optional 'inputVariables' parameter.")
@@ -164,7 +164,7 @@ def create_score_definition(
164164
"publishDestination": "",
165165
"versionedModel": f"{model_name} ({model_version})",
166166
},
167-
"mappings": inputMapping,
167+
"mappings": mappings,
168168
}
169169
# Consolidating all of the model and table information to create the score definition information
170170

‎tests/conftest.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,9 +532,7 @@ def sklearn_classification_model(iris_dataset):
532532

533533
with warnings.catch_warnings():
534534
warnings.simplefilter("ignore")
535-
model = sk.LogisticRegression(
536-
multi_class="multinomial", solver="lbfgs", max_iter=1000
537-
)
535+
model = sk.LogisticRegression(solver="lbfgs", max_iter=1000)
538536
model.fit(X, y)
539537
return model
540538

‎tests/integration/test_model_parameters.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def sklearn_model(train_data):
4242
X, y = train_data
4343
with warnings.catch_warnings():
4444
warnings.simplefilter("ignore")
45-
model = LogisticRegression(multi_class="multinomial", solver="lbfgs")
45+
model = LogisticRegression(solver="lbfgs")
4646
model.fit(X, y)
4747
return model
4848

‎tests/integration/test_pymas.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ def sklearn_model(train_data):
6363
X, y = train_data
6464
with warnings.catch_warnings():
6565
warnings.simplefilter("ignore")
66-
model = LogisticRegression(
67-
multi_class="multinomial", solver="lbfgs", max_iter=10000
68-
)
66+
model = LogisticRegression(solver="lbfgs", max_iter=10000)
6967
model.fit(X, y)
7068
return model
7169

‎tests/integration/test_tasks.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ def sklearn_logistic_model():
4040

4141
with warnings.catch_warnings():
4242
warnings.simplefilter("ignore")
43-
model = LogisticRegression(
44-
multi_class="multinomial", solver="lbfgs", max_iter=10000
45-
)
43+
model = LogisticRegression(solver="lbfgs", max_iter=10000)
4644
model.fit(iris.iloc[:, 0:4], iris["Species"])
4745

4846
return model, iris.iloc[:, 0:4]

‎tests/unit/test_model_parameters.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import ast
21
import copy
32
import json
43
import tempfile
4+
import unittest
5+
import uuid
56
import warnings
67
from pathlib import Path
78
from unittest import mock
89

10+
import numpy as np
911
import pandas as pd
1012
import pytest
1113
from requests.models import Response
@@ -14,9 +16,6 @@
1416

1517
from sasctl import RestObj, current_session
1618
from sasctl.pzmm import ModelParameters as mp
17-
import unittest
18-
import uuid
19-
import numpy as np
2019

2120

2221
class BadModel:
@@ -47,9 +46,7 @@ def sklearn_model(train_data):
4746
X, y = train_data
4847
with warnings.catch_warnings():
4948
warnings.simplefilter("ignore")
50-
model = LogisticRegression(
51-
multi_class="multinomial", solver="lbfgs", max_iter=1000
52-
)
49+
model = LogisticRegression(solver="lbfgs", max_iter=1000)
5350
model.fit(X, y)
5451
return model
5552

‎tests/unit/test_score_definitions.py‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,3 +250,76 @@ def test_create_score_definition():
250250
json_data["properties"]["versionedModel"]
251251
== "test_model (1.0)"
252252
)
253+
254+
# Input mapping test case
255+
get_model.return_value = {
256+
"id": "12345",
257+
"projectId": "p",
258+
"projectVersionId": "pv",
259+
"name": "test_model",
260+
"inputVariables": [
261+
{"name": "first"},
262+
{"name": "second"},
263+
],
264+
}
265+
get_table.return_value = {"tableName": "t"}
266+
input_mapping = {"first": "mapped_first"}
267+
sd.create_score_definition(
268+
score_def_name="sd_test",
269+
model="12345",
270+
table_name="t",
271+
input_mapping=input_mapping,
272+
)
273+
assert response
274+
assert post.call_count == 7
275+
data = post.call_args
276+
json_data = json.loads(data.kwargs["data"])
277+
278+
assert json_data["mappings"] == [
279+
{
280+
"mappingValue": "mapped_first",
281+
"mappingType": "datasource",
282+
"variableName": "first",
283+
},
284+
{
285+
"mappingValue": "second",
286+
"mappingType": "datasource",
287+
"variableName": "second",
288+
},
289+
]
290+
# Input mapping is provided, but model has no input variables
291+
get_model.return_value = {
292+
"id": "12345",
293+
"projectId": "p",
294+
"projectVersionId": "pv",
295+
"name": "test_model",
296+
"inputVariables": [
297+
{"name": "first"},
298+
{"name": "second"},
299+
],
300+
}
301+
get_table.return_value = {"tableName": "t"}
302+
input_mapping = {"third": "mapped_third"}
303+
sd.create_score_definition(
304+
score_def_name="sd_test",
305+
model="12345",
306+
table_name="t",
307+
input_mapping=input_mapping,
308+
)
309+
assert response
310+
assert post.call_count == 8
311+
data = post.call_args
312+
json_data = json.loads(data.kwargs["data"])
313+
314+
assert json_data["mappings"] == [
315+
{
316+
"mappingValue": "first",
317+
"mappingType": "datasource",
318+
"variableName": "first",
319+
},
320+
{
321+
"mappingValue": "second",
322+
"mappingType": "datasource",
323+
"variableName": "second",
324+
},
325+
]

‎tests/unit/test_write_json_files.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ def sklearn_model(train_data):
7474
X, y = train_data
7575
with warnings.catch_warnings():
7676
warnings.simplefilter("ignore")
77-
model = LogisticRegression(
78-
multi_class="multinomial", solver="lbfgs", max_iter=1000
79-
)
77+
model = LogisticRegression(solver="lbfgs", max_iter=1000)
8078
model.fit(X, y)
8179
return model
8280

‎tests/unit/test_write_score_code.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import pandas as pd
1313
import pytest
14+
from packaging.version import Version
1415

1516
from sasctl import current_session
1617
from sasctl.core import RestObj, VersionInfo
@@ -1165,7 +1166,10 @@ def test_input_var_lists():
11651166
data = pd.DataFrame(data=[[1, "A"], [5, "B"]], columns=["First", "Second"])
11661167
var_list, dtypes_list = sc._input_var_lists(data)
11671168
assert var_list == ["First", "Second"]
1168-
assert dtypes_list == ["int64", "object"]
1169+
if Version(pd.__version__) < Version("3.0.0"):
1170+
assert dtypes_list == ["int64", "object"]
1171+
else:
1172+
assert dtypes_list == ["int64", "str"]
11691173

11701174
data = [{"name": "First", "type": "int"}, {"name": "Second", "type": "string"}]
11711175
var_list, dtypes_list = sc._input_var_lists(data)

0 commit comments

Comments
 (0)