From b2d30329851a0232846c00d5d9270c82383992e6 Mon Sep 17 00:00:00 2001 From: Michael Goerz Date: Fri, 6 Oct 2023 02:23:08 -0400 Subject: [PATCH] Require Julia 1.9 --- .github/workflows/CI.yml | 44 ++++++++++++++++++---------------------- Project.toml | 2 +- docs/make.jl | 9 ++++---- test/Project.toml | 8 ++------ 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 445f2de..f23c511 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,39 +1,36 @@ name: CI on: - - push - - pull_request + push: + branches: + - master + - 'release-*' + tags: + - '*' + pull_request: + branches: + - master env: GKSwstype: 100 JULIA_PKG_PRECOMPILE_AUTO: false jobs: test: - name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} + name: Test ${{ matrix.title }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - version: - - '1.6' - os: - - ubuntu-latest - arch: - - x64 + include: + - title: 'Linux - latest' + os: ubuntu-latest + version: '1' + arch: x64 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v1 - env: - cache-name: cache-artifacts - with: - path: ~/.julia/artifacts - key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }} - restore-keys: | - ${{ runner.os }}-test-${{ env.cache-name }}- - ${{ runner.os }}-test- - ${{ runner.os }}- + - uses: julia-actions/cache@v1 - run: | # Instantiate Pkg wget https://raw.githubusercontent.com/JuliaQuantumControl/JuliaQuantumControl/master/scripts/installorg.jl @@ -45,14 +42,14 @@ jobs: - run: | # Summarize coverage julia --project=test -e 'using QuantumControlTestUtils; show_coverage();' - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: file: lcov.info docs: name: Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: julia-actions/setup-julia@v1 with: version: '1' @@ -78,7 +75,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} - JULIA_DEBUG: Documenter - name: Zip the HTML documentation run: zip-folder --debug --auto-root --outfile "docs.zip" docs/build - uses: actions/upload-artifact@v2 @@ -94,7 +90,7 @@ jobs: name: Codestyle runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: julia-actions/setup-julia@v1 with: version: '1' diff --git a/Project.toml b/Project.toml index 718b00b..66bb99a 100644 --- a/Project.toml +++ b/Project.toml @@ -14,4 +14,4 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [compat] QuantumControlBase = ">=0.8.1" ConcreteStructs = "^0.2" -julia = "1.6" +julia = "1.9" diff --git a/docs/make.jl b/docs/make.jl index 3cf1369..5af8e1d 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,7 +1,7 @@ using QuantumControlBase using Krotov using Documenter -using QuantumCitations +using DocumenterCitations using Pkg using Plots @@ -25,8 +25,8 @@ println("Starting makedocs") bib = CitationBibliography(joinpath(@__DIR__, "src", "refs.bib"); style=:numeric) -makedocs( - bib; +makedocs(; + plugins=[bib], authors=AUTHORS, sitename="Krotov.jl", modules=[Krotov], @@ -49,7 +49,8 @@ makedocs( ], "API" => "api.md", "References" => "references.md", - ] + ], + warnonly=true, ) println("Finished makedocs") diff --git a/test/Project.toml b/test/Project.toml index c760fd4..fa6d142 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -4,10 +4,8 @@ ConcreteStructs = "2569d6c7-a4a2-43d3-a901-331e8e4be471" Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8" +DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244" Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6" -GRAPE = "6b52fcaf-80fe-489a-93e9-9f92080510be" -GRAPELinesearchAnalysis = "290eba36-e2d8-4488-81b6-f66cc44f2186" JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899" Krotov = "b05dcdc7-62f6-4360-bf2c-0898bba419de" LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433" @@ -17,12 +15,9 @@ LiveServer = "16fef848-5104-11e9-1b77-fb7a48bbb589" LocalCoverage = "5f6e1e16-694c-5876-87ef-16b5274f298e" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" -QuantumCitations = "259add83-af3e-4603-9706-50e341d5574e" QuantumControl = "8a270532-f23f-47a8-83a9-b33d10cad486" QuantumControlBase = "f10a33bc-5a64-497c-be7b-6f86b4f0c2aa" QuantumControlTestUtils = "d3fd27c9-1dfb-4e67-b0c0-90d0d87a1e48" -QuantumGradientGenerators = "a563f35e-61db-434d-8c01-8b9e3ccdfd85" -QuantumOptics = "6e0679c1-51ea-5a7c-ac74-d61b76210b0c" QuantumPropagators = "7bf12567-5742-4b91-a078-644e72a65fc1" Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" @@ -36,3 +31,4 @@ UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" [compat] julia = "1.6" +Documenter = "1.1"