From 918b6a5cdbbbd2a3162bbe520eb1fcc2f17eaecd Mon Sep 17 00:00:00 2001 From: Marc Romeyn Date: Fri, 30 Jun 2023 09:56:34 +0200 Subject: [PATCH] Trying to change py39 -> py310 in tox.ini to see if that fixes CI --- .github/workflows/gpu.yml | 4 ++-- tox.ini | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gpu.yml b/.github/workflows/gpu.yml index a92b8fab45..db4b63275e 100644 --- a/.github/workflows/gpu.yml +++ b/.github/workflows/gpu.yml @@ -34,7 +34,7 @@ jobs: if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then extra_pytest_markers="and changed" fi - cd ${{ github.workspace }}; PYTEST_MARKERS="unit and not (examples or integration or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e py39-gpu + cd ${{ github.workspace }}; PYTEST_MARKERS="unit and not (examples or integration or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e py310-gpu tests-examples: runs-on: 1GPU @@ -55,4 +55,4 @@ jobs: if [[ "${{ github.ref }}" != 'refs/heads/main' ]]; then extra_pytest_markers="and changed" fi - cd ${{ github.workspace }}; PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e py39-gpu + cd ${{ github.workspace }}; PYTEST_MARKERS="(examples or notebook) $extra_pytest_markers" MERLIN_BRANCH=$branch COMPARE_BRANCH=${{ github.base_ref }} tox -e py310-gpu diff --git a/tox.ini b/tox.ini index 7bf3dfdfda..ab14fe206c 100644 --- a/tox.ini +++ b/tox.ini @@ -2,14 +2,14 @@ ; .github/workflows/cpu-ci.yml for the workflow definition. [tox] -envlist = py39-gpu,py39-multi-gpu +envlist = py310-gpu,py310-multi-gpu [testenv] commands = pip install --upgrade pip pip install -e .[all] -[testenv:py39-gpu] +[testenv:py310-gpu] ; Runs in: Github Actions ; Runs GPU-based tests. allowlist_externals = @@ -28,7 +28,7 @@ commands = python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/systems.git@{env:MERLIN_BRANCH:main} bash -c 'python -m pytest --cov-report term --cov merlin -m "{env:PYTEST_MARKERS}" -rxs tests/ || ([ $? = 5 ] && exit 0 || exit $?)' -[testenv:py39-multi-gpu] +[testenv:py310-multi-gpu] ; Runs in: Github Actions ; Runs GPU-based tests. allowlist_externals = @@ -50,7 +50,7 @@ commands = sh examples/usecases/multi-gpu/install_sparse_operation_kit.sh {envdir} bash -c 'horovodrun -np 2 sh examples/usecases/multi-gpu/hvd_wrapper.sh python -m pytest -m "horovod {env:EXTRA_PYTEST_MARKERS}" -rxs tests/unit || ([ $? = 5 ] && exit 0 || exit $?)' -[testenv:py39-horovod-cpu] +[testenv:py310-horovod-cpu] setenv = HOROVOD_WITH_MPI=1 HOROVOD_WITH_TENSORFLOW=1 @@ -66,7 +66,7 @@ commands = {envdir}/env/bin/python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/nvtabular.git@{env:MERLIN_BRANCH:main} {envdir}/env/bin/horovodrun -np 2 sh examples/usecases/multi-gpu/hvd_wrapper.sh pytest -m "horovod {env:EXTRA_PYTEST_MARKERS}" -rxs tests/unit -[testenv:py39-nvtabular-cpu] +[testenv:py310-nvtabular-cpu] passenv=GIT_COMMIT allowlist_externals = git deps = @@ -82,7 +82,7 @@ commands = python -m pip install . python -m pytest nvtabular-{env:GIT_COMMIT}/tests/unit -[testenv:py39-systems-cpu] +[testenv:py310-systems-cpu] passenv=GIT_COMMIT allowlist_externals = git deps = @@ -99,7 +99,7 @@ commands = python -m pip install . python -m pytest -m "not notebook" systems-{env:GIT_COMMIT}/tests/unit -[testenv:py39-transformers4rec-cpu] +[testenv:py310-transformers4rec-cpu] passenv=GIT_COMMIT allowlist_externals = git commands =