Support shared named environments during startup (#40025)

* Support shared named envs during startup * Improved handling of named envs during startup Co-authored-by: Jameson Nash <[email protected]> * Improve tests for --project and JULIA_PROJECT * Add news item about shared env support at startup Co-authored-by: Jameson Nash <[email protected]>
JuliaLang · Mar 24, 2021 · 10ab32f · 10ab32f
1 parent 08006c4
commit 10ab32f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -18,6 +18,8 @@ Compiler/Runtime improvements
 Command-line option changes
 ---------------------------
 
+* The Julia `--project` option and the `JULIA_PROJECT` environment variable now support selecting shared environments like `.julia/environments/myenv` the same way the package management console does: use `julia --project=@myenv` resp. `export JULIA_PROJECT="@myenv"` ([#40025]).
+
 
 Multi-threading changes
 -----------------------

diff --git a/base/initdefs.jl b/base/initdefs.jl
@@ -235,7 +235,7 @@ function init_active_project()
  ACTIVE_PROJECT[] =
  project === nothing ? nothing :
  project == "" ? nothing :
- project == "@." ? current_project() : abspath(expanduser(project))
+ startswith(project, "@") ? load_path_expand(project) : abspath(expanduser(project))
 end
 
 ## load path expansion: turn LOAD_PATH entries into concrete paths ##

diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
@@ -110,9 +110,16 @@ let exename = `$(Base.julia_cmd()) --startup-file=no --color=no`
 
  # ~ expansion in --project and JULIA_PROJECT
  if !Sys.iswindows()
- expanded = abspath(expanduser("~/foo"))
- @test occursin(expanded, readchomp(`$exename --project='~/foo' -E 'Base.active_project()'`))
- @test occursin(expanded, readchomp(setenv(`$exename -E 'Base.active_project()'`, "JULIA_PROJECT" => "~/foo", "HOME" => homedir())))
+ let expanded = abspath(expanduser("~/foo/Project.toml"))
+ @test expanded == readchomp(`$exename --project='~/foo' -e 'println(Base.active_project())'`)
+ @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "~/foo", "HOME" => homedir()))
+ end
+ end
+
+ # handling of @projectname in --project and JULIA_PROJECT
+ let expanded = abspath(Base.load_path_expand("@foo"))
+ @test expanded == readchomp(`$exename --project='@foo' -e 'println(Base.active_project())'`)
+ @test expanded == readchomp(setenv(`$exename -e 'println(Base.active_project())'`, "JULIA_PROJECT" => "@foo", "HOME" => homedir()))
  end
 
  # --quiet, --banner