diff --git a/REQUIRE b/REQUIRE index 2aa1c97d2d..2183f546c5 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,3 +1,3 @@ julia 0.6 -Compat 0.62.0 +Compat 0.70.0 # reduce(; init=...) / Compat#590 DocStringExtensions 0.2 diff --git a/docs/src/man/examples.md b/docs/src/man/examples.md index 4de0633a6b..86a3d354bb 100644 --- a/docs/src/man/examples.md +++ b/docs/src/man/examples.md @@ -45,7 +45,7 @@ Packages that have tagged versions available in `METADATA.jl`. - [POMDPs.jl](http://juliapomdp.github.io/POMDPs.jl/latest/) - [PhyloNetworks.jl](http://crsl4.github.io/PhyloNetworks.jl/latest/) - [PrivateModules.jl](https://michaelhatherly.github.io/PrivateModules.jl/latest/) -- [Query.jl](http://www.david-anthoff.com/Query.jl/stable/) +- [Query.jl](http://www.queryverse.org/Query.jl/stable/) - [TaylorSeries.jl](http://www.juliadiff.org/TaylorSeries.jl/latest/) - [Weave.jl](http://weavejl.mpastell.com/stable/) diff --git a/docs/src/man/guide.md b/docs/src/man/guide.md index b2f4d5d6e4..d172e8a975 100644 --- a/docs/src/man/guide.md +++ b/docs/src/man/guide.md @@ -296,7 +296,7 @@ not supported for `@index`. Documenter produces a set of Markdown files, which then have to be converted into a user-readable format for distribution. While in principle any Markdown parser would do (as long as it supports the required -Markdown extensions), the Python-based [MkDocs](http://www.mkdocs.org/) is usually used +Markdown extensions), the Python-based [MkDocs](https://www.mkdocs.org/) is usually used to convert the Markdown files into a set of HTML pages. See [Hosting Documentation](@ref) for further information on configuring MkDocs for Documenter. diff --git a/docs/src/man/hosting.md b/docs/src/man/hosting.md index 1bb1cbbb3e..7c93b7c88c 100644 --- a/docs/src/man/hosting.md +++ b/docs/src/man/hosting.md @@ -149,7 +149,7 @@ This will deploy the docs from the OSX Julia nightly Travis build bot. The keyword `deps` serves to provide the required dependencies to deploy the documentation. In the example above we include the dependencies -[mkdocs](http://www.mkdocs.org) +[mkdocs](https://www.mkdocs.org) and [`python-markdown-math`](https://github.com/mitya57/python-markdown-math). The former makes sure that MkDocs is installed to deploy the documentation, and the latter provides the `mdx_math` markdown extension to exploit MathJax @@ -160,7 +160,7 @@ See the [`deploydocs`](@ref) function documentation for more details. ## The MkDocs `mkdocs.yml` File -We'll be using [MkDocs](http://www.mkdocs.org) to convert the markdown files generated by +We'll be using [MkDocs](https://www.mkdocs.org) to convert the markdown files generated by Documenter to HTML. (This, of course, is not the only option you have for this step. Any markdown to HTML converter should work fine with some amount of setting up.) diff --git a/src/DocChecks.jl b/src/DocChecks.jl index ba5e5ccbe6..25f43cb6ce 100644 --- a/src/DocChecks.jl +++ b/src/DocChecks.jl @@ -40,7 +40,7 @@ function missingdocs(doc::Documents.Document) end end end - n = reduce(+, 0, map(length, values(bindings))) + n = Compat.reduce(+, map(length, values(bindings)), init=0) if n > 0 b = IOBuffer() println(b, "$n docstring$(n ≡ 1 ? "" : "s") potentially missing:\n") diff --git a/src/Documenter.jl b/src/Documenter.jl index 567e1f2692..d1e3c28ee3 100644 --- a/src/Documenter.jl +++ b/src/Documenter.jl @@ -17,7 +17,7 @@ $(EXPORTS) module Documenter using Compat, DocStringExtensions -import Compat.Base64: base64decode, base64encode +import Compat.Base64: base64decode import Compat: @info import Compat.Pkg @@ -530,7 +530,7 @@ function git_push( version = VersionNumber(tag) # only push to stable if this is the latest stable release versions = filter!(x -> occursin(Base.VERSION_REGEX, x), readdir(dirname)) - maxver = mapreduce(x -> VersionNumber(x), max, v"0.0.0", versions) + maxver = Compat.mapreduce(x -> VersionNumber(x), max, versions; init=v"0.0.0") if version >= maxver && version.prerelease == () # don't deploy to stable for prereleases gitrm_copy(target_dir, stable_dir) Writers.HTMLWriter.generate_siteinfo_file(stable_dir, "stable") diff --git a/src/Travis.jl b/src/Travis.jl index dc824f0f7c..c70bb81db9 100644 --- a/src/Travis.jl +++ b/src/Travis.jl @@ -7,6 +7,7 @@ module Travis using Compat, DocStringExtensions import Compat.Pkg +import Compat.Base64: base64encode export genkeys diff --git a/test/generate.jl b/test/generate.jl index cb76713c33..53c4ab3e31 100644 --- a/test/generate.jl +++ b/test/generate.jl @@ -1,6 +1,7 @@ module GenerateTests using Compat.Test +import Compat.Random: randstring using Documenter @testset "Generate" begin diff --git a/test/nongit/tests.jl b/test/nongit/tests.jl index c897e88ead..c553787078 100644 --- a/test/nongit/tests.jl +++ b/test/nongit/tests.jl @@ -5,5 +5,5 @@ mktempdir() do tmpdir cp(joinpath(@__DIR__, "docs"), joinpath(tmpdir, "docs")) include(joinpath(tmpdir, "docs/make.jl")) # Copy the build/ directory back so that it would be possible to inspect the output. - cp(joinpath(tmpdir, "docs/build"), joinpath(@__DIR__, "build"); remove_destination=true) + Compat.cp(joinpath(tmpdir, "docs/build"), joinpath(@__DIR__, "build"); force=true) end