Skip to content

Commit 66e2672

Browse files
authored
Merge branch 'main' into dependabot/github_actions/crate-ci/typos-1.31.1
2 parents 336d9ec + 318c99a commit 66e2672

File tree

8 files changed

+30
-31
lines changed

8 files changed

+30
-31
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ on:
44
tags:
55
- '*'
66
branches:
7-
- 'master'
7+
- 'main'
88
pull_request:
99
branches:
10-
- 'master'
10+
- 'main'
1111
concurrency:
1212
# Skip intermediate builds: always.
1313
# Cancel intermediate builds: only if it is a pull request build.

.github/workflows/Documentation.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ on:
55
tags:
66
- '*'
77
branches:
8-
- 'master'
8+
- 'main'
99
pull_request:
1010
branches:
11-
- 'master'
11+
- 'main'
1212

1313
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
1414
permissions:
1515
contents: write
1616
pages: write
1717
id-token: write
1818
statuses: write
19+
pull-requests: read # Required when using `push_preview=true`
1920

2021
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
2122
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.

.github/workflows/downgrade.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ on:
44
tags:
55
- '*'
66
branches:
7-
- 'master'
7+
- 'main'
88
pull_request:
99
branches:
10-
- 'master'
10+
- 'main'
1111
jobs:
1212
test:
1313
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}

Project.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
1111
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
1212

1313
[compat]
14-
DocStringExtensions = "0.9.3"
15-
SymbolicUtils = "3.11"
16-
Symbolics = "6.23"
17-
julia = "1.10.0"
18-
Random = "1.10.0"
19-
LinearAlgebra = "1.10.0"
20-
Test = "1.10.0"
21-
OrderedCollections = "1.6"
22-
Aqua = "0.8"
23-
ExplicitImports = "1.6"
24-
JET = "0.9.9"
14+
DocStringExtensions = "0.9.4"
15+
SymbolicUtils = "3.25"
16+
Symbolics = "6.36"
17+
julia = "1.10"
18+
Random = "1.10"
19+
LinearAlgebra = "1.10"
20+
Test = "1.10"
21+
OrderedCollections = "1.8"
22+
Aqua = "0.8.11"
23+
ExplicitImports = "1.11"
24+
JET = "0.9.18"
2525
CheckConcreteStructs = "0.1.0"
2626

2727
[extras]

docs/make.jl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@ makedocs(;
99
sitename="QuestBase.jl",
1010
authors="Quest group",
1111
modules=QuestBase,
12-
format=Documenter.HTML(
13-
canonical = "https://quantumengineeredsystems.github.io/QuestBase.jl/stable/"),
14-
pages = pages,
15-
clean = true,
16-
linkcheck = true,
17-
warnonly = :missing_docs,
12+
format=Documenter.HTML(;
13+
canonical="https://quantumengineeredsystems.github.io/QuestBase.jl/stable/"
14+
),
15+
pages=pages,
16+
clean=true,
17+
linkcheck=true,
18+
warnonly=:missing_docs,
1819
draft=!CI,
1920
doctest=false, # We test it in the CI, no need to run it here
2021
)
2122

2223
if CI
2324
deploydocs(;
24-
repo="github.com/QuantumEngineeredSystems/QuestBase.jl";
25-
# devbranch="master",
25+
repo="github.com/QuantumEngineeredSystems/QuestBase.jl",
26+
# devbranch="main",
2627
# target="build",
2728
# branch="gh-pages",
2829
push_preview=true,

docs/pages.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
pages = [
2-
"Home" => "index.md",
3-
"API" => "API.md"
4-
]
1+
pages = ["Home" => "index.md", "API" => "API.md"]

docs/src/API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# API
22

3-
## Symbolic Utilies
3+
## Symbolic Utilities
44

55
```@docs
66

docs/src/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The Common Interface for the QUEST ecosystem
22

3-
The QUEST common interface ties together the utilies of the ecosystem into a single unified interface.
3+
The QUEST common interface ties together the utilities of the ecosystem into a single unified interface.
44
It is designed ensure compatiabilty between the different available packages.
55

66
This documentation is made to pool together the docs of the various Quest libraries

0 commit comments

Comments
 (0)