Merge pull request #421 from WilhelmusLab/419-fix-imsharpen-docstring

Fix imsharpen docstring
WilhelmusLab · Jul 18, 2024 · f920536 · f920536
2 parents 3228e61 + 9c620ab
commit f920536
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -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 }}

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -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'
@@ -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
-        
+
diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl
@@ -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

diff --git a/src/normalization.jl b/src/normalization.jl
@@ -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`.
-Original file line number
+Diff line change
@@ Expand Up @@
     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 @@