Skip to content

Commit 239b07a

Browse files
authored
Require conda-libmamba-solver 25.4 or greater to fix issue with spaces in CONDA_BLD_PATH (#5675)
1 parent 1e6a2a1 commit 239b07a

File tree

11 files changed

+37
-18
lines changed

11 files changed

+37
-18
lines changed

.devcontainer/post_create.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ echo "Installing dev dependencies"
2424
--file "$SRC_CONDA_BUILD/tests/requirements.txt" \
2525
--file "$SRC_CONDA_BUILD/tests/requirements-Linux.txt" \
2626
--file "$SRC_CONDA_BUILD/tests/requirements-ci.txt" \
27-
"conda>=23.7.0"
27+
"conda>=24.11.0"

.github/workflows/tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ jobs:
8484
include:
8585
# minimum Python/conda combo
8686
- python-version: '3.9'
87-
conda-version: 23.7.0
87+
conda-version: 24.11.0
8888
test-type: serial
8989
- python-version: '3.9'
90-
conda-version: 23.7.0
90+
conda-version: 24.11.0
9191
test-type: parallel
9292
# maximum Python/conda combo
9393
- python-version: '3.12'
@@ -301,7 +301,7 @@ jobs:
301301
302302
# TODO: how can we remove this step?
303303
- name: Install Self
304-
run: pip install -e .
304+
run: pip install -e . --no-deps --no-build-isolation
305305

306306
- name: Conda Info
307307
# view test env info (not base)

news/5675-require-newer-cls

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
### Enhancements
2+
3+
* <news item>
4+
5+
### Bug fixes
6+
7+
* Require `conda-libmamba-solver` 25.4 or greater to fix issues with spaces in `CONDA_BLD_PATH`. This bumps the minimum `conda` requirement to 24.11. (#5675)
8+
9+
### Deprecations
10+
11+
* <news item>
12+
13+
### Docs
14+
15+
* <news item>
16+
17+
### Other
18+
19+
* <news item>

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ classifiers = [
2424
dependencies = [
2525
"beautifulsoup4",
2626
"chardet",
27-
"conda >=23.7.0",
27+
"conda >=24.11.0",
2828
# Disabled due to conda-index not being available on PyPI
2929
# "conda-index >=0.4.0",
3030
"conda-package-handling >=2.2.0",

recipe/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ requirements:
3131
run:
3232
- beautifulsoup4
3333
- chardet
34-
- conda >=23.7.0
34+
- conda >=24.11.0
3535
- conda-index >=0.4.0
3636
- conda-package-handling >=2.2.0
3737
- evalidate >=2,<3.0a0

tests/requirements.txt

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
beautifulsoup4
22
chardet
3-
conda >=23.7.0
3+
conda >=24.11.0
44
conda-index >=0.4.0
5-
conda-libmamba-solver # ensure we use libmamba
5+
conda-libmamba-solver >=25.4.0 # ensure we use libmamba
66
conda-package-handling >=2.2.0
7+
editables
78
evalidate >=2,<3.0a0
89
filelock
910
frozendict >=2.4.2
11+
hatch-vcs >=0.2.0
12+
hatchling >=1.12.2
1013
jinja2
1114
jsonschema >=4.19
1215
packaging
16+
pip
1317
pkginfo
1418
psutil
1519
py-lief
@@ -19,5 +23,6 @@ pytz
1923
pyyaml
2024
requests
2125
ripgrep # for faster grep
26+
setuptools
2227
setuptools_scm # needed for devenv version detection
2328
tqdm
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
:: cd %RECIPE_DIR%\..\..\test-package
2-
:: pip install .
3-
python setup.py install --old-and-unmanageable
2+
pip install .
43
if errorlevel 1 exit 1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# conda-build/tests/test-recipes/test-package
22
# cd $RECIPE_DIR/../../test-package
33

4-
# pip install .
5-
python setup.py install --old-and-unmanageable
4+
pip install .

tests/test-recipes/metadata/entry_points/meta.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ build:
1717
requirements:
1818
build:
1919
- python
20+
- pip
2021
- setuptools
2122
run:
2223
- python

tests/test-recipes/metadata/jinja_load_toml/meta.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ requirements:
1313
build:
1414
- python >={{ deps.get("python").lstrip("^") }}
1515
- pip
16+
- setuptools
1617

1718
run:
1819
{% for dep in deps -%}
@@ -27,4 +28,4 @@ requirements:
2728

2829
build:
2930
script: {{ PYTHON }} -m pip install .
30-
noarch: python
31+
noarch: python

tests/test_api_build.py

-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import uuid
1717
from collections import OrderedDict
1818
from contextlib import nullcontext
19-
from datetime import datetime
2019
from glob import glob
2120
from pathlib import Path
2221
from shutil import which
@@ -1437,10 +1436,6 @@ def test_recursion_layers(testing_config):
14371436
sys.platform != "win32",
14381437
reason="spaces break openssl prefix replacement on *nix",
14391438
)
1440-
@pytest.mark.skipif(
1441-
datetime.now() < datetime(2025, 5, 31),
1442-
reason="Unblock CI while https://github.com/mamba-org/mamba/issues/3730 gets a fix",
1443-
)
14441439
def test_croot_with_spaces(testing_metadata, testing_workdir):
14451440
testing_metadata.config.croot = os.path.join(testing_workdir, "space path")
14461441
api.build(testing_metadata)

0 commit comments

Comments
 (0)