From 762fbd2ee17c7ada2c387722e5ebf701e592eb90 Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 18:23:38 +0000 Subject: [PATCH 1/7] docs: update dosctring --- src/normalization.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/normalization.jl b/src/normalization.jl index cf1a3053..256b6d39 100644 --- 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`. From f4f04da0f91e8d948b046fc4538ce9c181b3337b Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 15:33:21 -0400 Subject: [PATCH 2/7] fix: add numpy as explicit dep so things build --- src/IceFloeTracker.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index 5ea16628..9edd0590 100644 --- 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 From c116109ca630cbc54b3a32f1c1a3bb6ce99762b3 Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 15:49:29 -0400 Subject: [PATCH 3/7] chore: update deps in ci --- .github/workflows/CI.yml | 2 +- .github/workflows/documentation.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c73f4472..35e2cfc8 100644 --- 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 index 8a4dc30c..72b6d5d4 100644 --- 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 - + From 63dc024c2773264ef361c2645815ea3497174c32 Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 15:53:15 -0400 Subject: [PATCH 4/7] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 35e2cfc8..a8ed766f 100644 --- 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 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 + 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 }} From 7a4886d6306680c3c4d12d3f76b5c6e77b3714de Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 15:53:32 -0400 Subject: [PATCH 5/7] Update documentation.yml --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 72b6d5d4..bbb1553b 100644 --- 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 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 + 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' From 261d87d9320c55309b24be918cdaf6a5a7398f38 Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 15:55:16 -0400 Subject: [PATCH 6/7] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a8ed766f..4d188a18 100644 --- 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 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 + 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 }} From 9c620abe03bcce73097ba6b17051db8858c2ac69 Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 17 Jul 2024 15:55:34 -0400 Subject: [PATCH 7/7] Update documentation.yml --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index bbb1553b..51607cc9 100644 --- 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 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 + 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'