Skip to content

Commit 4b80a64

Browse files
authored
update build=**cpython** (#186)
Co-authored-by: Christopher Doris <github.com/cjdoris>
1 parent c0e1979 commit 4b80a64

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## Unreleased
4+
* `build=**cpython**` functionality updated for newer build strings in conda-forge.
5+
36
## 0.2.29 (2025-05-14)
47
* Bug fix: detect actual libstdcxx version.
58
* Bug fix: comparing paths on weird filesystems.

src/resolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ function _resolve_merge_packages(packages, channels)
400400
pkg = PkgSpec(pkg, channel = channel)
401401
end
402402
if pkg.channel == "conda-forge"
403-
build = "*cpython*"
403+
build = "*cp*" # "cpython" or "cp313"
404404
elseif pkg.channel in ("anaconda", "pkgs/main")
405405
build = ""
406406
else

test/main.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,19 @@ end
198198
@test true
199199
end
200200

201+
@testitem "install/remove python (build=**cpython**)" begin
202+
@testset "$version" for version in ["3.12.*", "3.13.*"]
203+
include("setup.jl")
204+
CondaPkg.add("python", version = version, build = "**cpython**")
205+
CondaPkg.resolve()
206+
@test occursin("python", status())
207+
@test occursin("($version, build=**cpython**)", status())
208+
CondaPkg.rm("python")
209+
CondaPkg.resolve()
210+
@test !occursin("python", status())
211+
end
212+
end
213+
201214
@testitem "install non-existent package" begin
202215
include("setup.jl")
203216

0 commit comments

Comments
 (0)