Skip to content
This repository has been archived by the owner on May 29, 2024. It is now read-only.

Commit

Permalink
Bump minimum Julia to 1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
tecosaur committed May 21, 2024
1 parent f8ab1a3 commit 1e3b988
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 26 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ jobs:
strategy:
matrix:
version:
- '1'
- '1.7'
- '1.8'
- '1.9'
- '1.10'
- '1'
- 'nightly'
os:
- ubuntu-latest
Expand Down
3 changes: 1 addition & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ version = "0.9.1"
[deps]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
MetaGraphsNext = "fa8bd995-216d-47f1-8a91-f3b68fbeb377"
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Expand All @@ -22,7 +21,7 @@ GraphExt = "MetaGraphsNext"
MetaGraphsNext = "0.5, 0.6"
Compat = "3.29, 4"
PrecompileTools = "1"
julia = "1.6"
julia = "1.9"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
11 changes: 2 additions & 9 deletions src/model/usepkg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,15 @@ struct PkgRequiredRerunNeeded end
get_package(from::Module, name::Symbol)
Obtain a module specified by either `pkg` or identified by `name` and declared
by `from`. Should the package not be currently loaded, in Julia ≥ 1.7
DataToolkit will attempt to lazy-load the package and return its module.
by `from`. Should the package not be currently loaded DataToolkit will attempt
to lazy-load the package and return its module.
Failure to either locate `name` or require `pkg` will result in an exception
being thrown.
"""
function get_package(pkg::Base.PkgId)
if !Base.root_module_exists(pkg)
fmtpkg = string(pkg.name, '[', pkg.uuid, ']')
if VERSION < v"1.7" # Before `Base.invokelatest`
@error string(
"The package $fmtpkg is required for the operation of DataToolkit.\n",
"DataToolkit can not do this for you, so please add `using $(pkg.name)`\n",
"as appropriate then re-trying this operation.")
throw(MissingPackage(pkg))
end
@info "Lazy-loading $fmtpkg"
try
Base.require(pkg)
Expand Down
20 changes: 8 additions & 12 deletions src/precompile.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
# function load(::DataLoader{:passthrough}, from::T, ::Type{T}) where {T <: Any}
# from
# end
if VERSION >= v"1.9"
Base.active_repl =
REPL.LineEditREPL(REPL.Terminals.TTYTerminal("", stdin, stdout, stderr), true)
end
Base.active_repl =
REPL.LineEditREPL(REPL.Terminals.TTYTerminal("", stdin, stdout, stderr), true)
@compile_workload begin
loadcollection!(IOBuffer(datatoml))
write(devnull, STACK[1])
Expand All @@ -39,14 +37,12 @@
lint(STACK[1])
@advise STACK[1] sum(1:3)
# REPL
if VERSION >= v"1.9"
init_repl()
redirect_stdio(stdout=devnull, stderr=devnull) do
toplevel_execute_repl_cmd("?")
toplevel_execute_repl_cmd("?help")
toplevel_execute_repl_cmd("help help")
toplevel_execute_repl_cmd("help :")
end
init_repl()
redirect_stdio(stdout=devnull, stderr=devnull) do
toplevel_execute_repl_cmd("?")
toplevel_execute_repl_cmd("?help")
toplevel_execute_repl_cmd("help help")
toplevel_execute_repl_cmd("help :")
end
complete_repl_cmd("help ")
# Other stuff
Expand Down

0 comments on commit 1e3b988

Please sign in to comment.