Skip to content

[v1.8] env_project_file correctly handle directories #45284

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

Closed
wants to merge 5 commits into from
+12 −1
Closed

[v1.8] env_project_file correctly handle directories #45284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dea3992
env_project_file correctly handle directories
simonbyrne May 11, 2022
71cc043
add tests
simonbyrne May 13, 2022
d4e2ae9
add some `joinpath`s
KristofferC May 16, 2022
880cdaa
Merge branch 'backports-release-1.8' into sb/env_project_file
simonbyrne May 26, 2022
2b02dbb
Update test/loading.jl
simonbyrne May 27, 2022
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 base/loading.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,14 +423,14 @@ function env_project_file(env::String)::Union{Bool,String}
project_file === nothing || return project_file
end
if isdir(env)
project_file = true
for proj in project_names
maybe_project_file = joinpath(env, proj)
if isfile_casesensitive(maybe_project_file)
project_file = maybe_project_file
break
end
end
project_file =true
elseif basename(env) in project_names && isfile_casesensitive(env)
project_file = env
else
Expand Down
11 changes: 11 additions & 0 deletions test/loading.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,17 @@ end
[deps]
This = "$this_uuid"
""")

@test Base.env_project_file(joinpath(dir)) == project_file
@test Base.env_project_file(joinpath(project_file)) == project_file

@test Base.env_project_file(joinpath(dir, "This")) === false
@test Base.env_project_file(joinpath(project_file, "This")) === false

mkdir(joinpath(dir, "Inner"))
@test Base.env_project_file(joinpath(dir, "Inner")) === true
@test Base.env_project_file(joinpath(dir, "Inner", "Project.toml")) === false

# look up various packages by name
root = Base.identify_package("Root")
this = Base.identify_package("This")
Expand Down