Skip to content

Commit

Permalink
Merge branch 'main' into shpc
Browse files Browse the repository at this point in the history
  • Loading branch information
ngam authored May 21, 2022
2 parents a557224 + 439dae9 commit 416f1d5
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion recipe/gen_patch_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@ def _gen_new_index_per_key(repodata, subdir, index_key):
"fsspec >=0.8.0" in record["depends"]):
i = record["depends"].index("fsspec >=0.8.0")
record["depends"][i] = "fsspec >=0.9.0,<0.10.0"

# Version constraints for python and xarray in xgcm 0.7.0 build 0 were incorrect
# Has been corrected on the feedstock in https://github.com/conda-forge/xgcm-feedstock/pull/13/files
if (record_name == "xgcm" and record["version"] == "0.7.0" and record["build_number"] == 0):
Expand Down Expand Up @@ -1500,6 +1500,13 @@ def _gen_new_index_per_key(repodata, subdir, index_key):
record["depends"].append("requests")
record["depends"].append("ruamel.yaml")
record["depends"].append("spython >=0.2.0")
if any(dep.startswith("svt-av1") for dep in deps):
# hmaarrfk -- 2022/05/18
# These packages were built with svt-av1 0.8.7 or 0.9
# These two versions of svt seem to be compatible with each
# other, but they are not compatible with the recently
# released 1.1.0
_replace_pin("svt-av1", "svt-av1 <1.0.0a0", record["depends"], record)

return index

Expand Down

0 comments on commit 416f1d5

Please sign in to comment.