Skip to content

Require [compat] for stdlib dependencies #516

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

Merged
merged 6 commits into from
Oct 26, 2023
Merged

Require [compat] for stdlib dependencies #516

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c944ec
Require [compat] for all dependencies
vchuravy Oct 6, 2023
dba1c5c
back out JLL change for now
vchuravy Oct 14, 2023
9a2ed55
fixup
vchuravy Oct 14, 2023
bdf76fb
Bump the major version number to 9
DilumAluthge Oct 14, 2023
176ffd4
update integration tests
vchuravy Oct 19, 2023
0974fd6
Merge branch 'master' into vc/require_compat_for_all
DilumAluthge Oct 26, 2023
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
4 changes: 2 additions & 2 deletions src/AutoMerge/guidelines.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ function meets_compat_for_all_deps(working_directory::AbstractString, pkg, versi
for version_range in keys(deps)
if version in Pkg.Types.VersionRange(version_range)
for name in keys(deps[version_range])
if !is_jll_name(name) && !is_julia_stdlib(name)
@debug("Found a new (non-stdlib non-JLL) dependency: $(name)")
if !is_jll_name(name)
@debug("Found a new dependency: $(name)")
dep_has_compat_with_upper_bound[name] = false
end
end
Expand Down
14 changes: 0 additions & 14 deletions src/AutoMerge/util.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,20 +239,6 @@ function comment_text_merge_now()
return result
end

is_julia_stdlib(name) = name in julia_stdlib_list()

function julia_stdlib_list()
stdlib_list = readdir(Pkg.Types.stdlib_dir())
# Before Julia v1.6 Artifacts.jl isn't a standard library, but
# we want to include it because JLL packages depend on the empty
# placeholder https://github.com/JuliaPackaging/Artifacts.jl
# in older versions for compatibility.
if VERSION < v"1.6.0"
push!(stdlib_list, "Artifacts")
end
return stdlib_list
end

function now_utc()
utc = TimeZones.tz"UTC"
return Dates.now(utc)
Expand Down