Skip to content

Commit

Permalink
Merge branch 'main' into iterate_and_show_aaf
Browse files Browse the repository at this point in the history
  • Loading branch information
jbisits committed Dec 15, 2023
2 parents 566e0e5 + a500dcd commit ed71e1e
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ steps:
if: build.message !~ /\[skip tests\]/
timeout_in_minutes: 60

- label: "🏄🏻‍♂️ Julia 1.8"
- label: "🏄🏻‍♂️ Julia 1.9"
plugins:
- JuliaCI/julia#v1:
version: 1.8
version: 1.9
- JuliaCI/julia-test#v1: ~
agents:
queue: "juliagpu"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CompatHelper
ame: CompatHelper

on:
schedule:
Expand Down
17 changes: 10 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ license = "MIT"
authors = ["Navid C. Constantinou <navidcy@gmail.com>", "Gregory L. Wagner <wagner.greg@gmail.com>"]
documentation = "https://fourierflows.github.io/PassiveTracerFlowsDocumentation/dev/"
repository = "https://github.com/FourierFlows/PassiveTracerFlows.jl"
version = "0.9.0"
version = "0.9.1"

[deps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Expand All @@ -18,13 +18,16 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"

[compat]
CUDA = "^1.3, ^2, ^3"
CUDA = "1.3, 2, 3.7.1, 4, 5"
DocStringExtensions = "0.8, 0.9"
FourierFlows = "0.10.0"
GeophysicalFlows = "0.15.0"
JLD2 = "^0.1, ^0.2, ^0.3, ^0.4"
Reexport = "^0.2, ^1"
julia = "^1.6"
FourierFlows = "0.10.5"
GeophysicalFlows = "0.15.4"
JLD2 = "0.1, 0.2, 0.3, 0.4"
LinearAlgebra = "1.6"
Random = "1.6"
Reexport = "0.2, 1"
Statistics = "1.6"
julia = "1.6"

[extras]
Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ See `examples/` for example scripts.

The code is citable via [zenodo](https://zenodo.org). Please cite as:

> Navid C. Constantinou, Josef I. Bisits, and Gregory L. Wagner (2022). FourierFlows/PassiveTracerFlows.jl: PassiveTracerFlows v0.9.0 (Version v0.9.0). Zenodo. [https://doi.org/10.5281/zenodo.2535983](https://doi.org/10.5281/zenodo.2535983)
> Navid C. Constantinou, Josef I. Bisits, and Gregory L. Wagner (2022). FourierFlows/PassiveTracerFlows.jl: PassiveTracerFlows v0.9.1 (Version v0.9.1). Zenodo. [https://doi.org/10.5281/zenodo.2535983](https://doi.org/10.5281/zenodo.2535983)
## Contributing

Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
environment:
matrix:
- julia_version: 1.6
- julia_version: 1.8
- julia_version: 1.9

platform:
# - x86 # 32-bit
Expand Down
1 change: 1 addition & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

[compat]
Documenter = "1"
Literate = "≥2.9.0"
26 changes: 24 additions & 2 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ format = Documenter.HTML(

makedocs(
modules = [PassiveTracerFlows],
doctest = false,
doctest = true,
warnonly = [:footnote, :cross_references, :missing_docs],
clean = true,
checkdocs = :all,
format = format,
Expand All @@ -67,9 +68,30 @@ makedocs(
]
)

@info "Clean up temporary .jld2 and .nc output created by doctests or literated examples..."

"""
recursive_find(directory, pattern)
Return list of filepaths within `directory` that contains the `pattern::Regex`.
"""
recursive_find(directory, pattern) =
mapreduce(vcat, walkdir(directory)) do (root, dirs, files)
joinpath.(root, filter(contains(pattern), files))
end

files = []
for pattern in [r"\.jld2", r"\.nc"]
global files = vcat(files, recursive_find(@__DIR__, pattern))
end

for file in files
rm(file)
end

withenv("GITHUB_REPOSITORY" => "FourierFlows/PassiveTracerFlowsDocumentation") do
deploydocs( repo = "github.com/FourierFlows/PassiveTracerFlowsDocumentation.git",
versions = ["stable" => "v^", "v#.#.#", "dev" => "dev"],
versions = ["stable" => "v^", "dev" => "dev", "v#.#.#"],
push_preview = false,
forcepush = true,
devbranch = "main"
Expand Down

0 comments on commit ed71e1e

Please sign in to comment.