Merge branch 'develop' into develop

hgreebe · Sep 6, 2023 · 108d78f · 108d78f
2 parents 1f357af + 1923ca4
commit 108d78f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -346,6 +346,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 **ENHANCEMENTS**
 - Add support for multiple users cluster environments by integrating with Active Directory (AD) domains managed via AWS Directory Service.
 - Install NVIDIA drivers and CUDA library for ARM.
+- Build Slurm with `slurmrestd` support.
 
 **CHANGES**
 - Upgrade Slurm to version 21.08.5.

diff --git a/test/unit/requirements.txt b/test/unit/requirements.txt
@@ -2,7 +2,6 @@ mock
 pytest
 pytest-cov
 pytest-datadir
-pytest-html
 pytest-mock
 assertpy
 jsonschema

diff --git a/tox.ini b/tox.ini
@@ -25,8 +25,8 @@ setenv =
         {toxinidir}/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm:\
         {toxinidir}/cookbooks/aws-parallelcluster-slurm/files/default/config_slurm/scripts
 commands =
-    nocov: pytest -l -v --basetemp={envtmpdir} --html=report.html {[vars]test_dirs}
-    cov: pytest -l -v --basetemp={envtmpdir} --html=report.html --cov-report=xml --cov={[vars]cov_dirs} --cov-append {[vars]test_dirs}
+    nocov: pytest -l -v --basetemp={envtmpdir} {[vars]test_dirs}
+    cov: pytest -l -v --basetemp={envtmpdir} --cov-report=xml --cov={[vars]cov_dirs} --cov-append {[vars]test_dirs}
 
 # Section used to define common variables used by multiple testenvs.
 [vars]