From 53db7f6c1c03db66acafe33aeb551d10c62c929c Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Wed, 17 Apr 2024 13:58:25 +0100 Subject: [PATCH 1/2] Use debug in docs generation --- .github/workflows/push.yml | 1 + docs/confidence-intervals.fsx | 2 +- docs/data.fsx | 2 +- docs/dendro.fsx | 2 +- docs/diagnostics.fsx | 2 +- docs/estimation-engine.fsx | 2 +- docs/examples/{plant-temperature.fsx => dendroecology.fsx} | 4 ++-- docs/examples/predator-prey.fsx | 2 +- docs/examples/shrub-resource.fsx | 2 +- docs/examples/tutorial.fsx | 2 +- docs/index.fsx | 2 +- docs/integration.fsx | 2 +- docs/language.fsx | 2 +- docs/logging.fsx | 2 +- docs/model-fitting.fsx | 2 +- docs/model-selection.fsx | 2 +- docs/model.fsx | 2 +- docs/optimisation.fsx | 2 +- docs/workflow.fsx | 2 +- 19 files changed, 20 insertions(+), 19 deletions(-) rename docs/examples/{plant-temperature.fsx => dendroecology.fsx} (97%) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bdf3ba6..3d23d4d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -57,6 +57,7 @@ jobs: - name: Build run: dotnet fake build -t All - name: Deploy documentation from master + if: matrix.os == 'macos-latest' uses: peaceiris/actions-gh-pages@v3 with: personal_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/docs/confidence-intervals.fsx b/docs/confidence-intervals.fsx index 5aa2a80..55f67c1 100644 --- a/docs/confidence-intervals.fsx +++ b/docs/confidence-intervals.fsx @@ -9,7 +9,7 @@ index: 5 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/data.fsx b/docs/data.fsx index f8f48a9..842d8b6 100644 --- a/docs/data.fsx +++ b/docs/data.fsx @@ -9,7 +9,7 @@ index: 6 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/dendro.fsx b/docs/dendro.fsx index 8855a72..92e1aee 100644 --- a/docs/dendro.fsx +++ b/docs/dendro.fsx @@ -8,7 +8,7 @@ index: 1 *) (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/diagnostics.fsx b/docs/diagnostics.fsx index e92dea9..6d8bf61 100644 --- a/docs/diagnostics.fsx +++ b/docs/diagnostics.fsx @@ -9,7 +9,7 @@ index: 5 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/estimation-engine.fsx b/docs/estimation-engine.fsx index 707d404..90f8f57 100644 --- a/docs/estimation-engine.fsx +++ b/docs/estimation-engine.fsx @@ -9,7 +9,7 @@ index: 3 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/examples/plant-temperature.fsx b/docs/examples/dendroecology.fsx similarity index 97% rename from docs/examples/plant-temperature.fsx rename to docs/examples/dendroecology.fsx index 1be8a77..985e9a5 100644 --- a/docs/examples/plant-temperature.fsx +++ b/docs/examples/dendroecology.fsx @@ -1,6 +1,6 @@ (** --- -title: Plant response to temperature +title: Dendroecology: investigating plant-environment interactions category: Examples categoryindex: 2 index: 1 @@ -9,7 +9,7 @@ index: 1 (*** condition: prepare ***) #nowarn "211" -#r "../../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" #r "nuget: MathNet.Numerics.FSharp,5.0.0" (*** condition: fsx ***) #if FSX diff --git a/docs/examples/predator-prey.fsx b/docs/examples/predator-prey.fsx index f72554a..b924cbd 100644 --- a/docs/examples/predator-prey.fsx +++ b/docs/examples/predator-prey.fsx @@ -14,7 +14,7 @@ index: 1 #nowarn "211" #r "nuget: MathNet.Numerics.FSharp,5.0.0" #r "nuget: FSharp.Data,6.3" -#r "../../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" #r "nuget: Plotly.NET, 4.2.0" diff --git a/docs/examples/shrub-resource.fsx b/docs/examples/shrub-resource.fsx index bdd24aa..4e48196 100644 --- a/docs/examples/shrub-resource.fsx +++ b/docs/examples/shrub-resource.fsx @@ -9,7 +9,7 @@ index: 1 (*** condition: prepare ***) #nowarn "211" -#r "../../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" #r "nuget: MathNet.Numerics.FSharp,5.0.0" (*** condition: fsx ***) #if FSX diff --git a/docs/examples/tutorial.fsx b/docs/examples/tutorial.fsx index d156232..0dbbe55 100644 --- a/docs/examples/tutorial.fsx +++ b/docs/examples/tutorial.fsx @@ -9,7 +9,7 @@ index: 1 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/index.fsx b/docs/index.fsx index 01fbec9..f371d58 100644 --- a/docs/index.fsx +++ b/docs/index.fsx @@ -9,7 +9,7 @@ index: 1 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" #r "nuget: MathNet.Numerics.FSharp,5.0.0" (*** condition: fsx ***) #if FSX diff --git a/docs/integration.fsx b/docs/integration.fsx index e88baf0..a6f7eb2 100644 --- a/docs/integration.fsx +++ b/docs/integration.fsx @@ -9,7 +9,7 @@ index: 3 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/language.fsx b/docs/language.fsx index 9faccf7..8d80527 100644 --- a/docs/language.fsx +++ b/docs/language.fsx @@ -9,7 +9,7 @@ index: 1 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/logging.fsx b/docs/logging.fsx index dac8b89..9bb0f2e 100644 --- a/docs/logging.fsx +++ b/docs/logging.fsx @@ -9,7 +9,7 @@ index: 3 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/model-fitting.fsx b/docs/model-fitting.fsx index 6c8b08e..edae468 100644 --- a/docs/model-fitting.fsx +++ b/docs/model-fitting.fsx @@ -9,7 +9,7 @@ index: 2 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/model-selection.fsx b/docs/model-selection.fsx index 381094f..0627721 100644 --- a/docs/model-selection.fsx +++ b/docs/model-selection.fsx @@ -9,7 +9,7 @@ index: 3 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/model.fsx b/docs/model.fsx index 97f297f..3ebcf7d 100644 --- a/docs/model.fsx +++ b/docs/model.fsx @@ -9,7 +9,7 @@ index: 2 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/optimisation.fsx b/docs/optimisation.fsx index 6711da2..1598f89 100644 --- a/docs/optimisation.fsx +++ b/docs/optimisation.fsx @@ -9,7 +9,7 @@ index: 1 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" diff --git a/docs/workflow.fsx b/docs/workflow.fsx index 54ec078..44712cf 100644 --- a/docs/workflow.fsx +++ b/docs/workflow.fsx @@ -9,7 +9,7 @@ index: 4 (*** condition: prepare ***) #nowarn "211" -#r "../src/Bristlecone/bin/Release/netstandard2.0/Bristlecone.dll" +#r "../src/Bristlecone/bin/Debug/netstandard2.0/Bristlecone.dll" (*** condition: fsx ***) #if FSX #r "nuget: Bristlecone,{{fsdocs-package-version}}" From 2dca719dda15d1ba88651cf1bd75a73af7018044 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Wed, 17 Apr 2024 15:09:27 +0100 Subject: [PATCH 2/2] Fix FAKE docs generation --- build.fsx | 2 +- tests/Bristlecone.Tests/Bristlecone.Tests.fsproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.fsx b/build.fsx index f318a3d..e145c59 100644 --- a/build.fsx +++ b/build.fsx @@ -41,7 +41,7 @@ let companyName = "" let tags = "modelling time-series F# fsharp R data-science ecology model-fitting" let license = "MIT" let iconUrl = "" -let copyright = "(C) 2018 Andrew Martin" +let copyright = "(C) 2018-24 Andrew Martin" let packageProjectUrl = "https://acm.im/bristlecone" let repositoryType = "git" diff --git a/tests/Bristlecone.Tests/Bristlecone.Tests.fsproj b/tests/Bristlecone.Tests/Bristlecone.Tests.fsproj index efe5375..1939e51 100755 --- a/tests/Bristlecone.Tests/Bristlecone.Tests.fsproj +++ b/tests/Bristlecone.Tests/Bristlecone.Tests.fsproj @@ -8,6 +8,7 @@ +