From ad7c6674ecf066d76337c5cad7c33f0760c16251 Mon Sep 17 00:00:00 2001 From: mloubout Date: Thu, 20 Jul 2023 11:15:33 -0400 Subject: [PATCH] CI: fix asv setup --- .github/workflows/asv.yml | 1 - benchmarks/regression/asv.conf.json | 2 +- setup.py | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/asv.yml b/.github/workflows/asv.yml index be90e3ec3a..f1941d82df 100644 --- a/.github/workflows/asv.yml +++ b/.github/workflows/asv.yml @@ -50,7 +50,6 @@ jobs: - name: Install dependencies run: | pip install --upgrade pip - pip install -e .[tests] pip install --upgrade asv - name: Setup asv diff --git a/benchmarks/regression/asv.conf.json b/benchmarks/regression/asv.conf.json index 8d1dfae1f7..f6e564c765 100644 --- a/benchmarks/regression/asv.conf.json +++ b/benchmarks/regression/asv.conf.json @@ -20,7 +20,7 @@ // "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"], "build_command": [ "DEVITO_BENCHMARKS=1 python setup.py build", - "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" + "DEVITO_BENCHMARKS=1 PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" ], // List of branches to benchmark. If not provided, defaults to "master" diff --git a/setup.py b/setup.py index 3d78741600..69943571eb 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,8 @@ try: if not bool(int(os.environ.get('DEVITO_BENCHMARKS', 0))): exclude += ['examples'] + else: + required += testing except (TypeError, ValueError): exclude += ['examples']