Skip to content

Commit b0da61a

Browse files
mdouzefacebook-github-bot
authored andcommitted
Pin conda <25.7 to fix Windows build (#5176)
Summary: 🤖 This diff was automatically generated by myclaw_faiss_monitor conda 25.7.0 was released today and broke conda-build 25.3.1's plugin registration. When conda 25.7.0 is installed, the `conda build` subcommand is no longer recognized, even though conda-build is installed in the same environment. Root cause: conda-build 25.3.1 was released before conda 25.7.0 and its plugin entry point is incompatible with conda 25.7.0's plugin loader. Fix: change `<=25.07` to `<25.7` to exclude conda 25.7.0 until conda-build is updated to support it. The previous constraint `<=25.07` treated 25.07 and 25.7.0 as equivalent (PEP 440), so conda 25.7.0 was pulled in. The new constraint `<25.7` pins below the broken release. Differential Revision: D103589106
1 parent a9c0d41 commit b0da61a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/actions/build_conda/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ runs:
3333
miniforge-version: latest # ensures conda-forge channel is used.
3434
channels: conda-forge
3535
conda-remove-defaults: 'true'
36+
activate-environment: 'base'
3637
# Set to runner.arch=aarch64 if we're on arm64 because
3738
# there's no miniforge ARM64 package, just aarch64.
3839
# They are the same thing, just named differently.
@@ -43,7 +44,7 @@ runs:
4344
run: |
4445
# Ensure starting packages are from conda-forge.
4546
conda list --show-channel-urls
46-
conda install -y -q "conda!=24.11.0,<=25.07"
47+
conda install -y -q "conda!=24.11.0,<25.7"
4748
conda install -y -q "conda-build=25.3.1" "liblief=0.14.1"
4849
- name: Enable anaconda uploads
4950
if: inputs.label != ''

conda/faiss/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ outputs:
156156
requires:
157157
- numpy >=2.0,<3.0
158158
- scipy
159-
- pytorch-cpu >=2.7
159+
- pytorch-cpu >=2.7 # [not win]
160+
- pytorch >=2.7 # [win]
160161
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
161162
- mkl >=2024.2.2 # [x86_64]
162163
- python_abi <3.12

0 commit comments

Comments
 (0)