Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consider the extras block when checking for new versions #502

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Consider the extras block when checking for new versions #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cffdfe
Consider the extras block when checking for new versions
andreasnoack Sep 5, 2024
a7b0543
Merge branch 'master' into an/extras
DilumAluthge Sep 24, 2024
1aea258
Merge branch 'master' into an/extras
DilumAluthge Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dependencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function get_project_deps(project_file::AbstractString; include_jll::Bool=false)
dep_section = Dict{DepInfo,String}()
project = TOML.parsefile(project_file)

for section in ["deps", "weakdeps"]
for section in ["deps", "weakdeps", "extras"]
if haskey(project, section)
deps = project[section]
add_compat_section!(project)
Expand Down
6 changes: 5 additions & 1 deletion test/dependencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ end
for (k, s) in pairs(dep_section)
if k.package.name ∈ ["Bex_jll", "Skix"]
@test s == "weakdeps"
elseif k.package.name ∈ ["Baz"]
@test s == "extras"
else
@test s == "deps"
end
Expand All @@ -31,6 +33,8 @@ end
for (k, s) in pairs(dep_section)
if k.package.name == "Skix"
@test s == "weakdeps"
elseif k.package.name == "Baz"
@test s == "extras"
else
@test s == "deps"
end
Expand Down Expand Up @@ -142,7 +146,7 @@ end
project_file = joinpath(pkgdir(CompatHelper), "Project.toml")

# Just for this test, we hardcode this list
unregistered_stdlibs = ["Base64", "Dates", "Pkg", "UUIDs"]
unregistered_stdlibs = ["Base64", "Dates", "Pkg", "Random", "Test", "UUIDs"]

@test ispath(project_file)
@test isfile(project_file)
Expand Down
4 changes: 3 additions & 1 deletion test/deps/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ version = "1.0.0"

[deps]
Foobar_jll = "6ca821de-e512-569d-89d9-0b16ce691416"
Baz = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

[weakdeps]
Expand All @@ -14,6 +13,9 @@ Skix = "3db6da90-6ed3-11ee-0779-f549c8e3e90d"
[extensions]
Ext = ["Bex_jll", "Skix"]

[extras]
Baz = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"

[compat]
Foobar_jll = "1"
Baz = "1"
Expand Down
Loading