Skip to content

Hard-code conda channel into asv_delegated_conda.py #5435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 18, 2023
Merged

Hard-code conda channel into asv_delegated_conda.py #5435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
953eb53
What's new entry.
trexfeathers Aug 18, 2023
8feb9f4
What's New entry.
trexfeathers Aug 18, 2023
35eda2b
Hard-code conda channel into asv_delegated_conda.py .
trexfeathers Apr 28, 2023
8cb9942
Fix some rebase confusion in the What's New.
trexfeathers Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion benchmarks/asv.conf.json
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions docs/src/whatsnew/latest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ This document explains the changes made to Iris for this release
error. This fixes an oversight introduced in :pull:`5215`. (feature branch:
:pull`5434`)


.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
core dev names are automatically included by the common_links.inc:
Expand Down