Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix imsharpen docstring #421

Merged
merged 7 commits into from
Jul 18, 2024
Merged

Fix imsharpen docstring #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
762fbd2
docs: update dosctring
cpaniaguam Jul 17, 2024
f4f04da
fix: add numpy as explicit dep so things build
cpaniaguam Jul 17, 2024
c116109
chore: update deps in ci
cpaniaguam Jul 17, 2024
63dc024
Update CI.yml
cpaniaguam Jul 17, 2024
7a4886d
Update documentation.yml
cpaniaguam Jul 17, 2024
261d87d
Update CI.yml
cpaniaguam Jul 17, 2024
9c620ab
Update documentation.yml
cpaniaguam Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: update pip
run: python -m pip install -U pip
- name: install python deps
run: python -m pip install -U scikit-image==0.20.0 pyproj==3.6.0 rasterio==1.3.7 requests==2.31.0 skyfield==1.45.0 pandas jinja2
run: python -m pip install -U numpy==1.23 scikit-image==0.20.0 pyproj==3.6.0 rasterio==1.3.7 requests==2.31.0 skyfield==1.45.0 pandas==2 jinja2==3.1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: update pip
run: python -m pip install -U pip
- name: install python deps
run: python -m pip install -U scikit-image==0.20.0 pyproj==3.6.0 rasterio==1.3.7 requests==2.31.0 skyfield==1.45.0 pandas jinja2
run: python -m pip install -U numpy==1.23 scikit-image==0.20.0 pyproj==3.6.0 rasterio==1.3.7 requests==2.31.0 skyfield==1.45.0 pandas==2 jinja2==3.1
- uses: julia-actions/setup-julia@v2
with:
version: '1.7'
Expand All @@ -34,4 +34,4 @@ jobs:
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # If authenticating with SSH deploy key
PYTHON: python
run: julia --project=docs/ docs/make.jl

3 changes: 2 additions & 1 deletion src/IceFloeTracker.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,13 @@ end
const IFTVERSION = get_version_from_toml()

function __init__()
copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0"))
pyimport_conda("numpy", "numpy=1.23")
pyimport_conda("pyproj", "pyproj=3.6.0")
pyimport_conda("rasterio", "rasterio=1.3.7")
pyimport_conda("jinja2", "jinja2=3.1.2")
pyimport_conda("pandas", "pandas=2")
@pyinclude(joinpath(@__DIR__, "latlon.py"))
copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0"))
copy!(getlatlon, py"getlatlon")
return nothing
end
Expand Down
2 changes: 1 addition & 1 deletion src/normalization.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function _adjust_histogram(masked_view, nbins, rblocks, cblocks, clip)
end

"""
imsharpen(truecolor_image, lambda, kappa, niters, nbins, rblocks, cblocks, clip, smoothing_param, intensity)
imsharpen(truecolor_image, landmask_no_dilate, lambda, kappa, niters, nbins, rblocks, cblocks, clip, smoothing_param, intensity)

Sharpen `truecolor_image`.

Expand Down
Loading