diff --git a/.CondaPkg/env/conda-meta/history b/.CondaPkg/env/conda-meta/history index d2955ead..600f1367 100644 --- a/.CondaPkg/env/conda-meta/history +++ b/.CondaPkg/env/conda-meta/history @@ -1,5 +1,5 @@ -==> 2023-10-05 02:08:01 <== -# cmd: C:\Users\naraw\.julia\artifacts\4b87dc8b933ca2d289a392e264aaf44df2410f6f\bin\micromamba.exe -r C:\Users\naraw\.julia\scratchspaces\0b3b1443-0f03-428d-bdfb-f27f9c1191ea\root create -y -p C:\Users\naraw\Desktop\New folder\ImageUtils\.CondaPkg\env --override-channels --no-channel-priority python[version='>=3.7,<4',channel='conda-forge',build='*cpython*'] -c anaconda -c conda-forge +==> 2023-10-05 02:24:41 <== +# cmd: C:\Users\naraw\.julia\artifacts\4b87dc8b933ca2d289a392e264aaf44df2410f6f\bin\micromamba.exe -r C:\Users\naraw\.julia\scratchspaces\0b3b1443-0f03-428d-bdfb-f27f9c1191ea\root create -y -p C:\Users\naraw\Desktop\New folder\ImageUtils\.CondaPkg\env --override-channels --no-channel-priority pip[version='>=22.0.0'] python[version='>=3.7,<4',channel='conda-forge',build='*cpython*'] -c anaconda -c conda-forge -c pytorch # conda version: 3.8.0 +https://conda.anaconda.org/conda-forge/win-64::libexpat-2.5.0-h63175ca_1 +https://conda.anaconda.org/conda-forge/win-64::ucrt-10.0.22621.0-h57928b3_0 @@ -19,16 +19,4 @@ +https://conda.anaconda.org/conda-forge/noarch::wheel-0.41.2-pyhd8ed1ab_0 +https://conda.anaconda.org/conda-forge/noarch::setuptools-68.2.2-pyhd8ed1ab_0 +https://conda.anaconda.org/conda-forge/noarch::pip-23.2.1-pyhd8ed1ab_0 -# update specs: ["conda-forge::python[version='>=3.7,<4',build=*cpython*]"] -==> 2023-10-05 02:08:33 <== -# cmd: C:\Users\naraw\.julia\artifacts\4b87dc8b933ca2d289a392e264aaf44df2410f6f\bin\micromamba.exe -r C:\Users\naraw\.julia\scratchspaces\0b3b1443-0f03-428d-bdfb-f27f9c1191ea\root install -y -p C:\Users\naraw\Desktop\New folder\ImageUtils\.CondaPkg\env --override-channels --no-channel-priority python[version='>=3.7,<4',channel='conda-forge',build='*cpython*'] -c anaconda -c conda-forge -c pytorch -# conda version: 3.8.0 --https://conda.anaconda.org/conda-forge/win-64::python-3.12.0-h2628c8c_0_cpython -+https://conda.anaconda.org/conda-forge/win-64::python-3.12.0-h2628c8c_0_cpython -# update specs: ["conda-forge::python[version='>=3.7,<4',build=*cpython*]"] -==> 2023-10-05 02:12:17 <== -# cmd: C:\Users\naraw\.julia\artifacts\4b87dc8b933ca2d289a392e264aaf44df2410f6f\bin\micromamba.exe -r C:\Users\naraw\.julia\scratchspaces\0b3b1443-0f03-428d-bdfb-f27f9c1191ea\root install -y -p C:\Users\naraw\Desktop\New folder\ImageUtils\.CondaPkg\env --override-channels --no-channel-priority pip[version='>=22.0.0'] python[version='>=3.7,<4',channel='conda-forge',build='*cpython*'] -c anaconda -c conda-forge -c pytorch -# conda version: 3.8.0 --https://conda.anaconda.org/conda-forge/win-64::python-3.12.0-h2628c8c_0_cpython -+https://conda.anaconda.org/conda-forge/win-64::python-3.12.0-h2628c8c_0_cpython # update specs: ["pip[version='>=22.0.0']", "conda-forge::python[version='>=3.7,<4',build=*cpython*]"] diff --git a/.CondaPkg/env/conda-meta/pip-23.2.1-pyhd8ed1ab_0.json b/.CondaPkg/env/conda-meta/pip-23.2.1-pyhd8ed1ab_0.json index 0b843966..aab97f5b 100644 --- a/.CondaPkg/env/conda-meta/pip-23.2.1-pyhd8ed1ab_0.json +++ b/.CondaPkg/env/conda-meta/pip-23.2.1-pyhd8ed1ab_0.json @@ -6540,7 +6540,7 @@ "paths_version": 1 }, "platform": null, - "requested_spec": "", + "requested_spec": "pip[version='>=22.0.0']", "sha256": "9e401b171856e12f6aa32ae5cc1ae1d3708aa7d705ddf359ee7dd0dffd73c2b5", "size": 1386212, "subdir": "noarch", diff --git a/.CondaPkg/meta b/.CondaPkg/meta index 07b1f61b..3e098be0 100644 Binary files a/.CondaPkg/meta and b/.CondaPkg/meta differ diff --git a/CondaPkg.toml b/CondaPkg.toml index 753506cc..8a679ba4 100644 --- a/CondaPkg.toml +++ b/CondaPkg.toml @@ -1,4 +1,4 @@ -channels = ["anaconda", "anaconda", "conda-forge", "pytorch"] +channels = ["anaconda", "anaconda", "conda-forge", "pytorch", "anaconda", "conda-forge", "pytorch"] [pip.deps] pillow = "" diff --git a/src/interface.jl b/src/interface.jl index ed6efdd6..c2bb603c 100644 --- a/src/interface.jl +++ b/src/interface.jl @@ -5,9 +5,10 @@ export np2juliaImage, juliaImg2npImg, imgScalePadding, url_to_image using Images, Colors, FileIO, HTTP, NNlib # using Luxor -# condapackage = ["pybase64", "opencv-python", "scikit-image", "Pillow", "numpy"] -# channels = ["anaconda", "conda-forge", "pytorch"] -# using CondaPkg; +condapackage = ["pybase64", "opencv-python", "scikit-image", "Pillow", "numpy"] +channels = ["anaconda", "conda-forge", "pytorch"] +using CondaPkg; +CondaPkg.resolve() # for i in channels CondaPkg.add_channel(i) end # for i in condapackage CondaPkg.add_pip(i) end