Skip to content

Commit

Permalink
Hard-code conda channel into asv_delegated_conda.py .
Browse files Browse the repository at this point in the history
  • Loading branch information
trexfeathers committed Aug 18, 2023
1 parent 2967636 commit 03ce69d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 0 additions & 1 deletion benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"project_url": "https://github.com/SciTools/iris",
"repo": "..",
"environment_type": "conda-delegated",
"conda_channels": ["conda-forge", "defaults"],
"show_commit_url": "http://github.com/scitools/iris/commit/",
"branches": ["upstream/main"],

Expand Down
4 changes: 4 additions & 0 deletions benchmarks/asv_delegated_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ def __init__(
ignored.append("`requirements`")
if tagged_env_vars:
ignored.append("`tagged_env_vars`")
if conf.conda_channels:
ignored.append("conda_channels")
if conf.conda_environment_file:
ignored.append("`conda_environment_file`")
message = (
Expand All @@ -75,6 +77,8 @@ def __init__(
log.warning(message)
requirements = {}
tagged_env_vars = {}
# All that is required to create ASV's bare-bones environment.
conf.conda_channels = ["defaults"]
conf.conda_environment_file = None

super().__init__(conf, python, requirements, tagged_env_vars)
Expand Down

0 comments on commit 03ce69d

Please sign in to comment.