Combine changes that address downstream failures (#136)

* Add NVT test deps to `test-nvtabular-cpu` tox env * pin TF version to 2.9.2 * Add `torch` to the Merlin Models install in CPU CI Co-authored-by: Ben Frederickson <[email protected]>
NVIDIA-Merlin · Sep 7, 2022 · d5f4084 · d5f4084
1 parent fbfcaf3
commit d5f4084
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tox.ini b/tox.ini
@@ -42,7 +42,7 @@ commands =
     ; the GIT_COMMIT env is the current commit of the core repo
     ; NOTE!!!! We must clean this up in the jenkins configuration with `rm -rf "nvtabular-$GIT_COMMIT"`
     git clone --depth 1 https://github.com/NVIDIA-Merlin/NVTabular.git nvtabular-{env:GIT_COMMIT}
-    python -m pip install --upgrade "./nvtabular-{env:GIT_COMMIT}[cpu,dev]"
+    python -m pip install --upgrade "./nvtabular-{env:GIT_COMMIT}[cpu,dev,test]"
     python -m pip install .
 
     ; this runs the tests then removes the models repo directory whether the tests work or fail
@@ -60,8 +60,9 @@ commands =
     ; the GIT_COMMIT env is the current commit of the core repo
     ; NOTE!!!! We must clean this up in the jenkins configuration with `rm -rf "nvtabular-$GIT_COMMIT"`
     git clone --depth 1 https://github.com/NVIDIA-Merlin/models.git models-{env:GIT_COMMIT}
-    python -m pip install --upgrade ./models-{env:GIT_COMMIT}[dev,implicit,lightfm,tensorflow]
+    python -m pip install --upgrade ./models-{env:GIT_COMMIT}[dev,implicit,lightfm,tensorflow,torch]
     python -m pip install --upgrade git+https://github.com/NVIDIA-Merlin/NVTabular.git
+    python -m pip install tensorflow==2.9.2
     python -m pip install .
 
     ; this runs the tests then removes the models repo directory whether the tests work or fail