Skip to content

Commit 82045f2

Browse files
authored
Standardize yml; compat LinearMapsAA v0.12; to v0.2 (#53)
* Standardize yml * Standardize make.jl * Compat to v0.2 * Fix typos
1 parent cfccdf4 commit 82045f2

File tree

9 files changed

+57
-17
lines changed

9 files changed

+57
-17
lines changed

.github/workflows/CompatHelper.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,23 @@ on:
44
schedule:
55
- cron: 0 0 * * 0 # weekly
66
workflow_dispatch:
7-
7+
permissions:
8+
contents: write
9+
pull-requests: write
810
jobs:
911
CompatHelper:
1012
runs-on: ubuntu-latest
1113
steps:
14+
- name: Check if Julia is already available in the PATH
15+
id: julia_in_path
16+
run: which julia
17+
continue-on-error: true
18+
- name: Install Julia, but only if it is not already available in the PATH
19+
uses: julia-actions/setup-julia@latest
20+
with:
21+
version: '1'
22+
# arch: ${{ runner.arch }}
23+
if: steps.julia_in_path.outcome != 'success'
1224
- name: "Add the General registry via Git"
1325
run: |
1426
import Pkg
@@ -31,3 +43,6 @@ jobs:
3143
env:
3244
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3345
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
46+
47+
# based on:
48+
# https://github.com/JuliaRegistries/CompatHelper.jl

.github/workflows/SpellCheck.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Spell Check
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
typos-check:
7+
name: Spell Check with Typos
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout Actions Repository
11+
uses: actions/checkout@v4
12+
- name: Check spelling
13+
uses: crate-ci/typos@master

.github/workflows/TagBot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
name: TagBot
2+
23
on:
34
issue_comment:
45
types:
56
- created
67
workflow_dispatch:
8+
79
jobs:
810
TagBot:
911
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "SPECTrecon"
22
uuid = "ab1be465-a7f0-4423-9048-0ee774b70ed9"
33
authors = ["Zongyu Li and Jeff Fessler and group"]
4-
version = "0.1"
4+
version = "0.2"
55

66
[deps]
77
AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -13,10 +13,10 @@ LinearMapsAA = "599c1a8e-b958-11e9-0d14-b1e6b2ecea07"
1313
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
1414

1515
[compat]
16-
AbstractFFTs = "1.0"
16+
AbstractFFTs = "1"
1717
FFTW = "1"
1818
ImageFiltering = "0.6, 0.7"
1919
LinearInterpolators = "0.1"
20-
LinearMapsAA = "0.11"
20+
LinearMapsAA = "0.12"
2121
OffsetArrays = "1"
2222
julia = "1.10"

_typos.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[default]
2+
extend-ignore-identifiers-re = [
3+
"thid",
4+
"iy",
5+
"iy",
6+
]
7+
8+
[files]
9+
extend-exclude = [
10+
"*.ipynb",
11+
]

docs/lit/examples/1-overview.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ mul!(tmp, A', views)
218218
219219
The pixel dimensions `deltas` can (and should!) be values with units.
220220
221-
Here is an example ... (todo)
221+
Here is an example with units ... (todo)
222222
223223
using UnitfulRecipes
224224
using Unitful: mm

docs/make.jl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ execute = isempty(ARGS) || ARGS[1] == "run"
22

33
org, reps = :JuliaImageRecon, :SPECTrecon
44
eval(:(using $reps))
5-
using Documenter
6-
using Literate
5+
import Documenter
6+
import Literate
77

88
# https://juliadocs.github.io/Documenter.jl/stable/man/syntax/#@example-block
99
ENV["GKSwstype"] = "100"
@@ -23,9 +23,7 @@ binder_root_url =
2323

2424

2525
repo = eval(:($reps))
26-
DocMeta.setdocmeta!(repo, :DocTestSetup, :(using $reps); recursive=true)
27-
28-
#ENV["JULIA_DEBUG"] = "Literate"
26+
Documenter.DocMeta.setdocmeta!(repo, :DocTestSetup, :(using $reps); recursive=true)
2927

3028
# preprocessing
3129
inc1 = "include(\"../../../inc/reproduce.jl\")"
@@ -79,7 +77,7 @@ format = Documenter.HTML(;
7977
assets = ["assets/custom.css"],
8078
)
8179

82-
makedocs(;
80+
Documenter.makedocs(;
8381
modules = [repo],
8482
authors = "Jeff Fessler & Zongyu Li & contributors",
8583
sitename = "$repo.jl",
@@ -93,7 +91,7 @@ makedocs(;
9391
)
9492

9593
if isci
96-
deploydocs(;
94+
Documenter.deploydocs(;
9795
repo = "github.com/$base",
9896
devbranch = "main",
9997
devurl = "dev",

src/spectplan.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Struct for storing key factors for a SPECT system model
1616
- `psfs [px,pz,ny,nview]` point spread function, must be 4D, with `px and `pz` odd, and symmetric for each slice
1717
- `nview` number of views, must be integer
1818
- `viewangle` set of view angles, must be from 0 to 2π
19-
- `interpmeth` interpolation method, :one means 1d, :two means 2d
20-
- `mode` pre-allcoation method, :fast means faster, :mem means use less memory
21-
- `dy` voxel size in y direction (dx is the same value)
22-
- `nthread` number of CPU threads used to process data, must be integer
19+
- `interpmeth` interpolation method: `:one` means 1d; `:two` means 2d
20+
- `mode` pre-allocation method: `:fast` means faster; `:mem` means use less memory
21+
- `dy` voxel size in y direction (`dx` is the same value)
22+
- `nthread` number of CPU threads used to process data; must be integer
2323
- `planrot` Vector of struct `PlanRotate`
2424
- `planpsf` Vector of struct `PlanPSF`
2525
Currently code assumes the following:

time/SPECTplan.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@ function SPECTplan_time()
5050
end
5151

5252

53-
# run all functions, time may vary on different machines, will alllocate ~100 MB memory.
53+
# Run all functions; time may vary on different machines.
54+
# Will allocate ~100 MB memory.
5455
SPECTplan_time()

0 commit comments

Comments
 (0)