From 69d4e613d3239739d23bb865b8bcbfebdd946738 Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Mon, 15 Aug 2022 01:19:41 +0000 Subject: [PATCH 1/8] CompatHelper: add new compat entry for JDF at version 0.5, (keep existing compat) --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index e4d95c8..9fc37b9 100644 --- a/Project.toml +++ b/Project.toml @@ -14,6 +14,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] +JDF = "0.5" julia = "1.6.5" [extras] From f9b45c5f80b12ecd8090eebdb1f21d7ac1eb991b Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Mon, 15 Aug 2022 01:19:47 +0000 Subject: [PATCH 2/8] CompatHelper: add new compat entry for DataFrames at version 1, (keep existing compat) --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index e4d95c8..3b68dd6 100644 --- a/Project.toml +++ b/Project.toml @@ -14,6 +14,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] +DataFrames = "1" julia = "1.6.5" [extras] From ceae05418ee57a04c3ba6a7a2e33fc542fb5b5bb Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Mon, 15 Aug 2022 01:19:49 +0000 Subject: [PATCH 3/8] CompatHelper: add new compat entry for CSV at version 0.10, (keep existing compat) --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index e4d95c8..e4f0cc3 100644 --- a/Project.toml +++ b/Project.toml @@ -14,6 +14,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] +CSV = "0.10" julia = "1.6.5" [extras] From da12d162fb5473d7712c8cd3c2aac1ae07ee9437 Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Mon, 15 Aug 2022 01:19:50 +0000 Subject: [PATCH 4/8] CompatHelper: add new compat entry for BSON at version 0.3, (keep existing compat) --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index e4d95c8..0e9afaa 100644 --- a/Project.toml +++ b/Project.toml @@ -14,6 +14,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] +BSON = "0.3" julia = "1.6.5" [extras] From 98133910783b53807d6daf923c87ba385c4698cb Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Mon, 15 Aug 2022 15:37:15 -0300 Subject: [PATCH 5/8] trying docs deployment fixes --- .github/workflows/CI.yml | 19 ++++++++++++------- docs/README.md | 2 +- docs/make.jl | 13 ++++++++----- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f007699..81cd048 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,16 +43,21 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 with: - version: '1' - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-docdeploy@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} - # Run doctests + version: '1.6' - run: | + julia --project=docs -e ' + using Pkg + Pkg.develop(PackageSpec(path=pwd())) + Pkg.instantiate()' + - name: Run doctests + run: | julia --project=docs -e ' using Documenter: DocMeta, doctest using DataWorkstation DocMeta.setdocmeta!(DataWorkstation, :DocTestSetup, :(using DataWorkstation); recursive=true) doctest(DataWorkstation)' + - name: Build and deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} + run: julia --project=docs/ docs/make.jl diff --git a/docs/README.md b/docs/README.md index ad408ff..a2108bf 100644 --- a/docs/README.md +++ b/docs/README.md @@ -13,7 +13,7 @@ Building the documentation The documentation is built using the following command: -```julia +```bash julia --project=. --color=yes make.jl ``` diff --git a/docs/make.jl b/docs/make.jl index 07c467e..ade7945 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -11,18 +11,21 @@ DocMeta.setdocmeta!( makedocs(; modules = [DataWorkstation], authors = "Leandro Ferrado and contributors", - repo = "https://github.com/leferrad/DataWorkstation.jl/blob/{commit}{path}#{line}", sitename = "DataWorkstation.jl", format = Documenter.HTML(; - prettyurls = get(ENV, "CI", "false") == "true", + prettyurls = get(ENV, "CI", nothing) == "true", canonical = "https://leferrad.github.io/DataWorkstation.jl", assets = String[], ), - pages = ["Home" => "index.md"], + pages = [ + "Introduction" => ["index.md",], + "User Guide" => ["basics.md", "quick_example.md"], + "API" => ["api_reference.md"], + ], ) deploydocs(; - repo = "github.com/leferrad/DataWorkstation.jl", - devbranch = "develop", + repo = "github.com/leferrad/DataWorkstation.jl.git", + target = "build", push_preview = true, ) From ccb74f84e718ba1f2596253b06414bcef693c7df Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Mon, 15 Aug 2022 15:42:35 -0300 Subject: [PATCH 6/8] minor fix in docs/make.jl --- docs/make.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/make.jl b/docs/make.jl index ade7945..2a0a9fe 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -19,8 +19,8 @@ makedocs(; ), pages = [ "Introduction" => ["index.md",], - "User Guide" => ["basics.md", "quick_example.md"], - "API" => ["api_reference.md"], + # "User Guide" => ["basics.md", "quick_example.md"], + # "API" => ["api_reference.md"], ], ) From 6b6c0252294b63227df44fbdc2823e11aaf99ad8 Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Mon, 15 Aug 2022 15:56:16 -0300 Subject: [PATCH 7/8] more fixes in CI github workflow --- .github/workflows/CI.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 81cd048..114da2b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,6 +5,8 @@ on: - main tags: '*' pull_request: + branches: + - main concurrency: # Skip intermediate builds: always. # Cancel intermediate builds: only if it is a pull request build. @@ -18,11 +20,19 @@ jobs: fail-fast: false matrix: version: + - '1.6' # Replace this with the minimum Julia version that your package supports. - '1' os: - ubuntu-latest arch: - x64 + include: + - os: windows-latest + version: '1' + arch: x64 + - os: macOS-latest + version: '1' + arch: x64 steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 From 54ae20a41d4369374dfb99fb4f3a67190c5c2c60 Mon Sep 17 00:00:00 2001 From: Leandro Ferrado Date: Mon, 15 Aug 2022 15:58:28 -0300 Subject: [PATCH 8/8] more fixes in CI --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 114da2b..6a0c148 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -7,6 +7,7 @@ on: pull_request: branches: - main + - develop concurrency: # Skip intermediate builds: always. # Cancel intermediate builds: only if it is a pull request build.