Skip to content

Commit 70366a6

Browse files
committed
Restore inadvertent changes.
1 parent 57d7024 commit 70366a6

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

benchmarks/asv.conf.json

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

benchmarks/asv_delegated_conda.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ 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")
7169
if conf.conda_environment_file:
7270
ignored.append("`conda_environment_file`")
7371
message = (
@@ -77,8 +75,6 @@ def __init__(
7775
log.warning(message)
7876
requirements = {}
7977
tagged_env_vars = {}
80-
# All that is required to create ASV's bare-bones environment.
81-
conf.conda_channels = ["defaults"]
8278
conf.conda_environment_file = None
8379

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

0 commit comments

Comments
 (0)