Skip to content

Commit

Permalink
Make Deps.pip a closure again (#1240)
Browse files Browse the repository at this point in the history
* Make Deps.pip a closure again

* Use +0.XX-DEV suffix in version

This is so that we could still keep using DocumenterTools on CI, which
restricts Documenter to 0.24.

* Support build numbers in Documenter version number
  • Loading branch information
mortenpi authored Mar 24, 2020
1 parent fc81e4e commit 3ccd903
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Documenter.jl changelog

## Version `v0.25.0`

* ![Bugfix][badge-bugfix] `Deps.pip` is again a closure and gets executed during the `deploydocs` call, not before it. ([#1240][github-1240])

## Version `v0.24.7`

* ![Bugfix][badge-bugfix] Remove `only`, a new export from `Base` on Julia 1.4, from the JS search filter. ([#1264][github-1264])
Expand Down Expand Up @@ -526,6 +530,7 @@
[github-1222]: https://github.com/JuliaDocs/Documenter.jl/pull/1222
[github-1223]: https://github.com/JuliaDocs/Documenter.jl/pull/1223
[github-1232]: https://github.com/JuliaDocs/Documenter.jl/pull/1232
[github-1240]: https://github.com/JuliaDocs/Documenter.jl/pull/1240
[github-1258]: https://github.com/JuliaDocs/Documenter.jl/pull/1258
[github-1264]: https://github.com/JuliaDocs/Documenter.jl/pull/1264
[github-1269]: https://github.com/JuliaDocs/Documenter.jl/pull/1269
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Documenter"
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
version = "0.24.7"
version = "0.24.7+0.25-DEV"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/man/hosting.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ dependencies your package might have. If Documenter is the only dependency, then

````@eval
import Documenter, Markdown
m = match(r"^version = \"(\d+.\d+.\d+)(-DEV)?\"$"m,
m = match(r"^version = \"(\d+.\d+.\d+)(-DEV)?(\+.+)?\"$"m,
read(joinpath(dirname(dirname(pathof(Documenter))), "Project.toml"), String))
v = VersionNumber(m.captures[1])
Markdown.parse("""
Expand Down
6 changes: 1 addition & 5 deletions src/Deps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ deploydocs(
)
```
"""
function pip(deps...)
for dep in deps
run(`pip install --user $(dep)`)
end
end
pip(deps...) = () -> map(dep -> run(`pip install --user $(dep)`), deps)


function localbin()
Expand Down

0 comments on commit 3ccd903

Please sign in to comment.