From 62f37be7b63f61673cc6ca4de2237c6591c38e8a Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Wed, 8 Nov 2023 18:22:45 +0000 Subject: [PATCH] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 10 +-- environments/conda-lock.yml | 93 ++++++++++++++------------- environments/conda-osx-64.lock.yml | 10 +-- environments/conda-osx-arm64.lock.yml | 4 +- 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index f1a1720a96..cb1918bf61 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 046905504b546bce6941e51f6aaa9b8aabf01ce6c8b2a57ca37c85aefa112f30 +# input_hash: 62c018f04dcda6922fd5078faad77556aec1dd1f03c6a2262f899eff6feb9116 channels: - conda-forge @@ -207,7 +207,7 @@ dependencies: - libcurl=8.4.0=hca28451_0 - libpq=16.0=hfc447b1_1 - libwebp=1.3.2=h658648e_1 - - llvmlite=0.40.1=py311ha6695c7_0 + - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h1a07684_1 - marko=1.3.1=pyhd8ed1ab_0 @@ -420,7 +420,7 @@ dependencies: - libnetcdf=4.9.2=nompi_h80fb2b6_112 - libspatialite=5.1.0=h090f1da_1 - mako=1.2.4=pyhd8ed1ab_0 - - numpy=1.24.4=py311h64a7726_0 + - numpy=1.26.0=py311h64a7726_0 - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h459d7ec_6 - platformdirs=3.11.0=pyhd8ed1ab_0 @@ -437,7 +437,7 @@ dependencies: - requests=2.31.0=pyhd8ed1ab_0 - rich=13.6.0=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.31.1=pyhd8ed1ab_0 + - starlette=0.32.0=pyhd8ed1ab_0 - tiledb=2.16.3=h8c794c1_3 - ukkonen=1.0.1=py311h9547e67_4 - uvicorn=0.24.0=py311h38be061_0 @@ -466,7 +466,7 @@ dependencies: - jsonschema=4.19.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h38be061_0 - libgdal=3.7.3=h6f3d308_2 - - numba=0.57.1=py311h96b013e_0 + - numba=0.58.1=py311h96b013e_0 - numexpr=2.8.7=py311h039bad6_104 - oauthlib=3.2.2=pyhd8ed1ab_0 - pandas=2.1.2=py311h320fe9a_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 10ba4ec179..b279dc2c91 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -15,9 +15,9 @@ version: 1 metadata: content_hash: - linux-64: 046905504b546bce6941e51f6aaa9b8aabf01ce6c8b2a57ca37c85aefa112f30 - osx-64: f865694148b38249f0b3eaba97b147ee35e27417345ac5df20e46e93d9185692 - osx-arm64: 5deba11744878f7cc6e7350fe815ee8e7f1036b49fdb93d13679562456d8b241 + linux-64: 62c018f04dcda6922fd5078faad77556aec1dd1f03c6a2262f899eff6feb9116 + osx-64: 7ade47c1ca071082a3818606e76b6768241ac2410e31d8f902abbb59ecaba073 + osx-arm64: 1678be4da0075835c5823bcfd307ec83872e5ae2ab716ed9f2b6d9f176a89e0d channels: - url: conda-forge used_env_vars: [] @@ -2697,7 +2697,7 @@ package: category: dev optional: true - name: llvmlite - version: 0.40.1 + version: 0.41.1 manager: conda platform: linux-64 dependencies: @@ -2707,10 +2707,10 @@ package: libzlib: ">=1.2.13,<1.3.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/llvmlite-0.40.1-py311ha6695c7_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/llvmlite-0.41.1-py311ha6695c7_0.conda hash: - md5: 7a2b62d839516ba0cf56717e902229f4 - sha256: bab4a08258aff6d76072a9e9a5c1fa3efb7acd6a7376f9761aec9bf735344ae4 + md5: 60fa8c1f3fb0d99dd10a9af2aff9c400 + sha256: 6510aee9e700e3d000a5eb1ac39455c306572baac8ea3a708743890e16499cf1 category: main optional: false - name: locket @@ -5610,7 +5610,7 @@ package: category: main optional: false - name: numpy - version: 1.24.4 + version: 1.26.0 manager: conda platform: linux-64 dependencies: @@ -5621,10 +5621,10 @@ package: libstdcxx-ng: ">=12" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.4-py311h64a7726_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.0-py311h64a7726_0.conda hash: - md5: 5a03d7c75dd4a9ae9a58850860eca468 - sha256: 81d5ac9c26fe7c689014dd6e48730b37e9017cb2b012839830a9ff66b0d70c9e + md5: bf16a9f625126e378302f08e7ed67517 + sha256: 0aab5cef67cc2a1cd584f6e9cc6f2065c7a28c142d7defcb8096e8f719d9b3bf category: main optional: false - name: pbr @@ -5878,17 +5878,17 @@ package: category: main optional: false - name: starlette - version: 0.31.1 + version: 0.32.0 manager: conda platform: linux-64 dependencies: anyio: <5,>=3.4.0 python: ">=3.8" typing_extensions: ">=3.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.31.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0-pyhd8ed1ab_0.conda hash: - md5: 409034f0925a73b5f27ae71849e60034 - sha256: 2788957c93ad843a8c3870918161a65b2a028c03c17b3c348624cc8bd34f7e82 + md5: 14c4a4364a77d8534ec2d2d67b9229b1 + sha256: d94e25824ac953912a54e770b7d0ddcc8e783842673af99535c8391f46510274 category: dev optional: true - name: tiledb @@ -6384,20 +6384,21 @@ package: category: main optional: false - name: numba - version: 0.57.1 + version: 0.58.1 manager: conda platform: linux-64 dependencies: + _openmp_mutex: ">=4.5" libgcc-ng: ">=12" libstdcxx-ng: ">=12" - llvmlite: ">=0.40.0,<0.41.0a0" + llvmlite: ">=0.41.1,<0.42.0a0" numpy: ">=1.23.5,<2.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/numba-0.57.1-py311h96b013e_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/numba-0.58.1-py311h96b013e_0.conda hash: - md5: 618010d18c4a38073a7f51d9dd3fd8a8 - sha256: f77a51fbde181287af32f75faba8e453fa546abede3b31625a0645810369f117 + md5: 06a0313ff3d2ec956a25767ccaf7c9f6 + sha256: 9061328d0fa03fc0bf40136c366399107dcede6004dcabd4bf553f60f55b86bf category: main optional: false - name: numexpr @@ -10547,19 +10548,18 @@ package: category: main optional: false - name: llvmlite - version: 0.40.1 + version: 0.41.1 manager: conda platform: osx-64 dependencies: - libcxx: ">=15.0.7" libllvm14: ">=14.0.6,<14.1.0a0" libzlib: ">=1.2.13,<1.3.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/llvmlite-0.40.1-py311hcbb5c6d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/llvmlite-0.41.1-py311hb5c2e0a_0.conda hash: - md5: 12a2f51581ae85b308b63a0a883ef97b - sha256: 94953322bcbb6c8e5612b63e580cb513138aa6b7c94c2356797f0f6a7fb0072f + md5: 9a2b325146497a6197a2d44b8762ccb2 + sha256: 891153e5aef3ea6ffe53b52aa2244736ebad4771fa7a69c5887cbe76e03237bd category: main optional: false - name: locket @@ -13332,7 +13332,7 @@ package: category: main optional: false - name: numpy - version: 1.24.4 + version: 1.26.0 manager: conda platform: osx-64 dependencies: @@ -13342,10 +13342,10 @@ package: liblapack: ">=3.9.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/numpy-1.24.4-py311hc44ba51_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/numpy-1.26.0-py311hc44ba51_0.conda hash: - md5: 31c12f08652b27a8f9cceb39ea4a1d4e - sha256: be6fa93501c16a0e7075b85c6a9010856e0e5b4d80582054450f33f1c39e5226 + md5: f95605c5b73f5f6a0f5f1b0aabfc2f39 + sha256: 517cb22d5594fdb934523dd1951929961f686b5d994c684201acbf282433ec9b category: main optional: false - name: pango @@ -13601,17 +13601,17 @@ package: category: main optional: false - name: starlette - version: 0.31.1 + version: 0.32.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" typing_extensions: ">=3.10.0" anyio: <5,>=3.4.0 - url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.31.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0-pyhd8ed1ab_0.conda hash: - md5: 409034f0925a73b5f27ae71849e60034 - sha256: 2788957c93ad843a8c3870918161a65b2a028c03c17b3c348624cc8bd34f7e82 + md5: 14c4a4364a77d8534ec2d2d67b9229b1 + sha256: d94e25824ac953912a54e770b7d0ddcc8e783842673af99535c8391f46510274 category: dev optional: true - name: tiledb @@ -14147,20 +14147,21 @@ package: category: dev optional: true - name: numba - version: 0.57.1 + version: 0.58.1 manager: conda platform: osx-64 dependencies: - libcxx: ">=15.0.7" - llvm-openmp: ">=16.0.6" - llvmlite: ">=0.40.0,<0.41.0a0" + __osx: ">=10.9" + libcxx: ">=16.0.6" + llvm-openmp: ">=17.0.4" + llvmlite: ">=0.41.1,<0.42.0a0" numpy: ">=1.23.5,<2.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/numba-0.57.1-py311h5a8220d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/numba-0.58.1-py311h32f2313_0.conda hash: - md5: 8049bf49848013a9b6565c14e6621798 - sha256: eb86b04f47b411020028f2439fb48d929ec259124307612514f5239f999f0ea4 + md5: 97c10727b2fd55e61eaf35ea97811662 + sha256: bc318713a7bd89922b28636d5c9e56efdc9cd86361c0b2f2a3dcb0a9ffe4d8cb category: main optional: false - name: numexpr @@ -14920,9 +14921,9 @@ package: dependencies: sqlalchemy: ">=1.4,<3" lxml: ">=4.9.1,<5" + python: ">=3.10,<3.13" coloredlogs: ">=14.0,<15.1" frictionless: ">=4.4,<5" - python: ">=3.10,<3.13" numpy: ">=1.16,<2" arelle-release: ">=2.3,<3" pandas: ">=1.5,<2.2" @@ -21257,17 +21258,17 @@ package: category: main optional: false - name: starlette - version: 0.31.1 + version: 0.32.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" typing_extensions: ">=3.10.0" anyio: <5,>=3.4.0 - url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.31.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0-pyhd8ed1ab_0.conda hash: - md5: 409034f0925a73b5f27ae71849e60034 - sha256: 2788957c93ad843a8c3870918161a65b2a028c03c17b3c348624cc8bd34f7e82 + md5: 14c4a4364a77d8534ec2d2d67b9229b1 + sha256: d94e25824ac953912a54e770b7d0ddcc8e783842673af99535c8391f46510274 category: dev optional: true - name: tiledb @@ -22575,9 +22576,9 @@ package: dependencies: sqlalchemy: ">=1.4,<3" lxml: ">=4.9.1,<5" + python: ">=3.10,<3.13" coloredlogs: ">=14.0,<15.1" frictionless: ">=4.4,<5" - python: ">=3.10,<3.13" numpy: ">=1.16,<2" arelle-release: ">=2.3,<3" pandas: ">=1.5,<2.2" diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index a8a1d33cd5..40fed250e7 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: f865694148b38249f0b3eaba97b147ee35e27417345ac5df20e46e93d9185692 +# input_hash: 7ade47c1ca071082a3818606e76b6768241ac2410e31d8f902abbb59ecaba073 channels: - conda-forge @@ -192,7 +192,7 @@ dependencies: - libcurl=8.4.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libpq=16.0=h3df487d_1 - - llvmlite=0.40.1=py311hcbb5c6d_0 + - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h19a211c_1 - marko=1.3.1=pyhd8ed1ab_0 @@ -399,7 +399,7 @@ dependencies: - libnetcdf=4.9.2=nompi_h6a32802_112 - libspatialite=5.1.0=h4a59d8e_1 - mako=1.2.4=pyhd8ed1ab_0 - - numpy=1.24.4=py311hc44ba51_0 + - numpy=1.26.0=py311hc44ba51_0 - pango=1.50.14=h19c1c8a_2 - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h2725bcf_6 @@ -417,7 +417,7 @@ dependencies: - requests=2.31.0=pyhd8ed1ab_0 - rich=13.6.0=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.31.1=pyhd8ed1ab_0 + - starlette=0.32.0=pyhd8ed1ab_0 - tiledb=2.16.3=hd3a41d5_3 - ukkonen=1.0.1=py311h5fe6e05_4 - uvicorn=0.24.0=py311h6eed73b_0 @@ -449,7 +449,7 @@ dependencies: - keyring=24.2.0=py311h6eed73b_1 - libgdal=3.7.3=h926149b_2 - librsvg=2.56.3=hec3db73_0 - - numba=0.57.1=py311h5a8220d_0 + - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 - oauthlib=3.2.2=pyhd8ed1ab_0 - pandas=2.1.2=py311h1eadf79_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 6dc3e34d7e..5e12e707ff 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-arm64 -# input_hash: 5deba11744878f7cc6e7350fe815ee8e7f1036b49fdb93d13679562456d8b241 +# input_hash: 1678be4da0075835c5823bcfd307ec83872e5ae2ab716ed9f2b6d9f176a89e0d channels: - conda-forge @@ -417,7 +417,7 @@ dependencies: - requests=2.31.0=pyhd8ed1ab_0 - rich=13.6.0=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.31.1=pyhd8ed1ab_0 + - starlette=0.32.0=pyhd8ed1ab_0 - tiledb=2.16.3=he15c4da_3 - ukkonen=1.0.1=py311he4fd1f5_4 - uvicorn=0.24.0=py311h267d04e_0