From 995d3b73ad5729edb6e1047484b9039e921502f3 Mon Sep 17 00:00:00 2001 From: Jake Lishman Date: Thu, 9 Nov 2023 13:45:42 +0000 Subject: [PATCH] Fix asv installation configuration Previously, the `uninstall` component of the asv configuration was attempting to uninstall the package `qiskit`. This _is_ the name of the project, but it's not the name of the relevant Python package, and so was not being uninstalled correctly. This meant that asv's managed environments would retain the previous build, unless the updating the commit changed the version number of the package. This behaviour caused our tracking bot to be benchmarking the state of the package only at the commit points that bump version numbers on `main`. Typically, this means it was only ever benchmarking the release-candidate versions of the package since we migrated from the metapackage. --- asv.conf.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/asv.conf.json b/asv.conf.json index 70e736e26f75..64dfa188fae4 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -4,20 +4,19 @@ "project_url": "https://qiskit.org", "repo": ".", "install_command": [ - "in-dir={env_dir} python -mpip install {wheel_file}[all] python-constraint qiskit-experiments==0.3.0" + "in-dir={env_dir} python -m pip install {wheel_file}[all] python-constraint qiskit-experiments==0.3.0" ], "uninstall_command": [ - "return-code=any python -mpip uninstall -y {project}" + "return-code=any python -m pip uninstall -y qiskit qiskit-terra" ], "build_command": [ - "pip install -U setuptools-rust", - "python setup.py build_rust --release", - "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" + "python -m pip install -U build", + "python -m build --outdir {build_cache_dir} --wheel {build_dir}" ], "branches": ["main"], "dvcs": "git", "environment_type": "virtualenv", - "show_commit_url": "http://github.com/Qiskit/qiskit-terra/commit/", + "show_commit_url": "http://github.com/Qiskit/qiskit/commit/", "pythons": ["3.8", "3.9", "3.10", "3.11"], "benchmark_dir": "test/benchmarks", "env_dir": ".asv/env",