Skip to content

Commit

Permalink
Merge branch 'main' into ncc/aliasing-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
navidcy authored Jul 30, 2024
2 parents 7b16a6a + f831e98 commit bf3a781
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@ env:
SECRET_CODECOV_TOKEN: "dty9SvGuECi846Hf4XqD7M6nqh3G5uRWhNvJTGqRrYbGkV0PN6Ovorh9tdDrwm03VB2JNlIODSxo+QukbaO1ZWeX3pKq03eQbmBCeNpIfyZyTCTB5oGXYbDhCQlA6fjvGlrahqtos9s7BNo6rHVlp82Js60Tm5cmq5Vc8NHsD61EMcKMbl8l8oAo05tzWstC6MiloAItgPjmV9b4lR0qR/CFdUzzRelbq7FGsbus3k1qG4fkVD71vIwPoVhcubaNel1m2Pav5Z/tCdoqlpZZcLStIoJ+6tGCM2z9up6VC6dEvjxFRL4wlW0mfBW67foAxdqw24MIMlig4B1GAMsKxg==;U2FsdGVkX19vDkbG1AsXwiK4Lfblf3+qPNPAcrI+kEocuwv2lTsrOALqTT31uWxBSouatQsKuMlmL3++hD/ztQ=="

steps:
- label: "🦓 Julia 1.6"
- label: "🐫 Julia 1.10"
plugins:
- JuliaCI/julia#v1:
version: '1.6'
version: '1.10'
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1:
codecov: true
agents:
queue: "juliagpu"
cuda: "*"
if: build.message !~ /\[skip tests\]/
timeout_in_minutes: 60

- label: "🐫 Julia 1.10"
- label: "🦓 Julia 1.11"
plugins:
- JuliaCI/julia#v1:
version: '1.10'
version: '1.11'
- JuliaCI/julia-test#v1: ~
- JuliaCI/julia-coverage#v1:
codecov: true
agents:
queue: "juliagpu"
cuda: "*"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: julia-actions/setup-julia@latest
with:
version: 1.6
version: 1.10
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
Expand Down
10 changes: 5 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["Gregory L. Wagner <wagner.greg@gmail.com>", "Navid C. Constantinou <
description = "Tools for building fast, hackable, pseudospectral partial differential equation solvers on periodic domains."
documentation = "https://fourierflows.github.io/FourierFlowsDocumentation/stable/"
repository = "https://github.com/FourierFlows/FourierFlows.jl"
version = "0.10.5"
version = "0.10.6"

[deps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Expand All @@ -25,11 +25,11 @@ DocStringExtensions = "0.8, 0.9"
FFTW = "1"
Interpolations = "0.12, 0.13, 0.14, 0.15"
JLD2 = "0.1, 0.2, 0.3, 0.4"
LinearAlgebra = "1.6"
Random = "1.6"
LinearAlgebra = "1.10"
Random = "1.10"
Reexport = "0.2, 1"
Statistics = "1.6"
julia = "1.6"
Statistics = "1.10"
julia = "1.10"

[extras]
Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"
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.10
- julia_version: 1.11
- julia_version: nightly

platform:
Expand Down
8 changes: 4 additions & 4 deletions docs/src/installation_instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ To install the latest version of FourierFlows.jl use the Julia's built-in packag

```julia
julia> ]
(v1.6) pkg> add FourierFlows
(v1.10) pkg> add FourierFlows
```

We recommend installing FourierFlows.jl with the built-in Julia package manager, because
this installs a stable, tagged release. Later, you can update FourierFlows.jl to the
latest tagged release again via the package manager by

```julia
(v1.6) pkg> update FourierFlows
(v1.10) pkg> update FourierFlows
```

Note that some releases might induce breaking changes to certain modules. If after anything
happens or your code stops working, please open an [issue](https://github.com/FourierFlows/FourierFlows.jl/issues)
or start a [discussion](https://github.com/FourierFlows/FourierFlows.jl/discussions). We're
more than happy to help with getting your simulations up and running.

!!! warn "Use Julia 1.6 or newer"
The latest FourierFlows.jl requires at least Julia v1.6 (the current long-term-release).
!!! warn "Use Julia 1.10 or newer"
The latest FourierFlows.jl requires at least Julia v1.10 (the current long-term-release).
Installing FourierFlows with an older version of Julia will install an older version
of FourierFlows.jl (the latest version compatible with your version of Julia).

0 comments on commit bf3a781

Please sign in to comment.