Skip to content

Commit 31969cd

Browse files
authored
Merge pull request #195 from sassoftware/test_updates
Merge test_update branch to update tox tests for master.
2 parents cf4d584 + 7ed125f commit 31969cd

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
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.6', '3.7', '3.8', '3.9', '3.10']
24+
python-version: ['3.8', '3.9', '3.10', '3.11']
2525
os-version: ['ubuntu-20.04', 'windows-latest', 'macos-latest']
2626
# Pinned Ubuntu version to 20.04 since no Python 3.6 builds available on ubuntu-latest (22.04) as of 2022-12-7.
2727
# os-version: [ubuntu-latest, windows-latest, macos-latest]

tests/conftest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -633,12 +633,12 @@ def pytest_runtest_makereport(item, call):
633633
# The id of the test is deteremined by its parameterization. We just want to know if the test was
634634
# for Viya 3.5 or 2020.01, 2022.09, etc. Try to check the parameter assigned to known fixtures like
635635
# `session`. If that fails, we'll just use the id generated by pytest.
636-
if "session" in item.callspec.params:
637-
key = item.callspec.params["session"]
638-
elif "cas_session" in item.callspec.params:
639-
key = item.callspec.params["cas_session"]
640-
else:
641-
key = item.callspec.id
636+
# if "session" in item.callspec.params:
637+
# key = item.callspec.params["session"]
638+
# elif "cas_session" in item.callspec.params:
639+
# key = item.callspec.params["cas_session"]
640+
# else:
641+
key = item.callspec.id
642642

643643
# Track that this test was the last test to fail for this Viya version
644644
parent._previousfailed[key] = item

tox.ini

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@
1212

1313

1414
[tox]
15-
envlist = py{36,37,38,39,310,311}-tests-{clean,unit,integration}
15+
envlist = py{38,39,310,311}-tests-{clean,unit,integration}
1616

1717
# Allow execution even if all Python versions are not present
1818
skip_missing_interpreters = {env:TOX_SKIP_MISSING_INTERPRETERS:True}
1919

2020
# Required by tox-gh-actions GH action. Maps GH Python runtime to tox envlist.
2121
[gh-actions]
2222
python =
23-
3.6: py36
24-
3.7: py37
2523
3.8: py38
2624
3.9: py39
2725
3.10: py310
@@ -32,8 +30,6 @@ skip_install =
3230
clean: true
3331

3432
basepython =
35-
py36: python3.6
36-
py37: python3.7
3733
py38: python3.8
3834
py39: python3.9
3935
py310: python3.10
@@ -50,7 +46,7 @@ deps =
5046
tests: cython # required to install pandas from source
5147
tests: swat >= 1.8
5248
tests: kerberos ; platform_system != "Windows" and platform_system != "Darwin"
53-
tests: xgboost == 0.82
49+
tests: xgboost == 1.7.3
5450
tests: urllib3 < 2.0.0
5551
tests: nbconvert
5652
tests: nbformat

0 commit comments

Comments
 (0)