Skip to content

Merge test_update branch to update tox tests for master. #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 8, 2024
Merged

Merge test_update branch to update tox tests for master. #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21e2d3f
GitHub test changes
djm21 Jun 10, 2024
19b6709
Updated xgboost version in tox.ini file
djm21 Jun 10, 2024
0716653
remove tests for python 3.6 and 3.7 to allow for compatibility with x…
djm21 Jun 10, 2024
da1ff2c
fix formatting error in build-test-deploy.yml
djm21 Jun 10, 2024
a73c6c2
update GitHub scoring to allow for compatibility with swat
djm21 Jun 10, 2024
7ed125f
change to conftest.py to try to fix issues with GitHub actions
djm21 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-test-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
LANG: en_US.UTF-8
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10', '3.11']
os-version: ['ubuntu-20.04', 'windows-latest', 'macos-latest']
# Pinned Ubuntu version to 20.04 since no Python 3.6 builds available on ubuntu-latest (22.04) as of 2022-12-7.
# os-version: [ubuntu-latest, windows-latest, macos-latest]
Expand Down
12 changes: 6 additions & 6 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,12 +633,12 @@ def pytest_runtest_makereport(item, call):
# The id of the test is deteremined by its parameterization. We just want to know if the test was
# for Viya 3.5 or 2020.01, 2022.09, etc. Try to check the parameter assigned to known fixtures like
# `session`. If that fails, we'll just use the id generated by pytest.
if "session" in item.callspec.params:
key = item.callspec.params["session"]
elif "cas_session" in item.callspec.params:
key = item.callspec.params["cas_session"]
else:
key = item.callspec.id
# if "session" in item.callspec.params:
# key = item.callspec.params["session"]
# elif "cas_session" in item.callspec.params:
# key = item.callspec.params["cas_session"]
# else:
key = item.callspec.id

# Track that this test was the last test to fail for this Viya version
parent._previousfailed[key] = item
Expand Down
8 changes: 2 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@


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

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

# Required by tox-gh-actions GH action. Maps GH Python runtime to tox envlist.
[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310
Expand All @@ -32,8 +30,6 @@ skip_install =
clean: true

basepython =
py36: python3.6
py37: python3.7
py38: python3.8
py39: python3.9
py310: python3.10
Expand All @@ -50,7 +46,7 @@ deps =
tests: cython # required to install pandas from source
tests: swat >= 1.8
tests: kerberos ; platform_system != "Windows" and platform_system != "Darwin"
tests: xgboost == 0.82
tests: xgboost == 1.7.3
tests: urllib3 < 2.0.0
tests: nbconvert
tests: nbformat
Expand Down
Loading