Skip to content

Commit 380ebe9

Browse files
author
Jordan Benjamin
committed
fix CI, fix test env
1 parent 629a9d7 commit 380ebe9

17 files changed

Lines changed: 234 additions & 1089 deletions

.dev/climaformat.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Pkg
1+
using Pkg: Pkg
22
Pkg.activate(@__DIR__)
33
Pkg.instantiate()
44

55
# NOTE: This script is DISCONTINUED in favor of the official JuliaFormatter CLI
66
# or using julia -e 'using JuliaFormatter; format(".")'.
77
# This project now uses a root-level .JuliaFormatter.toml.
88

9-
using JuliaFormatter
9+
using JuliaFormatter: JuliaFormatter
1010

11-
format(".")
11+
JuliaFormatter.format(".")

.dev/hooks/pre-commit

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
toplevel_directory = chomp(read(`git rev-parse --show-toplevel`, String))
1010

11-
using Pkg
11+
using Pkg: Pkg
1212
Pkg.activate(joinpath(toplevel_directory, ".dev"))
1313
Pkg.instantiate()
1414

15-
using JuliaFormatter
15+
using JuliaFormatter: JuliaFormatter
1616

1717
include(joinpath(toplevel_directory, ".dev", "clima_formatter_options.jl"))
1818

@@ -24,7 +24,7 @@ for diffoutput in split.(readlines(`git diff --name-status --cached`))
2424
(!startswith(status, "D") && endswith(filename, ".jl")) || continue
2525

2626
a = read(`git show :$filename`, String)
27-
b = format_text(a; clima_formatter_options...)
27+
b = JuliaFormatter.format_text(a; clima_formatter_options...)
2828

2929
if a != b
3030
fullfilename = joinpath(toplevel_directory, filename)

.dev/up_deps.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# To update dependencies, run:
66
# julia -e 'using Pkg; Pkg.add("PkgDevTools"); using PkgDevTools; PkgDevTools.update_deps(".")'
77

8-
using Pkg
8+
using Pkg: Pkg
99

1010
root = dirname(@__DIR__)
1111
dirs = (

.github/workflows/JuliaFormatter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: JuliaFormatter
22

33
on:
44
push:
5+
branches:
6+
- main
57
tags: '*'
68
pull_request:
79

.github/workflows/UpDeps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: UpDeps
22

33
on:
44
push:
5+
branches:
6+
- main
57
tags: '*'
68
pull_request:
79

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ Given data, calculates varying order structure functions for turbulence analysis
2222
## Quick Start
2323

2424
```julia
25-
using StructureFunctions
26-
using StructureFunctions.SpectralAnalysis
25+
using StructureFunctions: StructureFunctions, SpectralAnalysis as SFSA
2726

2827
# Calculate spectrum from scattered data
29-
r = calculate_spectrum(FINUFFTBackend(), (x, y), (u, v), ms; domain_size=(Lx, Ly))
28+
r = SFSA.calculate_spectrum(SFSA.FINUFFTBackend(), (x, y), (u, v), ms; domain_size=(Lx, Ly))
3029

3130
# Visual comparison (requires CairoMakie)
32-
using CairoMakie
33-
compare_spectra(["Result" => r]; peaks=target_peaks)
31+
using CairoMakie: CairoMakie
32+
SFSA.compare_spectra(["Result" => r]; peaks=target_peaks)
3433
```
3534

0 commit comments

Comments
 (0)