diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 30859e2051..5932ef79bf 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: bde2405e9ccd617cefc6bf9834b0073248726c95ab67352758a8ad699780e20b +# input_hash: f851b393014a2b6c2baa7f0ffaf38ba4c78b8b3dc631f2427d6e2c241f3a305b channels: - conda-forge @@ -25,7 +25,7 @@ dependencies: - fonts-conda-ecosystem=1=0 - libgcc-ng=13.2.0=h807b86a_2 - aws-c-common=0.9.3=hd590300_0 - - bzip2=1.0.8=h7f98852_4 + - bzip2=1.0.8=hd590300_5 - c-ares=1.21.0=hd590300_0 - fribidi=1.0.10=h36c2ea0_0 - geos=3.12.0=h59595ed_0 @@ -118,7 +118,7 @@ dependencies: - freetype=2.12.1=h267a509_2 - krb5=1.21.2=h659d440_0 - libarchive=3.7.2=h039dbb9_0 - - libglib=2.78.0=hebfc3b9_0 + - libglib=2.78.1=hebfc3b9_0 - libgrpc=1.57.0=ha4d0f93_2 - libopenblas=0.3.24=pthreads_h413a1c8_0 - libthrift=0.19.0=hb90f79a_1 @@ -173,6 +173,7 @@ dependencies: - entrypoints=0.4=pyhd8ed1ab_0 - et_xmlfile=1.1.0=pyhd8ed1ab_0 - exceptiongroup=1.1.3=pyhd8ed1ab_0 + - execnet=2.0.2=pyhd8ed1ab_0 - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - fontconfig=2.14.2=h14ed4e7_0 @@ -427,10 +428,11 @@ dependencies: - psycopg2-binary=2.9.7=pyhd8ed1ab_1 - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic=1.10.13=py311h459d7ec_1 - - pyproj=3.6.1=py311h1facc83_3 + - pyproj=3.6.1=py311h1facc83_4 - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 - pytest-mock=3.12.0=pyhd8ed1ab_0 + - pytest-xdist=3.3.1=pyhd8ed1ab_0 - python-build=1.0.3=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - rich=13.6.0=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 5ce99e0d6f..329a8c98f8 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -15,9 +15,9 @@ version: 1 metadata: content_hash: - linux-64: bde2405e9ccd617cefc6bf9834b0073248726c95ab67352758a8ad699780e20b - osx-64: 779093b16fce3695ae0a3bcd273505ed8ee8620e1da3699e00a05d295f2d4b73 - osx-arm64: b0dc74ec7e74d239be2dc479352cb340dbe1120f287abc015054e7ea3f612f9c + linux-64: f851b393014a2b6c2baa7f0ffaf38ba4c78b8b3dc631f2427d6e2c241f3a305b + osx-64: c9d12e883bdd36282e40bd287734adc0e41097810d392559f76e9fdfc07568bc + osx-arm64: 711a77201913623a2c9945c918ad0db8c7aba737efbd3931291d47910775aa18 channels: - url: conda-forge used_env_vars: [] @@ -255,11 +255,11 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: ">=9.3.0" - url: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2 + libgcc-ng: ">=12" + url: https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-hd590300_5.conda hash: - md5: a1fd65c7ccbf10880423d82bca54eb54 - sha256: cb521319804640ff2ad6a9f118d972ed76d86bea44e5626c09a13d38f562e1fa + md5: 69b8b6202a07720f448be700e300ccf4 + sha256: 242c0c324507ee172c0e0dd2045814e746bb303d1eb78870d182ceb0abc726a8 category: main optional: false - name: c-ares @@ -1472,7 +1472,7 @@ package: category: main optional: false - name: libglib - version: 2.78.0 + version: 2.78.1 manager: conda platform: linux-64 dependencies: @@ -1483,10 +1483,10 @@ package: libstdcxx-ng: ">=12" libzlib: ">=1.2.13,<1.3.0a0" pcre2: ">=10.40,<10.41.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.78.0-hebfc3b9_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.78.1-hebfc3b9_0.conda hash: - md5: e618003da3547216310088478e475945 - sha256: 96ec4dc5e38f434aa5862cb46d74923cce1445de3cd0b9d61e3e63102b163af6 + md5: ddd09e8904fde46b85f41896621803e6 + sha256: 44c5f58593b074886436db7d13fdfcba2fe3731867ea52237f049b8400341a2b category: main optional: false - name: libgrpc @@ -2238,6 +2238,18 @@ package: sha256: c28f715e049fe0f09785660bcbffa175ffb438720e5bc5a60d56d4b08364b315 category: main optional: false + - name: execnet + version: 2.0.2 + manager: conda + platform: linux-64 + dependencies: + python: ">=3.7" + url: https://conda.anaconda.org/conda-forge/noarch/execnet-2.0.2-pyhd8ed1ab_0.conda + hash: + md5: 67de0d8241e1060a479e3c37793e26f9 + sha256: 88ea68a360198af39368beecf057af6b31f0ae38071b2bdb2aa961b6ae5427c0 + category: main + optional: false - name: executing version: 2.0.1 manager: conda @@ -5741,10 +5753,10 @@ package: proj: ">=9.3.0,<9.3.1.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.6.1-py311h1facc83_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.6.1-py311h1facc83_4.conda hash: - md5: fee8c3c4404e37e724f08c2983eb484c - sha256: d9a8e3dff436e0e24d660024b496d705ea534e68d3ae656b54ef738ccaafa3c1 + md5: 75d504c6787edc377ebdba087a26a61b + sha256: 4eb94c421b5c635b770e5fbd2774cf1dd4570ad69baf1c248f978943df352896 category: main optional: false - name: pytest-console-scripts @@ -5789,6 +5801,20 @@ package: sha256: 58d3bd93a0cf9b51ac105de1e01b1fcd1fcfa5993023b67658344e329b02d6e0 category: main optional: false + - name: pytest-xdist + version: 3.3.1 + manager: conda + platform: linux-64 + dependencies: + execnet: ">=1.1" + pytest: ">=6.2.0" + python: ">=3.7" + url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda + hash: + md5: 816073bb54ef59f33f0f26c14f88311b + sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6 + category: main + optional: false - name: python-build version: 1.0.3 manager: conda @@ -8145,10 +8171,10 @@ package: manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h0d85af4_4.tar.bz2 + url: https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h10d778d_5.conda hash: - md5: 37edc4e6304ca87316e160f5ca0bd1b5 - sha256: 60ba4c64f5d0afca0d283c7addba577d3e2efc0db86002808dadb0498661b2f2 + md5: 6097a6ca9ada32699b5fc4312dd6ef18 + sha256: 61fb2b488928a54d9472113e1280b468a309561caa54f33825a3593da390b242 category: main optional: false - name: c-ares @@ -9154,20 +9180,21 @@ package: category: main optional: false - name: libglib - version: 2.78.0 + version: 2.78.1 manager: conda platform: osx-64 dependencies: + __osx: ">=10.9" gettext: ">=0.21.1,<1.0a0" - libcxx: ">=15.0.7" + libcxx: ">=16.0.6" libffi: ">=3.4,<4.0a0" libiconv: ">=1.17,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" pcre2: ">=10.40,<10.41.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libglib-2.78.0-hc62aa5d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libglib-2.78.1-h6d9ecee_0.conda hash: - md5: 2c70095fa74bf95a5fd5c830a1529a8b - sha256: 06baed236c43bc225b76145da50caa61d9a36f919525d3e3ed4e59b0d9b7c78a + md5: 0282868f1debc145b732276b2fe40397 + sha256: b16bc30db9688d17b5d1cd9e93d0640d02a862145b072a63af6e45e91da6795c category: main optional: false - name: libkml @@ -10148,6 +10175,18 @@ package: sha256: c28f715e049fe0f09785660bcbffa175ffb438720e5bc5a60d56d4b08364b315 category: main optional: false + - name: execnet + version: 2.0.2 + manager: conda + platform: osx-64 + dependencies: + python: ">=3.7" + url: https://conda.anaconda.org/conda-forge/noarch/execnet-2.0.2-pyhd8ed1ab_0.conda + hash: + md5: 67de0d8241e1060a479e3c37793e26f9 + sha256: 88ea68a360198af39368beecf057af6b31f0ae38071b2bdb2aa961b6ae5427c0 + category: main + optional: false - name: executing version: 2.0.1 manager: conda @@ -13437,10 +13476,10 @@ package: proj: ">=9.3.0,<9.3.1.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.6.1-py311he36daed_3.conda + url: https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.6.1-py311he36daed_4.conda hash: - md5: 36a5e77c81292b71619de017e0d07bd1 - sha256: e0c91ef6905c9930a57cf748d1fa6ec0a6ab4ab556f27c28360d5ff4ff495442 + md5: 28930c73c9c05d44d053620d44397b79 + sha256: d1d44bb257545006b128d30b4454c42e3f7cd133a1c53998afcf7253529f8263 category: main optional: false - name: pytest-console-scripts @@ -13485,6 +13524,20 @@ package: sha256: 58d3bd93a0cf9b51ac105de1e01b1fcd1fcfa5993023b67658344e329b02d6e0 category: main optional: false + - name: pytest-xdist + version: 3.3.1 + manager: conda + platform: osx-64 + dependencies: + python: ">=3.7" + execnet: ">=1.1" + pytest: ">=6.2.0" + url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda + hash: + md5: 816073bb54ef59f33f0f26c14f88311b + sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6 + category: main + optional: false - name: python-build version: 1.0.3 manager: conda @@ -15779,10 +15832,10 @@ package: manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h3422bc3_4.tar.bz2 + url: https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h93a5062_5.conda hash: - md5: fc76ace7b94fb1f694988ab1b14dd248 - sha256: a3efbd06ad1432edb0163c48225421f34c2660f5cc002283a8d27e791320b549 + md5: 1bbc659ca658bfd49a481b5ef7a0f40f + sha256: bfa84296a638bea78a8bb29abc493ee95f2a0218775642474a840411b950fe5f category: main optional: false - name: c-ares @@ -16787,20 +16840,21 @@ package: category: main optional: false - name: libglib - version: 2.78.0 + version: 2.78.1 manager: conda platform: osx-arm64 dependencies: + __osx: ">=10.9" gettext: ">=0.21.1,<1.0a0" - libcxx: ">=15.0.7" + libcxx: ">=16.0.6" libffi: ">=3.4,<4.0a0" libiconv: ">=1.17,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" pcre2: ">=10.40,<10.41.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libglib-2.78.0-h24e9cb9_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libglib-2.78.1-hd9b11f9_0.conda hash: - md5: 01c86aa032cbce6aff557de3b9948aa1 - sha256: bc2fb2e307889294c15fe4f1f61c2c92832c371781654c17c5483c9e8de14d2e + md5: 4e4a9c1cf849de0f9e8b36af65f6f291 + sha256: e18656fc4c9ecfd28382c0f84286a37daf3b33544f50c046bcf93e874a6c1ec0 category: main optional: false - name: libkml @@ -17780,6 +17834,18 @@ package: sha256: c28f715e049fe0f09785660bcbffa175ffb438720e5bc5a60d56d4b08364b315 category: main optional: false + - name: execnet + version: 2.0.2 + manager: conda + platform: osx-arm64 + dependencies: + python: ">=3.7" + url: https://conda.anaconda.org/conda-forge/noarch/execnet-2.0.2-pyhd8ed1ab_0.conda + hash: + md5: 67de0d8241e1060a479e3c37793e26f9 + sha256: 88ea68a360198af39368beecf057af6b31f0ae38071b2bdb2aa961b6ae5427c0 + category: main + optional: false - name: executing version: 2.0.1 manager: conda @@ -21067,10 +21133,10 @@ package: proj: ">=9.3.0,<9.3.1.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.6.1-py311h20a9b75_3.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.6.1-py311h20a9b75_4.conda hash: - md5: 8814c7718c4e16d26d937d401a349999 - sha256: c23285357c7de29f4f49e28df14cbf15c9df1de9254409ee9784bac1233dfb44 + md5: c55fab7aa4252057e5e5efa90bd10cbe + sha256: 9d9923063e21aac5831b3dca820be3a824366f6871c839ea545f9b5e7358c844 category: main optional: false - name: pytest-console-scripts @@ -21115,6 +21181,20 @@ package: sha256: 58d3bd93a0cf9b51ac105de1e01b1fcd1fcfa5993023b67658344e329b02d6e0 category: main optional: false + - name: pytest-xdist + version: 3.3.1 + manager: conda + platform: osx-arm64 + dependencies: + python: ">=3.7" + execnet: ">=1.1" + pytest: ">=6.2.0" + url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda + hash: + md5: 816073bb54ef59f33f0f26c14f88311b + sha256: 5df2d0f1e42041476cbdf12b808890d668e7f0272b51f0f3fa7aab84732150b6 + category: main + optional: false - name: python-build version: 1.0.3 manager: conda diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index fe7214f211..04d36cc7ac 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -1,13 +1,13 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: 779093b16fce3695ae0a3bcd273505ed8ee8620e1da3699e00a05d295f2d4b73 +# input_hash: c9d12e883bdd36282e40bd287734adc0e41097810d392559f76e9fdfc07568bc channels: - conda-forge - defaults dependencies: - aws-c-common=0.9.3=h0dc2134_0 - - bzip2=1.0.8=h0d85af4_4 + - bzip2=1.0.8=h10d778d_5 - c-ares=1.21.0=h10d778d_0 - ca-certificates=2023.7.22=h8857fd0_0 - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 @@ -92,7 +92,7 @@ dependencies: - libedit=3.1.20191231=h0678c8f_2 - libevent=2.1.12=ha90c15b_1 - libgfortran=5.0.0=13_2_0_h97931a8_1 - - libglib=2.78.0=hc62aa5d_0 + - libglib=2.78.1=h6d9ecee_0 - libkml=1.3.0=hab3ca0e_1018 - libnghttp2=1.55.1=hc0a10c5_0 - libprotobuf=4.23.4=he0c2237_6 @@ -164,6 +164,7 @@ dependencies: - entrypoints=0.4=pyhd8ed1ab_0 - et_xmlfile=1.1.0=pyhd8ed1ab_0 - exceptiongroup=1.1.3=pyhd8ed1ab_0 + - execnet=2.0.2=pyhd8ed1ab_0 - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 @@ -407,10 +408,11 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic=1.10.13=py311he705e18_1 - pyobjc-framework-cocoa=10.0=py311hf110eff_1 - - pyproj=3.6.1=py311he36daed_3 + - pyproj=3.6.1=py311he36daed_4 - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 - pytest-mock=3.12.0=pyhd8ed1ab_0 + - pytest-xdist=3.3.1=pyhd8ed1ab_0 - python-build=1.0.3=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - rich=13.6.0=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 82bb9c0223..63e9c1f577 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -1,13 +1,13 @@ # Generated by conda-lock. # platform: osx-arm64 -# input_hash: b0dc74ec7e74d239be2dc479352cb340dbe1120f287abc015054e7ea3f612f9c +# input_hash: 711a77201913623a2c9945c918ad0db8c7aba737efbd3931291d47910775aa18 channels: - conda-forge - defaults dependencies: - aws-c-common=0.9.3=hb547adb_0 - - bzip2=1.0.8=h3422bc3_4 + - bzip2=1.0.8=h93a5062_5 - c-ares=1.21.0=h93a5062_0 - ca-certificates=2023.7.22=hf0a4a13_0 - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 @@ -92,7 +92,7 @@ dependencies: - libedit=3.1.20191231=hc8eb9b7_2 - libevent=2.1.12=h2757513_1 - libgfortran=5.0.0=13_2_0_hd922786_1 - - libglib=2.78.0=h24e9cb9_0 + - libglib=2.78.1=hd9b11f9_0 - libkml=1.3.0=h1eb4d9f_1018 - libnghttp2=1.55.1=h2b02ca0_0 - libprotobuf=4.23.4=hf590ac1_6 @@ -164,6 +164,7 @@ dependencies: - entrypoints=0.4=pyhd8ed1ab_0 - et_xmlfile=1.1.0=pyhd8ed1ab_0 - exceptiongroup=1.1.3=pyhd8ed1ab_0 + - execnet=2.0.2=pyhd8ed1ab_0 - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 @@ -407,10 +408,11 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic=1.10.13=py311h05b510d_1 - pyobjc-framework-cocoa=10.0=py311hb702dc4_1 - - pyproj=3.6.1=py311h20a9b75_3 + - pyproj=3.6.1=py311h20a9b75_4 - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 - pytest-mock=3.12.0=pyhd8ed1ab_0 + - pytest-xdist=3.3.1=pyhd8ed1ab_0 - python-build=1.0.3=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - rich=13.6.0=pyhd8ed1ab_0