From 5c1e12cc3e3173c37aae978521c5a34981d0d9b9 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 12 Sep 2023 11:08:48 +1200 Subject: [PATCH 01/10] Do Not Merge: test Documenter #2247 --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index 3ac1508a811..af40b3aaad1 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -4,7 +4,7 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. import Pkg -Pkg.pkg"add Documenter#2fabe9c3bd40b6288c3d86d96c6031728b2d92ad" +Pkg.pkg"add Documenter#afeb75d1b2abc7166752c5e00675c8b62ee0bea3" import Documenter import Downloads From fc010b884ad721444a4e767e0805b4f2d4c26135 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 12 Sep 2023 12:24:16 +1200 Subject: [PATCH 02/10] Update make.jl --- docs/make.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/make.jl b/docs/make.jl index af40b3aaad1..c232bd2c13f 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -549,6 +549,7 @@ write(joinpath(@__DIR__, "src", "JuMP.pdf"), "") sidebar_sitename = false, # Do no check for large pages. size_threshold = nothing, + example_size_threshold = 0, ), modules = [JuMP, MOI], checkdocs = :none, From 509a4ec9e7656d7be7f611bb61cb51fcac0c5823 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 12 Sep 2023 15:32:37 +1200 Subject: [PATCH 03/10] Update docs/make.jl --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index c232bd2c13f..4269d293752 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -549,7 +549,7 @@ write(joinpath(@__DIR__, "src", "JuMP.pdf"), "") sidebar_sitename = false, # Do no check for large pages. size_threshold = nothing, - example_size_threshold = 0, + example_size_threshold = 1, ), modules = [JuMP, MOI], checkdocs = :none, From f7a3ec8d5660af0aa46149d75de5b2e20842f02d Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 12 Sep 2023 17:04:00 +1200 Subject: [PATCH 04/10] Update docs/make.jl Co-authored-by: Morten Piibeleht --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index 4269d293752..7dfbc0d1cf2 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -4,7 +4,7 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. import Pkg -Pkg.pkg"add Documenter#afeb75d1b2abc7166752c5e00675c8b62ee0bea3" +Pkg.pkg"add Documenter#b8ea2c45f09b2205c71b56518714b4ea7e0b44b6" import Documenter import Downloads From e59ed36f4db469c28a11c3a07d93975acc6b45e2 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 12 Sep 2023 19:27:24 +1200 Subject: [PATCH 05/10] Update docs/make.jl --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index 7dfbc0d1cf2..e580fbb769b 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -549,7 +549,7 @@ write(joinpath(@__DIR__, "src", "JuMP.pdf"), "") sidebar_sitename = false, # Do no check for large pages. size_threshold = nothing, - example_size_threshold = 1, + # example_size_threshold = 1, ), modules = [JuMP, MOI], checkdocs = :none, From 802fc18535f720d4d03ec34dcb8056b2785c3bc1 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 15 Sep 2023 08:39:11 +1200 Subject: [PATCH 06/10] Update docs/make.jl --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index e580fbb769b..7066d15b73b 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -4,7 +4,7 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. import Pkg -Pkg.pkg"add Documenter#b8ea2c45f09b2205c71b56518714b4ea7e0b44b6" +Pkg.pkg"add Documenter#975a0d3bc5aaca33148d76059a65433be2a3df11" import Documenter import Downloads From 8afb510e49143a435636f1823d965e973fe4c648 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 15 Sep 2023 13:25:03 +1200 Subject: [PATCH 07/10] Update make.jl --- docs/make.jl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/make.jl b/docs/make.jl index 7066d15b73b..dc2bbfa5c01 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -548,8 +548,19 @@ write(joinpath(@__DIR__, "src", "JuMP.pdf"), "") assets = ["assets/extra_styles.css"], sidebar_sitename = false, # Do no check for large pages. - size_threshold = nothing, - # example_size_threshold = 1, + size_threshold_ignore = [ + "changelog.md", + "release_notes.md", + "api/JuMP.md", + "tutorials/getting_started/getting_started_with_data_and_plotting.md", + "moi/changelog.md", + "moi/release_notes.md", + "moi/reference/models.md", + "moi/reference/standard_form.md", + "moi/submodules/Bridges/list_of_bridges.md", + "moi/submodules/Bridges/reference.md", + "moi/submodules/Utilities/reference.md", + ], ), modules = [JuMP, MOI], checkdocs = :none, From 599c1fdf3b2a27dc7455449f15762cca8c9d9803 Mon Sep 17 00:00:00 2001 From: odow Date: Sat, 16 Sep 2023 10:43:27 +1200 Subject: [PATCH 08/10] Update to Documenter@1 --- docs/Project.toml | 3 +-- docs/make.jl | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/Project.toml b/docs/Project.toml index 65ed8a72e6e..3fe7f5f49aa 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -22,7 +22,6 @@ MarkdownAST = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" MultiObjectiveAlgorithms = "0327d340-17cd-11ea-3e99-2fd5d98cecda" PATHSolver = "f5f7c340-0bb3-5c69-969a-41884d311d1b" -Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13" @@ -40,7 +39,7 @@ Clarabel = "=0.5.1" DataFrames = "1" DimensionalData = "0.24" Distributions = "0.25" -Documenter = "0.27.9, 0.28" +Documenter = "1" Dualization = "0.5" GLPK = "=1.1.2" HTTP = "1.5.4" diff --git a/docs/make.jl b/docs/make.jl index dc2bbfa5c01..bf69d046901 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -3,9 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -import Pkg -Pkg.pkg"add Documenter#975a0d3bc5aaca33148d76059a65433be2a3df11" - import Documenter import Downloads import Literate From 74a5a07e47321a2ac4a7b139e162e9bc1322a967 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Sat, 16 Sep 2023 11:01:30 +1200 Subject: [PATCH 09/10] Update docs/Project.toml --- docs/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Project.toml b/docs/Project.toml index 3fe7f5f49aa..c897d7b1660 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -39,7 +39,7 @@ Clarabel = "=0.5.1" DataFrames = "1" DimensionalData = "0.24" Distributions = "0.25" -Documenter = "1" +Documenter = "=1.0.0" Dualization = "0.5" GLPK = "=1.1.2" HTTP = "1.5.4" From 51d04bec731b6b1f3ec6e6814ebb98cd55a48ded Mon Sep 17 00:00:00 2001 From: odow Date: Sat, 16 Sep 2023 11:18:01 +1200 Subject: [PATCH 10/10] Add back Pkg --- docs/Project.toml | 1 + docs/make.jl | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/Project.toml b/docs/Project.toml index c897d7b1660..f9fa2673836 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -22,6 +22,7 @@ MarkdownAST = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" MultiObjectiveAlgorithms = "0327d340-17cd-11ea-3e99-2fd5d98cecda" PATHSolver = "f5f7c340-0bb3-5c69-969a-41884d311d1b" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13" diff --git a/docs/make.jl b/docs/make.jl index bf69d046901..2925e4d8b52 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -7,6 +7,7 @@ import Documenter import Downloads import Literate import MathOptInterface +import Pkg import Test import TOML