From 21e2d3f54605aed508c7b83f0ed60512ebc830bc Mon Sep 17 00:00:00 2001 From: djm21 Date: Mon, 10 Jun 2024 12:43:05 -0400 Subject: [PATCH 1/6] GitHub test changes --- .github/workflows/build-test-deploy.yml | 7 ++++++- tox.ini | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 3d1fa501..666780af 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -21,8 +21,13 @@ jobs: LANG: en_US.UTF-8 strategy: matrix: - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] os-version: ['ubuntu-20.04', 'windows-latest', 'macos-latest'] + exclude: + - python-version: '3.6' + os-version: 'macos-latest' + - python-version: '3.7' + os-version: '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] diff --git a/tox.ini b/tox.ini index 0851d626..c3de3946 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ [tox] -envlist = py{36,37,38,39,310,311}-tests-{clean,unit,integration} +envlist = py{36,37,38,39,310,311,312}-tests-{clean,unit,integration} # Allow execution even if all Python versions are not present skip_missing_interpreters = {env:TOX_SKIP_MISSING_INTERPRETERS:True} @@ -26,6 +26,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [testenv] skip_install = @@ -38,6 +39,7 @@ basepython = py39: python3.9 py310: python3.10 py311: python3.11 + py312: python3.12 deps = clean: coverage From 19b67094a3e2920ff697231e12a1be8f1c52a48e Mon Sep 17 00:00:00 2001 From: djm21 Date: Mon, 10 Jun 2024 13:17:16 -0400 Subject: [PATCH 2/6] Updated xgboost version in tox.ini file --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index c3de3946..a9a88fb8 100644 --- a/tox.ini +++ b/tox.ini @@ -52,7 +52,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 From 0716653e8462151ef97132565b3931977857c244 Mon Sep 17 00:00:00 2001 From: djm21 Date: Mon, 10 Jun 2024 13:24:34 -0400 Subject: [PATCH 3/6] remove tests for python 3.6 and 3.7 to allow for compatibility with xgboost version 1.7.3 --- .github/workflows/build-test-deploy.yml | 6 +----- tox.ini | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 666780af..5df7030f 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -21,13 +21,9 @@ jobs: LANG: en_US.UTF-8 strategy: matrix: - python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] os-version: ['ubuntu-20.04', 'windows-latest', 'macos-latest'] exclude: - - python-version: '3.6' - os-version: 'macos-latest' - - python-version: '3.7' - os-version: '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] diff --git a/tox.ini b/tox.ini index a9a88fb8..f9f25356 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ [tox] -envlist = py{36,37,38,39,310,311,312}-tests-{clean,unit,integration} +envlist = py{38,39,310,311,312}-tests-{clean,unit,integration} # Allow execution even if all Python versions are not present skip_missing_interpreters = {env:TOX_SKIP_MISSING_INTERPRETERS:True} @@ -20,8 +20,6 @@ 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 @@ -33,8 +31,6 @@ skip_install = clean: true basepython = - py36: python3.6 - py37: python3.7 py38: python3.8 py39: python3.9 py310: python3.10 From da1ff2c25ab452c49f98de9496056907c16c377c Mon Sep 17 00:00:00 2001 From: djm21 Date: Mon, 10 Jun 2024 13:25:22 -0400 Subject: [PATCH 4/6] fix formatting error in build-test-deploy.yml --- .github/workflows/build-test-deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 5df7030f..b5f2d808 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -23,7 +23,6 @@ jobs: matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] os-version: ['ubuntu-20.04', 'windows-latest', 'macos-latest'] - exclude: # 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] From a73c6c201e1c9f7a9b638e8cffadf84e3384fd5d Mon Sep 17 00:00:00 2001 From: djm21 Date: Mon, 10 Jun 2024 13:39:11 -0400 Subject: [PATCH 5/6] update GitHub scoring to allow for compatibility with swat --- .github/workflows/build-test-deploy.yml | 2 +- tox.ini | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index b5f2d808..d25e2d02 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -21,7 +21,7 @@ jobs: LANG: en_US.UTF-8 strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + 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] diff --git a/tox.ini b/tox.ini index f9f25356..70cfed8e 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ [tox] -envlist = py{38,39,310,311,312}-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} @@ -24,7 +24,6 @@ python = 3.9: py39 3.10: py310 3.11: py311 - 3.12: py312 [testenv] skip_install = @@ -35,7 +34,6 @@ basepython = py39: python3.9 py310: python3.10 py311: python3.11 - py312: python3.12 deps = clean: coverage From 7ed125ff5beada3a7be8177fecec2a7830088e0d Mon Sep 17 00:00:00 2001 From: djm21 Date: Mon, 10 Jun 2024 14:47:32 -0400 Subject: [PATCH 6/6] change to conftest.py to try to fix issues with GitHub actions --- tests/conftest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 768d9586..7b47ae9f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -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