Skip to content

Commit f631040

Browse files
committed
Hard-code conda channel into asv_delegated_conda.py .
1 parent 70366a6 commit f631040

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

benchmarks/asv.conf.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"project_url": "https://github.com/SciTools/iris",
55
"repo": "..",
66
"environment_type": "conda-delegated",
7-
"conda_channels": ["conda-forge", "defaults"],
87
"show_commit_url": "http://github.com/scitools/iris/commit/",
98
"branches": ["upstream/main"],
109

benchmarks/asv_delegated_conda.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ def __init__(
6666
ignored.append("`requirements`")
6767
if tagged_env_vars:
6868
ignored.append("`tagged_env_vars`")
69+
if conf.conda_channels:
70+
ignored.append("conda_channels")
6971
if conf.conda_environment_file:
7072
ignored.append("`conda_environment_file`")
7173
message = (
@@ -75,6 +77,8 @@ def __init__(
7577
log.warning(message)
7678
requirements = {}
7779
tagged_env_vars = {}
80+
# All that is required to create ASV's bare-bones environment.
81+
conf.conda_channels = ["defaults"]
7882
conf.conda_environment_file = None
7983

8084
super().__init__(conf, python, requirements, tagged_env_vars)

0 commit comments

Comments
 (0)