From d62f23c8fe1275e7a4a117566b75ddb61736fb9f Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Mon, 17 Jul 2023 21:58:41 -0400 Subject: [PATCH 1/4] feat: add pipeline py deps --- src/IceFloeTracker.jl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index 69ced447..9dccc1c0 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -44,7 +44,7 @@ export readdlm, using HDF5 export HDF5, PyCall export DataFrames, DataFrame, nrow, Not, select! -export Dates, Time, Date, DateTime,@dateformat_str +export Dates, Time, Date, DateTime, @dateformat_str include("utils.jl") include("persist.jl") @@ -67,7 +67,13 @@ include("special_strels.jl") const sk_measure = PyNULL() function __init__() - return copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) + copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) + # pyimport_conda("numpy", "numpy=1.25.0") + pyimport_conda("pyproj", "pyproj=3.6.0") + pyimport_conda("rasterio", "rasterio=1.3.7") + pyimport_conda("requests", "requests=2.31.0") + pyimport_conda("skyfield", "skyfield=1.45.0") + return nothing end include("regionprops.jl") From a68cae6a97bc65e50df2270b9284dee3ce0e418b Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Mon, 17 Jul 2023 22:14:59 -0400 Subject: [PATCH 2/4] fix: update ci --- .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 89fca542..fe374ae2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -31,7 +31,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 + 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 - uses: julia-actions/setup-julia@v1 with: version: ${{ matrix.version }} From 06256e72610479036109f5ffbb7d18cb7ce64034 Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Mon, 17 Jul 2023 22:35:18 -0400 Subject: [PATCH 3/4] fix: add py deps to docs ci --- .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 2e2704d7..8b6559a0 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 matplotlib + 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 - uses: julia-actions/setup-julia@v1 with: version: '1.7' From c0df35ded41183efc3798fd9ae60dc03d6da76eb Mon Sep 17 00:00:00 2001 From: Carlos Paniagua Date: Wed, 19 Jul 2023 11:42:00 -0400 Subject: [PATCH 4/4] chore: remove mute comment --- src/IceFloeTracker.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/IceFloeTracker.jl b/src/IceFloeTracker.jl index 9dccc1c0..2e34f474 100644 --- a/src/IceFloeTracker.jl +++ b/src/IceFloeTracker.jl @@ -68,7 +68,6 @@ const sk_measure = PyNULL() function __init__() copy!(sk_measure, pyimport_conda("skimage.measure", "scikit-image=0.20.0")) - # pyimport_conda("numpy", "numpy=1.25.0") pyimport_conda("pyproj", "pyproj=3.6.0") pyimport_conda("rasterio", "rasterio=1.3.7") pyimport_conda("requests", "requests=2.31.0")