Skip to content

Commit

Permalink
Restore filtering of non-src files (#776)
Browse files Browse the repository at this point in the history
* Restore filtering of non-src files

This patch restores the filtering of non-src files that was lost
in #767. After JuliaLang/julia#49866,
`Base.parse_cache_header` returns both the non-filtered and filtered
list instead of doing filtering internally based on the
`srcfiles_only::Bool` keyword argument.

There is a test for this failure mode that fails on Revise master branch
and passes with this patch (see
https://github.com/timholy/Revise.jl/blob/1059181bed06387e9fbcea137dce28a80c5c45d9/test/runtests.jl#L3070-L3080).

* Set version to 3.5.9.
  • Loading branch information
fredrikekre committed Nov 14, 2023
1 parent 1059181 commit 50c06bc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Revise"
uuid = "295af30f-e4ad-537b-8983-00126c2a3abe"
version = "3.5.8"
version = "3.5.9"

[deps]
CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
Expand Down
6 changes: 4 additions & 2 deletions src/loading.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ function pkg_fileinfo(id::PkgId)
cachepath = origin.cachepath
cachepath === nothing && return nothing, nothing, nothing
provides, includes_requires, required_modules = try
@static if VERSION v"1.11.0-DEV.683"
Base.parse_cache_header(cachepath)
@static if VERSION v"1.11.0-DEV.683" # https://github.com/JuliaLang/julia/pull/49866
provides, (_, includes_srcfiles_only, requires), required_modules, _... =
Base.parse_cache_header(cachepath)
provides, (includes_srcfiles_only, requires), required_modules
else
Base.parse_cache_header(cachepath, srcfiles_only = true)
end
Expand Down

2 comments on commit 50c06bc

@KristofferC
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/95298

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v3.5.9 -m "<description of version>" 50c06bc7373692f9aa4ca49d26facc2c8386baaf
git push origin v3.5.9

Please sign in to comment.