Skip to content

Commit 1a1e23c

Browse files
authored
Merge pull request #113 from FourierFlows/FixDocDeployment
Fix Docs deployment
2 parents ab11b55 + c9d28de commit 1a1e23c

File tree

7 files changed

+38
-31
lines changed

7 files changed

+38
-31
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ os:
55
- linux
66

77
julia:
8-
- 1.0
8+
- 1.1
99
- nightly
1010

1111
matrix:
1212
allow_failures:
1313
- julia: nightly
1414

1515
after_success:
16-
- julia --project -e 'using Pkg; Pkg.add("Coverage"); Pkg.dir("FourierFlows"); using Coverage; Coveralls.submit(Coveralls.process_folder());'
17-
- julia --project -e 'using Pkg; Pkg.add("Coverage"); Pkg.dir("FourierFlows"); using Coverage; Codecov.submit(Codecov.process_folder())'
16+
- julia --project -e 'using Pkg; Pkg.add("Coverage"); import FourierFlows; joinpath(dirname(pathof(FourierFlows)), ".."); using Coverage; Coveralls.submit(Coveralls.process_folder());'
17+
- julia --project -e 'using Pkg; Pkg.add("Coverage"); import FourierFlows; joinpath(dirname(pathof(FourierFlows)), ".."); using Coverage; Codecov.submit(Codecov.process_folder())'
1818

1919
jobs:
2020
include:
2121
- stage: "Documentation"
22-
julia: 1.0
22+
julia: 1.1
2323
os: linux
2424
script:
2525
- julia --project=docs/ -e 'using Pkg; Pkg.instantiate();

Manifest.toml

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ version = "1.0.0"
1616
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
1717

1818
[[BinaryProvider]]
19-
deps = ["Libdl", "SHA"]
19+
deps = ["Libdl", "Logging", "SHA"]
2020
git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648"
2121
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
22-
version = "0.5.4"
22+
version = "0.5.6"
2323

2424
[[CodecZlib]]
25-
deps = ["BinaryProvider", "Libdl", "Test", "TranscodingStreams"]
26-
git-tree-sha1 = "36bbf5374c661054d41410dc53ff752972583b9b"
25+
deps = ["BinaryProvider", "Libdl", "TranscodingStreams"]
26+
git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e"
2727
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
28-
version = "0.5.2"
28+
version = "0.6.0"
2929

3030
[[Compat]]
3131
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
@@ -46,10 +46,10 @@ uuid = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
4646
version = "0.9.2"
4747

4848
[[DataStructures]]
49-
deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"]
50-
git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038"
49+
deps = ["InteractiveUtils", "OrderedCollections"]
50+
git-tree-sha1 = "0809951a1774dc724da22d26e4289bbaab77809a"
5151
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
52-
version = "0.15.0"
52+
version = "0.17.0"
5353

5454
[[Dates]]
5555
deps = ["Printf"]
@@ -64,10 +64,10 @@ deps = ["Random", "Serialization", "Sockets"]
6464
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
6565

