Merge pull request #51 from FourierFlows/ncc/master-to-main

Drop support for Julia v1.5

.buildkite/pipeline.yml

@@ -3,24 +3,13 @@ env:
   SECRET_CODECOV_TOKEN: "ary5gKtRUF219HQVTWcg3ZUCIv0FduXSaCBeMwflkKXOIuX6Mj5wmygf+4asBTAcTtHGHWtdbtnSq8Tm52O5N++9TBk/B8CxL00EVB//UO9A0O9Rfd21eHK9Ic93mY+pjmHnyenAZCUobhPFI6U3caheEnclRNOuT1WkJkP/qQyJdHVuhofmxbqVtr/gcis+djB88nvEuUoaXg9n2jOCuNK45SUOfftrSPtQhbDyjYzrOQSbrAc2vo5biWDeqIPrFPFIdK4XN0fGhIMhSOGIvCFq8/0Lu2PjkHu29dFld/aZONsu+Cv/KufxGk0Cj3jwiRgVruv6UYzRB3h+DhP3Ng==;U2FsdGVkX18rAmNVfo0wTMqploN53sEN+gpiE8Yohb1QQFSLvb/+auGXpWypRg5NfujlwtGTWlLa/wru/4nDeA=="
 
 steps:
-  - label: "🚴🏼 Julia 1.5"
-    plugins:
-      - JuliaCI/julia#v1:
-          version: 1.5
-      - 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.6"
     plugins:
       - JuliaCI/julia#v1:
           version: 1.6
       - JuliaCI/julia-test#v1: ~
+      - JuliaCI/julia-coverage#v1:
+          codecov: true
     agents:
       queue: "juliagpu"
       cuda: "*"

.github/workflows/Documenter.yml

@@ -3,7 +3,7 @@ name: Documentation
 on:
   push:
     branches:
-      - master
+      - main
     tags: '*'
   pull_request:
 

Project.toml

@@ -4,7 +4,7 @@ license = "MIT"
 authors = ["Navid C. Constantinou <[email protected]>", "Gregory L. Wagner <[email protected]>"]
 documentation = "https://fourierflows.github.io/PassiveTracerFlowsDocumentation/dev/"
 repository = "https://github.com/FourierFlows/PassiveTracerFlows.jl"
-version = "0.5.1"
+version = "0.6.0"
 
 [deps]
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
@@ -22,7 +22,7 @@ DocStringExtensions = "^0.8"
 FourierFlows = "^0.6.17, ^0.7"
 JLD2 = "^0.1, ^0.2, ^0.3, ^0.4"
 Reexport = "^0.2, ^1"
-julia = "^1.5"
+julia = "^1.6"
 
 [extras]
 Coverage = "a2441757-f6aa-5fb2-8edb-039e3f45d037"

README.md

@@ -3,10 +3,10 @@
 <!-- Badges -->
 <p align="left">
      <a href="https://buildkite.com/julialang/passivetracerflows-dot-jl">
-         <img alt="Buildkite CPU+GPU build status" src="https://img.shields.io/buildkite/4d921fc17b95341ea5477fb62df0e6d9364b61b154e050a123/master?logo=buildkite&label=Buildkite%20CPU%2BGPU">
+         <img alt="Buildkite CPU+GPU build status" src="https://img.shields.io/buildkite/4d921fc17b95341ea5477fb62df0e6d9364b61b154e050a123/main?logo=buildkite&label=Buildkite%20CPU%2BGPU">
      </a>
      <a href="https://ci.appveyor.com/project/navidcy/passivetracerflows-jl">
-         <img alt="Build Status for Window" src="https://img.shields.io/appveyor/ci/navidcy/passivetracerflows-jl/master?label=Window&logo=appveyor&logoColor=white&style=flat-square">
+         <img alt="Build Status for Window" src="https://img.shields.io/appveyor/ci/navidcy/passivetracerflows-jl/main?label=Window&logo=appveyor&logoColor=white&style=flat-square">
      </a>
      <a href="https://FourierFlows.github.io/PassiveTracerFlowsDocumentation/stable">
          <img alt="stable docs" src="https://img.shields.io/badge/documentation-stable%20release-blue">
@@ -15,7 +15,7 @@
          <img alt="latest docs" src="https://img.shields.io/badge/documentation-in%20development-orange">
      </a>
      <a href="https://codecov.io/gh/FourierFlows/PassiveTracerFlows.jl">
-         <img src="https://codecov.io/gh/FourierFlows/PassiveTracerFlows.jl/branch/master/graph/badge.svg" title="codecov">
+         <img src="https://codecov.io/gh/FourierFlows/PassiveTracerFlows.jl/branch/main/graph/badge.svg" title="codecov">
      </a>
      <a href="https://doi.org/10.5281/zenodo.2535983">
         <img src="https://zenodo.org/badge/DOI/10.5281/zenodo.2535983.svg" alt="DOI">
@@ -30,11 +30,11 @@ To install, use Julia's  built-in package manager (accessed by pressing `]` in t
 
 ```julia
 julia>]
-(v1.5) pkg> add PassiveTracerFlows
-(v1.5) pkg> instantiate
+(v1.6) pkg> add PassiveTracerFlows
+(v1.6) pkg> instantiate
 ```
 
-The most recent version of GeophysicalFlows.jl requires Julia v1.5 or later.
+The most recent version of GeophysicalFlows.jl requires Julia v1.6 or later.
 
 ## Examples
 
@@ -49,6 +49,6 @@ See `examples/` for example scripts.
 
 The code is citable via [zenodo](https://zenodo.org). Please cite as:
 
-> Navid C. Constantinou. and Gregory L. Wagner (2021). FourierFlows/PassiveTracerFlows.jl: PassiveTracerFlows v0.5.1 (Version v0.5.1). Zenodo.  [https://doi.org/10.5281/zenodo.2535983](https://doi.org/10.5281/zenodo.2535983)
+> Navid C. Constantinou. and Gregory L. Wagner (2021). FourierFlows/PassiveTracerFlows.jl: PassiveTracerFlows v0.6.0 (Version v0.6.0). Zenodo.  [https://doi.org/10.5281/zenodo.2535983](https://doi.org/10.5281/zenodo.2535983)
 
 [FourierFlows.jl]: https://github.com/FourierFlows/FourierFlows.jl

appveyor.yml

@@ -1,6 +1,5 @@
 environment:
   matrix:
-  - julia_version: 1.5
   - julia_version: 1.6
   - julia_version: nightly
 
@@ -16,7 +15,7 @@ matrix:
 
 branches:
   only:
-    - master
+    - main
 
 notifications:
   - provider: Email
@@ -34,9 +33,3 @@ build_script:
 test_script:
   - echo "%JL_TEST_SCRIPT%"
   - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
-
-# # Uncomment to support code coverage upload. Should only be enabled for packages
-# # which would have coverage gaps without running on Windows
-# on_success:
-#   - echo "%JL_CODECOV_SCRIPT%"
-#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"