From 808c90cf3b6c6a1cd956f59c2ee3ba0be7b8b96a Mon Sep 17 00:00:00 2001 From: Mauro Date: Thu, 18 Jul 2019 08:43:26 +0000 Subject: [PATCH] Moving to use Pkg3 and new Documenter (#99) --- .travis.yml | 17 +++++++++++------ Project.toml | 19 +++++++++++++++++++ REQUIRE | 2 -- appveyor.yml | 1 - docs/Project.toml | 5 +++++ docs/make.jl | 10 ++++------ 6 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 Project.toml delete mode 100644 REQUIRE create mode 100644 docs/Project.toml diff --git a/.travis.yml b/.travis.yml index 141c633..f8ce07d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ os: - linux - osx julia: - - 0.7 - 1.0 - nightly matrix: @@ -17,8 +16,14 @@ notifications: # https://github.com/travis-ci/travis-ci/issues/4942 git: depth: 99999 -## Documeter.jl -after_success: - - julia -e 'using Pkg; ps=Pkg.PackageSpec(name="Documenter", version="0.19"); Pkg.add(ps); Pkg.pin(ps)' - - julia -e 'import Parameters; cd(joinpath(dirname(pathof(Parameters)), "..")); include(joinpath("docs", "make.jl"))' - - julia -e 'using Pkg; cd(Pkg.dir("Parameters")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())' +## Documeter.jl https://discourse.julialang.org/t/psa-use-a-project-for-building-your-docs/14974/5 +jobs: + include: + - stage: "Documentation" + julia: 1.0 + os: linux + script: + - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); + Pkg.instantiate()' + - julia --project=docs/ docs/make.jl + after_success: skip diff --git a/Project.toml b/Project.toml new file mode 100644 index 0000000..3f3f70b --- /dev/null +++ b/Project.toml @@ -0,0 +1,19 @@ +name = "Parameters" +uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" +author = ["Mauro Werder "] +version = "0.11.0" + +[deps] +OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" + +[compat] +OrderedCollections = "≥ 0.1.0" +julia = "≥ 1.0.0" + +[extras] +Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" +REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["REPL", "Test", "Markdown"] diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 0fe3d88..0000000 --- a/REQUIRE +++ /dev/null @@ -1,2 +0,0 @@ -julia 0.7 -OrderedCollections 0.1 diff --git a/appveyor.yml b/appveyor.yml index 71853ad..6cb58d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,5 @@ environment: matrix: - - julia_version: 0.7 - julia_version: 1.0 - julia_version: latest diff --git a/docs/Project.toml b/docs/Project.toml new file mode 100644 index 0000000..cb41828 --- /dev/null +++ b/docs/Project.toml @@ -0,0 +1,5 @@ +[deps] +Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" + +[compat] +Documenter = "~0.22" diff --git a/docs/make.jl b/docs/make.jl index 2dbb5c3..42193a0 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,6 +1,8 @@ using Documenter, Parameters makedocs( - format = :html, + format = Documenter.HTML( + prettyurls = get(ENV, "CI", nothing) == "true" + ), sitename = "Parameters.jl", # pages also make the side-bar pages = Any[ @@ -10,9 +12,5 @@ makedocs( ) deploydocs( - repo = "github.com/mauro3/Parameters.jl.git", - julia = "1.0", - target = "build", - deps = nothing, - make = nothing + repo = "github.com/mauro3/Parameters.jl.git" )