6666
[[FFTW]]
67-
deps = ["AbstractFFTs", "BinaryProvider", "Compat", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"]
68-
git-tree-sha1 = "29cda58afbf62f35b1a094882ad6c745a47b2eaa"
67+
deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"]
68+
git-tree-sha1 = "e1a479d3c972f20c9a70563eec740bbfc786f515"
6969
uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
70-
version = "0.2.4"
70+
version = "0.3.0"
7171

7272
[[FileIO]]
7373
deps = ["Pkg"]
@@ -77,9 +77,9 @@ version = "1.0.7"
7777

7878
[[HTTP]]
7979
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
80-
git-tree-sha1 = "854fad2a2b9cc6678f70ed15a65fc7e572056d39"
80+
git-tree-sha1 = "03ddc88af7f2d963fac5aa9f3ac8e11914d68a78"
8181
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
82-
version = "0.8.2"
82+
version = "0.8.4"
8383

8484
[[IniFile]]
8585
deps = ["Test"]
@@ -104,10 +104,10 @@ uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
104104
version = "0.1.2"
105105

106106
[[JSON]]
107-
deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"]
108-
git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa"
107+
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
108+
git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
109109
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
110-
version = "0.20.0"
110+
version = "0.21.0"
111111

112112
[[LibGit2]]
113113
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
@@ -146,6 +146,12 @@ git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
146146
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
147147
version = "1.1.0"
148148

149+
[[Parsers]]
150+
deps = ["Dates", "Test"]
151+
git-tree-sha1 = "db2b35dedab3c0e46dc15996d170af07a5ab91c9"
152+
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
153+
version = "0.3.6"
154+
149155
[[Pkg]]
150156
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
151157
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -213,9 +219,9 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
213219

214220
[[TranscodingStreams]]
215221
deps = ["Random", "Test"]
216-
git-tree-sha1 = "a25d8e5a28c3b1b06d3859f30757d43106791919"
222+
git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c"
217223
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
218-
version = "0.9.4"
224+
version = "0.9.5"
219225

220226
[[UUIDs]]
221227
deps = ["Random", "SHA"]

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ keywords = ["julia", "PDE", "partial differential equations", "spectral methods"
44
license = "MIT"
55
authors = ["Gregory L. Wagner <wagner.greg@gmail.com>", "Navid C. Constantinou <navidcy@gmail.com>"]
66
description = "Tools for solving partial differential equations on periodic domains using Fourier-based pseudospectral methods."
7-
documentation = "https://fourierflows.github.io/FourierFlows.jl/latest/"
7+
documentation = "https://fourierflows.github.io/FourierFlows.jl/dev/"
88
repository = "https://github.com/FourierFlows/FourierFlows.jl"
99
version = "0.3.0"
1010
versions = ["0.0.1", "0.0.2", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.2.0", "0.2.1", "0.2.2", "0.3.0"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<a href="https://FourierFlows.github.io/FourierFlows.jl/stable">
1111
<img src="https://img.shields.io/badge/docs-stable-blue.svg">
1212
</a>
13-
<a href="https://FourierFlows.github.io/FourierFlows.jl/latest">
14-
<img src="https://img.shields.io/badge/docs-latest-blue.svg">
13+
<a href="https://FourierFlows.github.io/FourierFlows.jl/dev">
14+
<img src="https://img.shields.io/badge/docs-dev-blue.svg">
1515
</a>
1616
<a href="https://coveralls.io/github/FourierFlows/FourierFlows.jl?branch=master">
1717
<img src="https://coveralls.io/repos/github/FourierFlows/FourierFlows.jl/badge.svg?branch=master" title="coveralls">

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
33
FourierFlows = "2aec4490-903f-5c70-9b11-9bed06a700e1"
44

55
[compat]
6-
Documenter = "~0.20"
6+
Documenter = "~0.22"

docs/make.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ using
99

1010
makedocs(
1111
modules = [FourierFlows],
12-
doctest = false, clean = true,
12+
doctest = false,
13+
clean = true,
1314
checkdocs = :all,
14-
format = :html,
15+
format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true"),
1516
authors = "Gregory L. Wagner and Navid C. Constantinou",
1617
sitename = "FourierFlows.jl",
1718
pages = Any[

docs/src/forcing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ We want now to transfer all the knowledge we got from the previous sections to P
358358

359359
which is also equivalently written as:
360360

361-
\begin{equation}
362-
\dd \nabla^2\psi_t(\bx) = -\mu \nabla^2\psi_t(\bx) \dd t + \sqrt{\sigma} \dd W_t(\bx)
363-
\end{equation}
361+
```math
362+
\dd \nabla^2\psi_{t}(\bx) = -\mu \nabla^2 \psi_{t} (\bx) \dd t + \sqrt{\sigma} \dd W_{t} (\bx) \per
363+
```
364364

365365
The form \eqref{eq:PDEcont} is the continuous version understood in the Stratonovich interpretation
366366
(similar to \eqref{eq:OUcont}). Thus, forcing $\xi$ obeys now:

0 commit comments

Comments
 (0)