Skip to content

Commit 236d59f

Browse files
committed
Bump conda and conda-libmamba-solver minimum versions
- Bump minimum conda version from 24.11.0 to 25.11.0 - Bump minimum conda-libmamba-solver from 25.4.0 to 25.11.0 - Remove obsolete CondaSolver deprecation warning filters (CLS PR #691 merged)
1 parent 0ade301 commit 236d59f

File tree

5 files changed

+43
-9
lines changed

5 files changed

+43
-9
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ jobs:
402402
conda-version: canary
403403
test-type: parallel
404404
env:
405-
CONDA_CHANNEL_LABEL: ${{ matrix.conda-version == 'canary' && 'conda-canary/label/dev' || 'defaults' }}
405+
# Use conda-forge for release tests since conda 25.11+ is not in defaults for osx-64
406+
CONDA_CHANNEL_LABEL: ${{ matrix.conda-version == 'canary' && 'conda-canary/label/dev' || 'conda-forge' }}
406407
PYTEST_MARKER: ${{ matrix.test-type == 'serial' && 'serial' || 'not serial' }}
407408

408409
steps:

news/bump-conda-requirement.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
### Enhancements
2+
3+
* <news item>
4+
5+
### Bug fixes
6+
7+
* <news item>
8+
9+
### Deprecations
10+
11+
* Bump minimum `conda` version to 25.11.0 and `conda-libmamba-solver` to 25.11.0. Remove obsolete `CondaSolver` deprecation warning filters. (#xxxx)
12+
13+
### Docs
14+
15+
* <news item>
16+
17+
### Other
18+
19+
* Use `conda-forge` channel for macOS Intel (osx-64) CI tests since conda 25.11+ is not available in `defaults` channel for that platform. (#xxxx)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
### Enhancements
2+
3+
* <news item>
4+
5+
### Bug fixes
6+
7+
* <news item>
8+
9+
### Deprecations
10+
11+
* Remove obsolete `restore_free_channel` deprecation warning filter. This property was removed in conda 25.9.0. (#xxxx)
12+
13+
### Docs
14+
15+
* <news item>
16+
17+
### Other
18+
19+
* <news item>

pyproject.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ classifiers = [
2424
dependencies = [
2525
"beautifulsoup4",
2626
"chardet",
27-
"conda >=24.11.0",
27+
"conda >=25.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",
@@ -128,9 +128,6 @@ filterwarnings = [
128128
"ignore:conda.core.index._supplement_index_with_system is pending deprecation:PendingDeprecationWarning:conda",
129129
# ignore tarfile Python 3.14 warning
130130
"ignore:Python 3.14 will, by default, filter extracted tar archives:DeprecationWarning",
131-
# TEMPORARY: Remove once CLS is released with https://github.com/conda/conda-libmamba-solver/pull/691
132-
"ignore:conda.plugins.CondaSolver:PendingDeprecationWarning",
133-
"ignore:conda.plugins.CondaSolver:DeprecationWarning",
134131
# ignore conda prefix data deprecation
135132
"ignore:conda.core.prefix_data:DeprecationWarning",
136133
# ignore conda prefix data pending deprecation (including pip_interop_enabled)
@@ -143,8 +140,6 @@ filterwarnings = [
143140
# ignore conda link PrefixActions deprecation
144141
"ignore:conda.core.link.PrefixActions is deprecated and will be removed in 26.3:DeprecationWarning",
145142
"ignore:conda.core.link.PrefixActions is pending deprecation and will be removed in 26.3:PendingDeprecationWarning",
146-
# ignore conda context restore_free_channel deprecation
147-
"ignore:conda.base.context.Context.restore_free_channel is deprecated:DeprecationWarning",
148143
# ignore conda PathType -> PathEnum rename deprecation
149144
"ignore:conda.models.enums.PathType is pending deprecation:PendingDeprecationWarning",
150145
]

tests/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
beautifulsoup4
22
chardet
3-
conda >=24.11.0
3+
conda >=25.11.0
44
conda-index >=0.4.0
5-
conda-libmamba-solver >=25.4.0 # ensure we use libmamba
5+
conda-libmamba-solver >=25.11.0 # includes fix for CondaSolver deprecation warnings
66
conda-package-handling >=2.2.0
77
editables
88
evalidate >=2,<3.0a0

0 commit comments

Comments
 (0)