diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index 25e5f1a5..d1d9eab9 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -89,7 +89,7 @@ dependencies: - graphviz - expect - dtc - - verilator==4.226 + - verilator==5.008 - screen - elfutils - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock @@ -131,7 +131,7 @@ dependencies: - pytest-mock - moto - mypy - - s3fs + - s3fs==0.4.2 - aiohttp - pip: - sure diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml index 7a0c7cd8..4899b455 100644 --- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml +++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml @@ -9,7 +9,7 @@ # To update a single package to the latest version compatible with the version constraints in the source: # conda-lock lock --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,12 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 3794abe8e222921d310bbd60f30fea775b80f7533f7a57d57c11bb3640a3643a + linux-64: 86382a6fa6e58883c85e482f6c209ab347df1461d7c5706f28b95813412dfe94 platforms: - linux-64 sources: - - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml - - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/esp-tools.yaml + - /scratch/abejgonza/cy/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml package: - category: main dependencies: {} @@ -42,13 +42,13 @@ package: - category: main dependencies: {} hash: - md5: a581b4a89191b6c1d6a16488a9cffbfc - sha256: 695e67ae4bc22f9e0be5f54b1948a8f2b678f4da920fa2082a249dd5a88f440e + md5: f6ce7955b53ae1ca83144adb3be9c600 + sha256: 546e4eb1cbd822a66b363ec3fbdcc4fcc53853bcab57674cb46b8f3209b856f2 manager: conda name: _sysroot_linux-64_curr_repodata_hack optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/_sysroot_linux-64_curr_repodata_hack-3-h5bd9786_13.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/_sysroot_linux-64_curr_repodata_hack-3-h69a702a_13.conda version: '3' - category: main dependencies: {} @@ -64,14 +64,14 @@ package: - category: main dependencies: {} hash: - md5: ff9f73d45c4a07d6f424495288a26080 - sha256: 8f6c81b0637771ae0ea73dc03a6d30bec3326ba3927f2a7b91931aa2d59b1789 + md5: f5c65075fc34438d5b456c7f3f5ab695 + sha256: 0cf1bb3d0bfc5519b60af2c360fa4888fb838e1476b1e0f65b9dbc48b45c7345 manager: conda name: ca-certificates optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda - version: 2022.12.7 + url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2023.5.7-hbcca054_0.conda + version: 2023.5.7 - category: main dependencies: {} hash: @@ -526,18 +526,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/icu-72.1-hcb278e6_0.conda version: '72.1' -- category: main - dependencies: - libgcc-ng: '>=12' - hash: - md5: c7a069243e1fbe9a556ed2ec030e6407 - sha256: 8f73194d09c9ea4a7e2b3562766b8d72125cc147b62c7cf83393e3a3bbfd581b - manager: conda - name: jpeg - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h0b41bf4_3.conda - version: 9e - category: main dependencies: libgcc-ng: '>=10.3.0' @@ -883,13 +871,13 @@ package: ca-certificates: '' libgcc-ng: '>=12' hash: - md5: 2d833be81a21128e317325a01326d36f - sha256: d378afcec34b86fef4da3ebd622b3e614cb3f71e54b6a5a10adb1d23745ecc72 + md5: 8f24d371ed9efb3f0b0de383fb81d51c + sha256: 24bf6cf8f741c28a8d10f51c917f378694d4a98a38ab4372629932cd6c94e9e8 manager: conda name: openssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-hd590300_3.conda version: 3.1.0 - category: main dependencies: @@ -1358,14 +1346,14 @@ package: libgcc-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 2e5f9a37d487e1019fd4d8113adb2f9f - sha256: 6008a0b914bd1a3510a3dba38eada93aa0349ebca3a21e5fa276833c8205bf49 + md5: 1d002bf709048f8021c32abfd0e0d395 + sha256: bb2a8ddb26e74f2cedc36825fc6f95d45f19e1912a1a6c75847952d92fc16215 manager: conda name: libsqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.40.0-h753d276_0.tar.bz2 - version: 3.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.41.2-h2797004_1.conda + version: 3.41.2 - category: main dependencies: libgcc-ng: '>=12' @@ -1709,13 +1697,13 @@ package: dependencies: gcc_impl_linux-64: 12.2.0.* hash: - md5: c241b4f6676222c2feefc9dc4b9d1728 - sha256: f4b4184cc3e0864abadfc5b06ae869b479e736ff1dc46723967256d11b5bc7c4 + md5: ec93d13e0fe8514f65842120dbae1b16 + sha256: 5478f5b7672b6c2d5b644aaa9fe18fbb1468ca6ea9cea1b0f0a2254459438e24 manager: conda name: gcc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_12.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_13.conda version: 12.2.0 - category: main dependencies: @@ -1806,14 +1794,14 @@ package: libzlib: '>=1.2.13,<1.3.0a0' pcre2: '>=10.40,<10.41.0a0' hash: - md5: 984fc0159591041a411d96718e7073d0 - sha256: afac276054c6fc2959347e7e1da211554f5cc4efbdda6d1f29b6d98919eae833 + md5: db1d4a1dfc04f3eab50d97551850759a + sha256: e0d54ffe98b7471cfc95f043bf3921412843c05ba5f1f10ceeac5edb328ac928 manager: conda name: libglib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.1-ha491796_0.conda - version: 2.76.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.2-hebfc3b9_0.conda + version: 2.76.2 - category: main dependencies: libblas: 3.9.0 16_linux64_openblas @@ -1830,34 +1818,18 @@ package: dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' - libxml2: '>=2.10.3,<2.11.0a0' + libxml2: '>=2.10.4,<2.11.0a0' libzlib: '>=1.2.13,<1.3.0a0' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 17d91085ccf5934ce652cb448d0cb65a - sha256: f649fac60cb122bf0d85c4955725d94c353fdbd768bcd44f0444979b363cc9ab - manager: conda - name: libllvm15 - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_1.conda - version: 15.0.7 -- category: main - dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - libxml2: '>=2.10.3,<2.11.0a0' - libzlib: '>=1.2.13,<1.3.0a0' - zstd: '>=1.5.2,<1.6.0a0' - hash: - md5: 716f4c806c384ee7bf1647814516c241 - sha256: 95a7e646c035b2515c69af0c47acf1840557160123f8ee6441d8b0f254098342 + md5: 3d942f062d7656168bb42b3439bdfede + sha256: c52c239b583a1b2d03bdc641afd8cbab0499b0a46ea55b40e1dbed112283a772 manager: conda name: libllvm16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm16-16.0.1-hadd5161_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libllvm16-16.0.3-hbf9e925_1.conda + version: 16.0.3 - category: main dependencies: lerc: '>=4.0.0,<5.0a0' @@ -1957,19 +1929,19 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libsqlite: 3.40.0 h753d276_0 + libsqlite: 3.41.2 h2797004_1 libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' - readline: '>=8.1.2,<9.0a0' + readline: '>=8.2,<9.0a0' hash: - md5: bb11803129cbbb53ed56f9506ff74145 - sha256: baf0e77938e5215653aa6609ff154cb94aeb0a08083ff8dec2d3ba8dd62263e9 + md5: c8771266cc289756099c04e597209862 + sha256: 2674e5b0888799ad055bdbc79e2257d67f52b0c11f4c174d4deff4b69874cf45 manager: conda name: sqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.40.0-h4ff8645_0.tar.bz2 - version: 3.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.41.2-h2c6b66d_1.conda + version: 3.41.2 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -2028,16 +2000,16 @@ package: version: 1.4.4 - category: main dependencies: - python: '>=3.6' + python: '>=3.7' hash: - md5: 99b19895abe40280358488acb9589532 - sha256: 2b273efc522834e4c8563da7998b9b683eed467660fe8a5a3c24d58aaa85a9cb + md5: 0b3460f5bf4ae27dfd72fdcccc9667a9 + sha256: 18aad01518cb08e4eff18e507e14ebf6c522d89ef53ca267c48080933c4435f7 manager: conda name: argcomplete optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.5-pyhd8ed1ab_0.conda - version: 3.0.5 + url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.8-pyhd8ed1ab_0.conda + version: 3.0.8 - category: main dependencies: libgcc-ng: '>=12' @@ -2054,16 +2026,28 @@ package: version: 2.38.0 - category: main dependencies: - python: '>=3.5' + python: '>=3.7' hash: - md5: 8b76db7818a4e401ed4486c4c1635cd9 - sha256: 3a58d4a4933fa8735471c782d35326ab78e0bcfce84756408515f82a94e4dec4 + md5: 3edfead7cedd1ab4400a6c588f3e75f8 + sha256: 063639cd568f5c7a557b0fb1cc27f098598c0d8ff869088bfeb82934674f8821 manager: conda name: attrs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda - version: 22.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/attrs-23.1.0-pyh71513ae_1.conda + version: 23.1.0 +- category: main + dependencies: + python: '>=3.7' + hash: + md5: 2fb79ec81bad9492b6d59a06b3b647a4 + sha256: b6f32491536823e47cf6eb4717dd341385600a2b901235028dedc629a77aeb82 + manager: conda + name: blinker + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/blinker-1.6.2-pyhd8ed1ab_0.conda + version: 1.6.2 - category: main dependencies: brotli-bin: 1.0.9 h166bdaf_8 @@ -2095,14 +2079,14 @@ package: dependencies: python: '>=3.7' hash: - md5: fb9addc3db06e56abe03e0e9f21a63e6 - sha256: 5e22af4776700200fab2c1df41a2188ab9cfe90a50c4f388592bb978562c88ec + md5: 5d1b71c942b8421285934dad1d891ebc + sha256: f839a6e04d94069f90dd85337ea9108f058dc76771bb469a413f32bb1ba0b256 manager: conda name: certifi optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda - version: 2022.12.7 + url: https://conda.anaconda.org/conda-forge/noarch/certifi-2023.5.7-pyhd8ed1ab_0.conda + version: 2023.5.7 - category: main dependencies: python: '>=3.6.1' @@ -2129,16 +2113,16 @@ package: version: 2.1.1 - category: main dependencies: - __unix: '' - python: '>=3.8' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 hash: - md5: 20e4087407c7cb04a40817114b333dbf - sha256: 23676470b591b100393bb0f6c46fe10624dcbefc696a6a9f42932ed8816ef0ea + md5: 3613ff4128b3e565d048106196206929 + sha256: 21c425ecc4e6f4ec97aab1285b22ad629c75d2efb62f89cd6d9618ab6a2e606c manager: conda name: click optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/click-8.1.3-py39hf3d152e_1.tar.bz2 version: 8.1.3 - category: main dependencies: @@ -2302,14 +2286,14 @@ package: dependencies: python: '>=3.8' hash: - md5: a993e42df87a292d8fd7396a2e2a8d75 - sha256: c2a5db01537aae91a54dbd163b85421de2b623c75803af4e38ea01ba000317d1 + md5: 20edd290b319aa0eff3e9055375756dc + sha256: cbb5c77c0217cda9bf4f4240158de11822a099a6eaa05ba626e822819a54f46d manager: conda name: fsspec optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.4.0-pyh1a96a4e_0.conda - version: 2023.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.5.0-pyh1a96a4e_0.conda + version: 2023.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -2363,13 +2347,13 @@ package: gcc: 12.2.0.* gxx_impl_linux-64: 12.2.0.* hash: - md5: 56e0d282569b6cd349035a1bb5efae47 - sha256: b428f0af395194cb327fb212167efc3a837866d11b9f1a8bbad7e953c595c6cb + md5: de605ff437f3fdc010f1b529642339f1 + sha256: 58bc0a7ff843c4ac2fd53b1370d266d635b59cf8d1d6f165cc26cf1f5324c9f8 manager: conda name: gxx optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_12.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_13.conda version: 12.2.0 - category: main dependencies: @@ -2512,46 +2496,31 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' - hash: - md5: 276ec1f956a520363016f909ec166f65 - sha256: 48c0820ba1fe5701d11a5b7967a2c93d73607741a20e511214ece7fec7b9dc7f - manager: conda - name: libclang-cpp15 - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp15-15.0.7-default_had23c3d_1.conda - version: 15.0.7 -- category: main - dependencies: - libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 2c00ecf8081a8f23043b055a68d7ba90 - sha256: 5f3eb78832674b8038dd65c80d09837a01f3300bf516370fc16650f33b8b87ed + md5: 205aca93c1bc4a0bc663dd787c224025 + sha256: 66e0e925088acbc1306c814ca8441e61dd2f2a2ff93ff752b914939b87864d24 manager: conda name: libclang-cpp16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 48c2eb0c9988c76ad34c47910fee3077 - sha256: aa4a685e98221cee06b6de93c9ac8efc329c648fdbbffbdd02f41cb1d228b3d8 + md5: e0f95087543b73c7bc2689f0aeb86a6d + sha256: 40c7a6ebfe181b3683fa4c0a378ff25eca1a77d68c35578b9c237dd58c4d458d manager: conda name: libclang13 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.1-default_h9b593c0_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_hd781213_0.conda + version: 16.0.3 - category: main dependencies: krb5: '>=1.20.1,<1.21.0a0' @@ -2740,14 +2709,14 @@ package: python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: 757070dc7cc33003254888808cd34f1e - sha256: c0418aa18f4fd37d3ac786058bfa29cca0b5b8eca95a2e0ae2fdd13aefc81ad6 + md5: 8626d6d5169950ce4b99b082667773f7 + sha256: c8fac78b5292c279449e4ccba03661dd75f9d39b0f5d40b8bf55c3fcd89f64ce manager: conda name: numpy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py39h7360e5f_0.conda - version: 1.24.2 + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.3-py39h6183b62_0.conda + version: 1.24.3 - category: main dependencies: libgcc-ng: '>=12' @@ -2802,15 +2771,16 @@ package: version: 1.9.6 - category: main dependencies: - python: '>=3.8' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 hash: - md5: 7d301a0d25f424d96175f810935f0da9 - sha256: c25e1757e4e90638bb1e778aba3ee5f3c01fae9752e3c3929f9be7d367f6c7f3 + md5: d86903c57fe229d9dd8878a6dd9d149f + sha256: abf2d34464c6255d35703e3c9477475e3e6e353ca8675990596d2477cdbc5b52 manager: conda name: pluggy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pluggy-1.0.0-py39hf3d152e_4.tar.bz2 version: 1.0.0 - category: main dependencies: @@ -2893,14 +2863,14 @@ package: dependencies: python: '>=3.6' hash: - md5: 56d08bbebf5b3719ca2b1688fcfd98a4 - sha256: 177ce344fc9668cc1e7daa637ef375f6765e60fbb52e83a5744a0513751200aa + md5: 99e28be5a278e2319834d7dc99e7bfdd + sha256: f3a64306fa0f405f10f4108d7ff42043d6fd393f940f9e98e395a3756687fc98 manager: conda name: pyjwt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2 - version: 2.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.7.0-pyhd8ed1ab_0.conda + version: 2.7.0 - category: main dependencies: python: '>=3.3' @@ -2941,16 +2911,16 @@ package: version: 0.19.3 - category: main dependencies: - __unix: '' - python: '>=3.8' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 hash: - md5: 2a7de29fb590ca14b5243c4c812c8025 - sha256: a42f826e958a8d22e65b3394f437af7332610e43ee313393d1cf143f0a2d274b + md5: d34b97a2386932b97c7cb80916a673e7 + sha256: 42d46baeab725d3c70d22a4258549e9f0f1a72b740166cd9c3b394c4369cb306 manager: conda name: pysocks optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py39hf3d152e_5.tar.bz2 version: 1.7.1 - category: main dependencies: @@ -3037,14 +3007,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 6c443cccff3daa3d83b2b807b0a298ce - sha256: 6595024174d318848468c0e61899ff3c2f08a3545c85727b9a2871d6f8d0062a + md5: 3b68bc43ec6baa48f7354a446267eefe + sha256: 3ac44771fce01f19218bcdf3992e24984748048db69889a9df65abcc6a10e29b manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.1-pyhd8ed1ab_0.conda - version: 67.6.1 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.7.2-pyhd8ed1ab_0.conda + version: 67.7.2 - category: main dependencies: python: '' @@ -3177,6 +3147,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2 version: 2.0.1 +- category: main + dependencies: + python: '>=3.7' + hash: + md5: 75838e8556166263a82038b51d01d5f1 + sha256: 3002e87338a98ba501fbf53981f8267b2def2548265a3622d403d06747872ccd + manager: conda + name: tomlkit + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.8-pyha770c72_0.conda + version: 0.11.8 - category: main dependencies: python: '>=3.5' @@ -3231,26 +3213,14 @@ package: dependencies: python: '>=3.6' hash: - md5: 1c44c106ac42fde5774d31e37220f4df - sha256: b9df570c65f14a002a3972bf9e9ed0c0ef8ff6a29087ba8d6be6493bfd1ea8ef + md5: 8b7a7a28f8a274b98f0387c13c56c94c + sha256: e07d313a9c7aa2dfe425ca5a3bdc65cd015a8819cda8e576edb3b3a47535da1a manager: conda name: types-urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.10-pyhd8ed1ab_0.conda - version: 1.26.25.10 -- category: main - dependencies: - python: '>=3' - hash: - md5: e6573ac68718f17b9d4f5c8eda3190f2 - sha256: ec1cfe0b7dc55a22223562cad799e0b16d122dab611c9923b6068d27a784ba2f - manager: conda - name: typing - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2 - version: 3.10.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.12-pyhd8ed1ab_0.conda + version: 1.26.25.12 - category: main dependencies: python: '>=3.7' @@ -3283,18 +3253,19 @@ package: gxx_impl_linux-64: '' libgcc-ng: '>=12' libstdcxx-ng: '>=12' - libzlib: '>=1.2.12,<1.3.0a0' + libzlib: '>=1.2.13,<1.3.0a0' make: '' perl: '' + python: '' hash: - md5: 41af6df1758bae89161daf268566384e - sha256: e2f2302d69c0d6928d95a1c699b5ef0b14e0243e78495734962c78136d2e6b9f + md5: efb0e7909f1a41159856e688e216bd26 + sha256: c24f5fc704ee3c0737456e7a4b8f75114b25a51812c6f801a22ed43652e0b211 manager: conda name: verilator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/verilator-4.226-he0ac6c6_1.tar.bz2 - version: '4.226' + url: https://conda.anaconda.org/conda-forge/linux-64/verilator-5.008-h514fc35_1.conda + version: '5.008' - category: main dependencies: python: '' @@ -3428,19 +3399,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda version: 3.15.0 -- category: main - dependencies: - python: '>=3.6' - typing_extensions: '>=4.0' - hash: - md5: 59c40397276a286241c65faec5e1be3c - sha256: be2dbd6710438fa48b83bf06841091227276ae545d145dfe5cb5149c6484e951 - manager: conda - name: aioitertools - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aioitertools-0.11.0-pyhd8ed1ab_0.tar.bz2 - version: 0.11.0 - category: main dependencies: frozenlist: '>=1.1.0' @@ -3512,35 +3470,19 @@ package: version: 1.15.1 - category: main dependencies: - libclang-cpp15: '>=15.0.7,<15.1.0a0' + libclang-cpp16: '>=16.0.3,<16.1.0a0' libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' - hash: - md5: d2fcc7c0381194ca6fcb38a6d06255b8 - sha256: eee53b98b40099c9289a732f6c915f9c80714d8a7a8a977f921c0782c6f5200f - manager: conda - name: clang-format-15 - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15-15.0.7-default_had23c3d_1.conda - version: 15.0.7 -- category: main - dependencies: - libclang-cpp16: '>=16.0.1,<16.1.0a0' - libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: cc2343dad8afb0b3d9cc368da2d58e22 - sha256: a3ae4c803ff00cdf74984c02ac8279e39861bb4aad16854c18a81792936714ac + md5: 14a18f87f492a905cee3d833eae4e86b + sha256: 0896316dbdcd3dca118c61127b2d79cc0c0bdb08f869cff9f35fe2c5a4673555 manager: conda name: clang-format-16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: click: '' @@ -3723,14 +3665,14 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: ab2f9216e346f43599af3f7839931da1 - sha256: 1854da61b10c601bae3497e0d457b1bb029715d4bcabb5594199519de7c72f5a + md5: f91a5d5175fb7ff2a91952ec7da59cb9 + sha256: 33d49065756a73fbb92277c756fa00a41891408528eb90ae05ff3367a401ae6e manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.5.0-pyha770c72_0.conda - version: 6.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.6.0-pyha770c72_0.conda + version: 6.6.0 - category: main dependencies: python: '>=3.7' @@ -3796,22 +3738,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/junit-xml-1.9-pyh9f0ad1d_0.tar.bz2 version: '1.9' -- category: main - dependencies: - libclang13: 15.0.7 default_h3e3d535_1 - libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' - hash: - md5: 36c65ed73b7c92589bd9562ef8a6023d - sha256: eba3ed760c72c992a04d86455556ecb90c0e1e3688defcac44b28a848d71651c - manager: conda - name: libclang - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_had23c3d_1.conda - version: 15.0.7 - category: main dependencies: expat: '>=2.5.0,<3.0a0' @@ -3911,14 +3837,14 @@ package: setuptools: '' wheel: '' hash: - md5: 9ccbacfd1cbfa0be00cc345fe5ad8816 - sha256: 781992f04a8c765b1ad29b54fc9f76c12b0864f9defd2869eeb5edff15b51546 + md5: 7288da0d36821349cf1126e8670292df + sha256: 4fe1f47f6eac5b2635a622b6f985640bf835843c1d8d7ccbbae0f7d27cadec92 manager: conda name: pip optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pip-23.1-pyhd8ed1ab_0.conda - version: '23.1' + url: https://conda.anaconda.org/conda-forge/noarch/pip-23.1.2-pyhd8ed1ab_0.conda + version: 23.1.2 - category: main dependencies: python: '>=3.6' @@ -3972,27 +3898,14 @@ package: ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: b64be7a2bbc2acc61c1a2161512387c2 - sha256: 1dd205a1ab9897482804b5ef3f2a1cea44f01e831d1bcff439d1e0894ab0e4a9 + md5: 522b3d9f069af18d947bd43b57817ba0 + sha256: f1deff6ee893729e4c1b1005a60fea55907bbdbca2d3c88263ac65ff3ea25c55 manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.21-py39h72bdee0_3.conda - version: 0.17.21 -- category: main - dependencies: - python: '>=3.7' - typing: '>=3.7,<4.0' - hash: - md5: 547d15e217a398578900787bf39ef01d - sha256: fd3747a968670b3db2e017102860d2087d193fdd99ebd17c6496ff4ec9287a5b - manager: conda - name: tomlkit - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda - version: 0.11.7 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.25-py39hd1e30aa_0.conda + version: 0.17.25 - category: main dependencies: colorama: '' @@ -4011,14 +3924,14 @@ package: python: '>=3.6' types-urllib3: <1.27 hash: - md5: 856c0ae2398368dba2555354564d5228 - sha256: caacc1f5c91c39754611cd74cdc3b34a87efa5963d38c937fc927960586c18dd + md5: 1ab2e9a47f24fac257f88956828f1956 + sha256: 19d2affb4d3fab4d1d60eb3748b2d80b9ff2983c9b196e74aae7a0dc03fe74d8 manager: conda name: types-requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.28.11.17-pyhd8ed1ab_0.conda - version: 2.28.11.17 + url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.30.0.0-pyhd8ed1ab_0.conda + version: 2.30.0.0 - category: main dependencies: typing_extensions: 4.5.0 pyha770c72_0 @@ -4043,27 +3956,27 @@ package: xorg-libx11: '>=1.8.4,<2.0a0' xorg-libxt: '' hash: - md5: ca45b0fdb2b4e9bad3b0378836f35e18 - sha256: 26df25d45800d8f40f292c0d44f9bbb614deddab9fd4ff7d509a24c48061118e + md5: da1ade321e40a910685104d9120c8d5c + sha256: a8d77a8e2f416a94f74a4acfe3d92b7f6685a4aec6f5e700dbd209925fe859e7 manager: conda name: vim optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.1425-py39pl5321h1c21089_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.1425-py39pl5321hb4338c2_0.conda version: 9.0.1425 - category: main dependencies: markupsafe: '>=2.1.1' - python: '>=3.7' + python: '>=3.8' hash: - md5: 94dea682ba9d8e091e1f46872886fb1f - sha256: 38f68541580b74ed91396a67766fb96088f7b161bfd203675ed7a257d642e2e3 + md5: 23ddbe41ab0115bc0bfb75dcbf5de7cf + sha256: 2df1970270839b36e13a4ba7e4b393cfa95aa1d7438909aa8c3db14170ea207c manager: conda name: werkzeug optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda - version: 2.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.3.4-pyhd8ed1ab_0.conda + version: 2.3.4 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -4088,14 +4001,14 @@ package: python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: fc75e67104cc1bdd6aa2a3b970b19f7f - sha256: 0fb71fdb26db6e49ad92a09ffd26c99145dc02eeb8e15e48fde4437b6237ea58 + md5: 38cd0735b2002777c765fa5b7f4217b5 + sha256: d9e48f222156d21817588a853efa63e84d5f2c5dedfb00df73a53857ef12ec26 manager: conda name: yarl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py39hb9d737c_0.conda - version: 1.8.2 + url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.1-py39hd1e30aa_0.conda + version: 1.9.1 - category: main dependencies: python: '>=3.6' @@ -4143,20 +4056,20 @@ package: version: 0.7.0 - category: main dependencies: - clang-format-16: 16.0.1 default_h62803fd_0 - libclang-cpp16: '>=16.0.1,<16.1.0a0' + clang-format-16: 16.0.3 default_h83cc7fd_0 + libclang-cpp16: '>=16.0.3,<16.1.0a0' libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 00d5150c0a2e28a2d32eceb23425b989 - sha256: 6205ff6e3545d6084103a9885bb173af652326c6927ac5008154ea664e3981c1 + md5: a1f13606e670bdaaee724536218f5c40 + sha256: 5eb61124b6f96015aee46217f081953cb4efee9f9d39ac7c98e76d734f384693 manager: conda name: clang-format optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: cffi: '>=1.12' @@ -4189,26 +4102,27 @@ package: version: 0.36.0 - category: main dependencies: - click: '>=8.0' + blinker: '>=1.6.2' + click: '>=8.1.3' importlib-metadata: '>=3.6.0' - itsdangerous: '>=2.0' - jinja2: '>=3.0' - python: '>=3.7' - werkzeug: '>=2.2.2' + itsdangerous: '>=2.1.2' + jinja2: '>=3.1.2' + python: '>=3.8' + werkzeug: '>=2.3.3' hash: - md5: 917e433886a05676857035483214c70c - sha256: f38a7b55f17c5ad47464d4f02455e2ba722e9e08e2c3dc8a7f9fdd82188b72d8 + md5: 816d75d4c0f2e41b5765d17498c57a2e + sha256: f93246be286f2d0f93e85c4f08f9ce48f3eed875a79225e2ea119e70c0237421 manager: conda name: flask optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/flask-2.2.3-pyhd8ed1ab_0.conda - version: 2.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/flask-2.3.2-pyhd8ed1ab_0.conda + version: 2.3.2 - category: main dependencies: curl: '' - expat: '>=2.5.0,<3.0a0' gettext: '' + libexpat: '>=2.5.0,<3.0a0' libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' @@ -4216,14 +4130,14 @@ package: pcre2: '>=10.40,<10.41.0a0' perl: 5.* hash: - md5: 06b9b63f77ee1dea0d3a0c97f839385a - sha256: 3734da309ef157024b69fb01947fa71a04dfd8ca798eba962e8575da9ebfac9a + md5: 0cb5ff348eb4c201b3b920eff851675d + sha256: 528c9fdaf799b38611276d6f676da6018da2aaf93fb5b0328c00923909e99432 manager: conda name: git optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.0-pl5321h3ca6407_1.conda - version: 2.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.1-pl5321h86e50cf_0.conda + version: 2.40.1 - category: main dependencies: gitdb: '>=4.0.1,<5' @@ -4271,16 +4185,16 @@ package: version: 5.12.0 - category: main dependencies: - importlib-metadata: '>=6.5.0,<6.5.1.0a0' + importlib-metadata: '>=6.6.0,<6.6.1.0a0' hash: - md5: 24bfc0314deeea53d54c71de2b436ed6 - sha256: 11c866dd631856dfa043ced5d85b892798a93bd5cd617bce2368a83b90b5c93d + md5: 3cbc9615f10a3d471532b83e4250b971 + sha256: 5de35d3c019d8a36e0a0deeb04a62689837bd68234a0a73a3355b860b442eca4 manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.5.0-hd8ed1ab_0.conda - version: 6.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.6.0-hd8ed1ab_0.conda + version: 6.6.0 - category: main dependencies: attrs: '>=17.4.0' @@ -4315,21 +4229,21 @@ package: dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' - numpy: '>=1.20.3,<2.0a0' + numpy: '>=1.21.6,<2.0a0' python: '>=3.9,<3.10.0a0' python-dateutil: '>=2.8.1' python-tzdata: '>=2022a' python_abi: 3.9.* *_cp39 pytz: '>=2020.1' hash: - md5: 82b63668519f28450d4a4b0f3b520461 - sha256: d08fedfc0e20ca3233da89712117a7f75381bf48426d860f37629798c1b41ef4 + md5: 85bc4d45cd98f84af0c00435fff23f67 + sha256: 49c114195ed92a7e36244259f747c87a42382629548ce40e6d9ea5b3e5570840 manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.0-py39h2ad29b5_0.conda - version: 2.0.0 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.1-py39h40cae4c_1.conda + version: 2.0.1 - category: main dependencies: pip: '' @@ -4348,14 +4262,14 @@ package: python: '>=3.7' typing-extensions: '>=4.5' hash: - md5: f10c2cf447ca96f12a326b83c75b8e33 - sha256: 51816d5471cc42059cc7a8616c8899b6fda7347999359c3979fefd0035ab274c + md5: 6c36f1c42dd0069b7f23acc74f19be46 + sha256: e6d247b9a645ac6a2e4909cbe9cfad5cf9ba1a2f4352fee7aac3acb640371a54 manager: conda name: platformdirs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda - version: 3.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.0-pyhd8ed1ab_0.conda + version: 3.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -4412,14 +4326,14 @@ package: pip: '' python: '>=3.7,<4.0' hash: - md5: fb6a4bb2c52647f4422e8a47d706ef1c - sha256: 092ddd70025bbe90042fb77bc21aa467b6181f486e7137d2c47b72f824688ea9 + md5: 8462b4f53fa7d7dc057a26d589ec71de + sha256: dc2928817ff89e3628f82f3cedd4369c84d7079d04493b33dc67e4288d1de35d manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.15-pyhd8ed1ab_0.conda - version: 0.16.15 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.17-pyhd8ed1ab_0.conda + version: 0.16.17 - category: main dependencies: cffi: '' @@ -4496,31 +4410,31 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: a2b0b88e5b4bcfdab4c03acd24667046 - sha256: 161c95587e95cedcf2587b1e666827d29c02383e4bbfdc338dfe0f8183af3747 + md5: 01961f718d29cabd188e863a61d8fd81 + sha256: 1fc8f40eb33d7e38590d88d847fb39329628c31269c8a2e5aaab7d51cc5b501f manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.115-pyhd8ed1ab_0.conda - version: 1.29.115 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.129-pyhd8ed1ab_0.conda + version: 1.29.129 - category: main dependencies: - clang-format: 16.0.1 default_h62803fd_0 - libclang-cpp16: '>=16.0.1,<16.1.0a0' - libclang13: '>=16.0.1' + clang-format: 16.0.3 default_h83cc7fd_0 + libclang-cpp16: '>=16.0.3,<16.1.0a0' + libclang13: '>=16.0.3' libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 6fa41767486e911517c03bb069b9f5fa - sha256: a0acf37ed406a66e72577d40b52185488644a9a1ce56a99823c3318f9900260b + md5: ceedc73b354682b0d63d61d654ebcd33 + sha256: b5ea9bef3e3316c34bfbde0a3a50cb53a2bf2db89221c9b145d37fc1e5c89576 manager: conda name: clang-tools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: python: '>=3.7' @@ -4553,14 +4467,14 @@ package: python: '>=3.6' ukkonen: '' hash: - md5: b8d16e273396a0115199a83769a39246 - sha256: 45cbad9e8329b33d348c536ef0c49fb1811261201072e3d536199c106562d607 + md5: a4085ab0562d5081a9333435837b538a + sha256: 4027103c59220a68b41aed056d2ce89d46e4971033d259293ca07198a8a81fdc manager: conda name: identify optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda - version: 2.5.22 + url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.24-pyhd8ed1ab_0.conda + version: 2.5.24 - category: main dependencies: importlib_metadata: '' @@ -4799,14 +4713,14 @@ package: platformdirs: <4,>=3.2 python: '>=3.8' hash: - md5: 054007ab693cb77a029ea4f1f12f34a7 - sha256: acb9f18ef811cda29690d41e0e7c54f7088d35e6b5aa5db6403d13c9eb18336a + md5: a920e114c4c2ced2280e266da65ab5e6 + sha256: 13d667887ea08b6d1fe2eb09d2d737f9af7343735d3bfa5ffaa3f67eec8eaff7 manager: conda name: virtualenv optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.22.0-pyhd8ed1ab_0.conda - version: 20.22.0 + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.23.0-pyhd8ed1ab_0.conda + version: 20.23.0 - category: main dependencies: conda-package-streaming: '>=0.7.0' @@ -4913,14 +4827,14 @@ package: pyyaml: '>=5.1' virtualenv: '>=20.10.0' hash: - md5: c4aab94cab4ddeb340e36d4c670a5f24 - sha256: 4331584fffa05cf3096799c95495ce97563699dc7c4da341e9b1ced96e4f5526 + md5: c3ad8d291556452edb6c301c91f330ed + sha256: db90abf2c06c8bace41c491e2af445d06178fa8c9111e0e2ae4738866cb929ef manager: conda name: pre-commit optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.2-pyha770c72_0.conda - version: 3.2.2 + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.1-pyha770c72_0.conda + version: 3.3.1 - category: main dependencies: __unix: '' @@ -4959,14 +4873,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: fb3a321c00c20e538fa694ea3aa56bb3 - sha256: 6cd079ddf88e9fe825e60ce4f01cacbbd5e0571f792b9c4628b77eb073bcdbf7 + md5: 7da51e7dabbb80ebe3064e9343e8e818 + sha256: 1806dfc46c9f4b51ff56575025e7e5491ee630a6be5997dd1536009585da4c4c manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.116-pyhd8ed1ab_0.conda - version: 1.29.116 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.131-pyhd8ed1ab_0.conda + version: 1.29.131 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4980,8 +4894,8 @@ package: libexpat: '>=2.5.0,<3.0a0' libgcc-ng: '>=12' libgd: '>=2.3.3,<2.4.0a0' - libglib: '>=2.76.1,<3.0a0' - librsvg: '>=2.54.4,<3.0a0' + libglib: '>=2.76.2,<3.0a0' + librsvg: '>=2.56.0,<3.0a0' libstdcxx-ng: '>=12' libtool: '' libwebp-base: '>=1.3.0,<2.0a0' @@ -4989,46 +4903,30 @@ package: pango: '>=1.50.14,<2.0a0' zlib: '' hash: - md5: 09c3cfc5ec50aef65f67c5f1bde535c6 - sha256: 9da43e1550de05f9e56d0b1d452d9567d9156e3fbcba0e0291ff458300bb70b4 + md5: 597e2d0e1c6bc2e4457714ff479fe142 + sha256: 4bfb42de2d28406666ef6729169cae3f49c216c5ebd9f34afa40223755e2aaf8 manager: conda name: graphviz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/graphviz-8.0.3-h2e5815a_0.conda - version: 8.0.3 + url: https://conda.anaconda.org/conda-forge/linux-64/graphviz-8.0.5-h28d9a01_0.conda + version: 8.0.5 - category: main dependencies: certifi: '>=2017.4.17' charset-normalizer: '>=2,<4' idna: '>=2.5,<4' - python: '>=3.7,<4.0' + python: '>=3.7' urllib3: '>=1.21.1,<1.27' hash: - md5: 3bfbd6ead1d7299ed46dab3a7bf0bc8c - sha256: 9a7c3410970217fa035cca7f72c175989e1c8b22f855b852b9d5fde07c3550dd + md5: 5fa992d972fbccfc069161805122cb8d + sha256: bd06a6603104050fc9c4fd9bf3de7b28bbb6b9ce4b33130519d8611488213f67 manager: conda name: requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_1.conda - version: 2.28.2 -- category: main - dependencies: - aiohttp: '>=3.3.1' - aioitertools: '>=0.5.1' - botocore: '>=1.27.59,<1.27.60' - python: '>=3.6' - wrapt: '>=1.10.10' - hash: - md5: a3f48ea10883a5df371b895008b1ca4b - sha256: 76068553358b26c9c03be992cbe982a369d1e015a53700f092db92c784ce98a9 - manager: conda - name: aiobotocore - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aiobotocore-2.4.2-pyhd8ed1ab_0.conda - version: 2.4.2 + url: https://conda.anaconda.org/conda-forge/noarch/requests-2.29.0-pyhd8ed1ab_0.conda + version: 2.29.0 - category: main dependencies: botocore: '>=1.11.3' @@ -5104,14 +5002,14 @@ package: urllib3: '>=1.26.0' websocket-client: '>=0.32.0' hash: - md5: 8b0d1b5227ce39053aa69c3ff18417ec - sha256: 45e16e6f7e4105c71c1494ca523b01e676349a25ee1f8114a6c10bbdd8549d50 + md5: 543336c6aa9516cfb29c51d5c162b177 + sha256: 5e01e15e20ee573c99b530633a0d5c71fd515e4ac6d2f5f5f57baece8b915cc3 manager: conda name: docker-py optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.0.0-pyhd8ed1ab_0.tar.bz2 - version: 6.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.1.0-pyhd8ed1ab_0.conda + version: 6.1.0 - category: main dependencies: appdirs: '' @@ -5175,14 +5073,14 @@ package: botocore: '>=1.12.36,<2.0a.0' python: '>=3.7' hash: - md5: 900e74d8547fbea3af028937df28ed77 - sha256: 0e459ed32b00e96b62c2ab7e2dba0135c73fd980120fe1a7bd49901f2d50760f + md5: b19a857ac845097e9c823c9f4d35f80e + sha256: 99512bf4f4e297cc7565c94eee8ccc908411f836b341668e2b5d064273e21762 manager: conda name: s3transfer optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.6.0-pyhd8ed1ab_0.tar.bz2 - version: 0.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.6.1-pyhd8ed1ab_0.conda + version: 0.6.1 - category: main dependencies: alabaster: '>=0.7,<0.8' @@ -5214,7 +5112,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.116 + botocore: 1.29.131 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.9,<3.10.0a0' @@ -5223,29 +5121,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 7ff7995ef5ae66e3f40ecf8715f94af9 - sha256: 075259e8d6df02f58a7d4b0a981ea0713936de293758f77d874dfaead449ad55 + md5: 06f90a852ccad1f28aefe0216299b50a + sha256: e26260e3439d5a1b350fe9b244230c0ed2356a4ee873ddbb59a1f2cfa839b627 manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.116-py39hf3d152e_0.conda - version: 1.27.116 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.131-py39hf3d152e_0.conda + version: 1.27.131 - category: main dependencies: - botocore: '>=1.29.116,<1.30.0' + botocore: '>=1.29.131,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 858c31f9e605c623871cb7521e37c926 - sha256: c834aa58f41881ebf642da868008dfbe64b4868d4dcf8b91c57b52fcadccec3b + md5: f51fe6d09662dc8ec9672be8567b7430 + sha256: 888fa362ba6db8b881a200539c1cc4379379ec1937168e5e475245fa1a3544c7 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.116-pyhd8ed1ab_0.conda - version: 1.26.116 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.131-pyhd8ed1ab_0.conda + version: 1.26.131 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5371,14 +5269,14 @@ package: python: '' typing_extensions: '' hash: - md5: cfd95e43a27c0af1a206f7557d7f132e - sha256: 02570a9062717ec9b3293199ab8e8983c92f2320f5f8066ef541929a1166d9f1 + md5: da03042814034e36f0938058b7b218fb + sha256: d18385d39e4af117b99cbd931cb68cbd33582949a837ae4e6453964ecc64d80a manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.117-pyhd8ed1ab_0.conda - version: 1.26.117 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.130-pyhd8ed1ab_0.conda + version: 1.26.130 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5419,28 +5317,28 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: cfc72b1b83d1b8503b1071455534ebac - sha256: 1df5aa62e1fc8d498a37f30723d15a1626dc9b686603e79b4b44ba6c95f8f659 + md5: adb30ee4ef9f506b62f732c8a78d250b + sha256: 281ba68f92f05626bf37df32156abbf62e6ed963ab40b2205277a066391cc06f manager: conda name: mypy-boto3-s3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.116-pyhd8ed1ab_0.conda - version: 1.26.116 + url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.127-pyhd8ed1ab_0.conda + version: 1.26.127 - category: main dependencies: boto3: '' python: '>=3.6' typing-extensions: '' hash: - md5: 93e899cf501d962cfd1b251a45416825 - sha256: ef57856f4313eac453b53a119cedf121bd16fc98c64beaee8e3309959673daea + md5: 35a0dc87b7ff0abd9e3012bea164f439 + sha256: 706be4a8f070af47d29e18315c3053977315c1c58479ecfebb2443d3a72edf87 manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.106-pyhd8ed1ab_0.conda - version: 1.26.106 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.129-pyhd8ed1ab_0.conda + version: 1.26.129 - category: main dependencies: boto3: '' @@ -5519,24 +5417,24 @@ package: werkzeug: '>=0.5,!=2.2.0,!=2.2.1' xmltodict: '' hash: - md5: c4172149b03b032cd60cc79f1484a1dd - sha256: 5891a5ce23d274406bda81e202ddc303d30a3355c01c7d9ae461fc5313247e9d + md5: 89dfb6776dcc992a100cafd0c612b7fb + sha256: f5de61e07e99798c0f73947fae9f947a4eb7aeff7adc04e78b9a9a3ef2ddc780 manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.7-pyhd8ed1ab_2.conda - version: 4.1.7 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.9-pyhd8ed1ab_0.conda + version: 4.1.9 - category: main dependencies: {} hash: - sha256: c41cfb1e99ba5d341fbcc5308836e7d7c9786d302f995b2c271ce2144dece9eb + sha256: 0e0bc5ba78b8db3667ad636d964eb963dc97a59f04c6f6214c5f0e4a8f726c56 manager: pip name: mock optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/e6/88/8a05e7ad0bb823246b2add3d2e97f990c41c71a40762c8db77a4bd78eedf/mock-5.0.1-py3-none-any.whl - version: 5.0.1 + url: https://files.pythonhosted.org/packages/27/6f/fbb16f260a7107ee98871d83f6793d88c4311b7189b10ef239da0b2181db/mock-5.0.2-py3-none-any.whl + version: 5.0.2 - dependencies: {} hash: sha256: 40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0 @@ -5581,15 +5479,15 @@ package: version: 2.8.10 - category: main dependencies: - ruamel.yaml.clib: '>=0.2.6' + ruamel.yaml.clib: '>=0.2.7' hash: - sha256: 742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 + sha256: 25d0ee82a0a9a6f44683dcf8c282340def4074a4562f3a24f55695bb254c1693 manager: pip name: ruamel.yaml optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl - version: 0.17.21 + url: https://files.pythonhosted.org/packages/23/33/dbc62343de0cf92e0f9c15bc0a287bdaea0953f1cadca0480c78d5ac6641/ruamel.yaml-0.17.26-py3-none-any.whl + version: 0.17.26 - category: main dependencies: mock: '*' diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml index 1fbce68b..22681575 100644 --- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml +++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml @@ -9,7 +9,7 @@ # To update a single package to the latest version compatible with the version constraints in the source: # conda-lock lock --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,12 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 3d155013008436d15b7f1d8d02c2aa15cfa96a5619d70b0a018c7ff253303935 + linux-64: 92c3e7798f0b770b5c7c3ccb9bb821f7aca74819a9dba397e47d752af976b25f platforms: - linux-64 sources: - - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml - - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml + - /scratch/abejgonza/cy/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -42,13 +42,13 @@ package: - category: main dependencies: {} hash: - md5: a581b4a89191b6c1d6a16488a9cffbfc - sha256: 695e67ae4bc22f9e0be5f54b1948a8f2b678f4da920fa2082a249dd5a88f440e + md5: f6ce7955b53ae1ca83144adb3be9c600 + sha256: 546e4eb1cbd822a66b363ec3fbdcc4fcc53853bcab57674cb46b8f3209b856f2 manager: conda name: _sysroot_linux-64_curr_repodata_hack optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/_sysroot_linux-64_curr_repodata_hack-3-h5bd9786_13.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/_sysroot_linux-64_curr_repodata_hack-3-h69a702a_13.conda version: '3' - category: main dependencies: {} @@ -64,14 +64,14 @@ package: - category: main dependencies: {} hash: - md5: ff9f73d45c4a07d6f424495288a26080 - sha256: 8f6c81b0637771ae0ea73dc03a6d30bec3326ba3927f2a7b91931aa2d59b1789 + md5: f5c65075fc34438d5b456c7f3f5ab695 + sha256: 0cf1bb3d0bfc5519b60af2c360fa4888fb838e1476b1e0f65b9dbc48b45c7345 manager: conda name: ca-certificates optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda - version: 2022.12.7 + url: https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2023.5.7-hbcca054_0.conda + version: 2023.5.7 - category: main dependencies: {} hash: @@ -526,18 +526,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/icu-72.1-hcb278e6_0.conda version: '72.1' -- category: main - dependencies: - libgcc-ng: '>=12' - hash: - md5: c7a069243e1fbe9a556ed2ec030e6407 - sha256: 8f73194d09c9ea4a7e2b3562766b8d72125cc147b62c7cf83393e3a3bbfd581b - manager: conda - name: jpeg - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h0b41bf4_3.conda - version: 9e - category: main dependencies: libgcc-ng: '>=10.3.0' @@ -883,13 +871,13 @@ package: ca-certificates: '' libgcc-ng: '>=12' hash: - md5: 2d833be81a21128e317325a01326d36f - sha256: d378afcec34b86fef4da3ebd622b3e614cb3f71e54b6a5a10adb1d23745ecc72 + md5: 8f24d371ed9efb3f0b0de383fb81d51c + sha256: 24bf6cf8f741c28a8d10f51c917f378694d4a98a38ab4372629932cd6c94e9e8 manager: conda name: openssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-hd590300_3.conda version: 3.1.0 - category: main dependencies: @@ -1358,14 +1346,14 @@ package: libgcc-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 2e5f9a37d487e1019fd4d8113adb2f9f - sha256: 6008a0b914bd1a3510a3dba38eada93aa0349ebca3a21e5fa276833c8205bf49 + md5: 1d002bf709048f8021c32abfd0e0d395 + sha256: bb2a8ddb26e74f2cedc36825fc6f95d45f19e1912a1a6c75847952d92fc16215 manager: conda name: libsqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.40.0-h753d276_0.tar.bz2 - version: 3.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.41.2-h2797004_1.conda + version: 3.41.2 - category: main dependencies: libgcc-ng: '>=12' @@ -1709,13 +1697,13 @@ package: dependencies: gcc_impl_linux-64: 12.2.0.* hash: - md5: c241b4f6676222c2feefc9dc4b9d1728 - sha256: f4b4184cc3e0864abadfc5b06ae869b479e736ff1dc46723967256d11b5bc7c4 + md5: ec93d13e0fe8514f65842120dbae1b16 + sha256: 5478f5b7672b6c2d5b644aaa9fe18fbb1468ca6ea9cea1b0f0a2254459438e24 manager: conda name: gcc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_12.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_13.conda version: 12.2.0 - category: main dependencies: @@ -1806,14 +1794,14 @@ package: libzlib: '>=1.2.13,<1.3.0a0' pcre2: '>=10.40,<10.41.0a0' hash: - md5: 984fc0159591041a411d96718e7073d0 - sha256: afac276054c6fc2959347e7e1da211554f5cc4efbdda6d1f29b6d98919eae833 + md5: db1d4a1dfc04f3eab50d97551850759a + sha256: e0d54ffe98b7471cfc95f043bf3921412843c05ba5f1f10ceeac5edb328ac928 manager: conda name: libglib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.1-ha491796_0.conda - version: 2.76.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.2-hebfc3b9_0.conda + version: 2.76.2 - category: main dependencies: libblas: 3.9.0 16_linux64_openblas @@ -1830,34 +1818,18 @@ package: dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' - libxml2: '>=2.10.3,<2.11.0a0' + libxml2: '>=2.10.4,<2.11.0a0' libzlib: '>=1.2.13,<1.3.0a0' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 17d91085ccf5934ce652cb448d0cb65a - sha256: f649fac60cb122bf0d85c4955725d94c353fdbd768bcd44f0444979b363cc9ab - manager: conda - name: libllvm15 - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_1.conda - version: 15.0.7 -- category: main - dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - libxml2: '>=2.10.3,<2.11.0a0' - libzlib: '>=1.2.13,<1.3.0a0' - zstd: '>=1.5.2,<1.6.0a0' - hash: - md5: 716f4c806c384ee7bf1647814516c241 - sha256: 95a7e646c035b2515c69af0c47acf1840557160123f8ee6441d8b0f254098342 + md5: 3d942f062d7656168bb42b3439bdfede + sha256: c52c239b583a1b2d03bdc641afd8cbab0499b0a46ea55b40e1dbed112283a772 manager: conda name: libllvm16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm16-16.0.1-hadd5161_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libllvm16-16.0.3-hbf9e925_1.conda + version: 16.0.3 - category: main dependencies: lerc: '>=4.0.0,<5.0a0' @@ -1957,19 +1929,19 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libsqlite: 3.40.0 h753d276_0 + libsqlite: 3.41.2 h2797004_1 libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' - readline: '>=8.1.2,<9.0a0' + readline: '>=8.2,<9.0a0' hash: - md5: bb11803129cbbb53ed56f9506ff74145 - sha256: baf0e77938e5215653aa6609ff154cb94aeb0a08083ff8dec2d3ba8dd62263e9 + md5: c8771266cc289756099c04e597209862 + sha256: 2674e5b0888799ad055bdbc79e2257d67f52b0c11f4c174d4deff4b69874cf45 manager: conda name: sqlite optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.40.0-h4ff8645_0.tar.bz2 - version: 3.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.41.2-h2c6b66d_1.conda + version: 3.41.2 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -2028,16 +2000,16 @@ package: version: 1.4.4 - category: main dependencies: - python: '>=3.6' + python: '>=3.7' hash: - md5: 99b19895abe40280358488acb9589532 - sha256: 2b273efc522834e4c8563da7998b9b683eed467660fe8a5a3c24d58aaa85a9cb + md5: 0b3460f5bf4ae27dfd72fdcccc9667a9 + sha256: 18aad01518cb08e4eff18e507e14ebf6c522d89ef53ca267c48080933c4435f7 manager: conda name: argcomplete optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.5-pyhd8ed1ab_0.conda - version: 3.0.5 + url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.8-pyhd8ed1ab_0.conda + version: 3.0.8 - category: main dependencies: libgcc-ng: '>=12' @@ -2054,16 +2026,28 @@ package: version: 2.38.0 - category: main dependencies: - python: '>=3.5' + python: '>=3.7' hash: - md5: 8b76db7818a4e401ed4486c4c1635cd9 - sha256: 3a58d4a4933fa8735471c782d35326ab78e0bcfce84756408515f82a94e4dec4 + md5: 3edfead7cedd1ab4400a6c588f3e75f8 + sha256: 063639cd568f5c7a557b0fb1cc27f098598c0d8ff869088bfeb82934674f8821 manager: conda name: attrs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda - version: 22.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/attrs-23.1.0-pyh71513ae_1.conda + version: 23.1.0 +- category: main + dependencies: + python: '>=3.7' + hash: + md5: 2fb79ec81bad9492b6d59a06b3b647a4 + sha256: b6f32491536823e47cf6eb4717dd341385600a2b901235028dedc629a77aeb82 + manager: conda + name: blinker + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/blinker-1.6.2-pyhd8ed1ab_0.conda + version: 1.6.2 - category: main dependencies: brotli-bin: 1.0.9 h166bdaf_8 @@ -2095,14 +2079,14 @@ package: dependencies: python: '>=3.7' hash: - md5: fb9addc3db06e56abe03e0e9f21a63e6 - sha256: 5e22af4776700200fab2c1df41a2188ab9cfe90a50c4f388592bb978562c88ec + md5: 5d1b71c942b8421285934dad1d891ebc + sha256: f839a6e04d94069f90dd85337ea9108f058dc76771bb469a413f32bb1ba0b256 manager: conda name: certifi optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda - version: 2022.12.7 + url: https://conda.anaconda.org/conda-forge/noarch/certifi-2023.5.7-pyhd8ed1ab_0.conda + version: 2023.5.7 - category: main dependencies: python: '>=3.6.1' @@ -2129,16 +2113,16 @@ package: version: 2.1.1 - category: main dependencies: - __unix: '' - python: '>=3.8' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 20e4087407c7cb04a40817114b333dbf - sha256: 23676470b591b100393bb0f6c46fe10624dcbefc696a6a9f42932ed8816ef0ea + md5: 9bb8d28c0899d583a062c17b15ee3e89 + sha256: 550b1266fed8a3bbfc2e7d5cbe646668aca5b5f1c3b4ac9a17ca2d215d06785a manager: conda name: click optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/click-8.1.3-py310hff52083_1.tar.bz2 version: 8.1.3 - category: main dependencies: @@ -2285,14 +2269,14 @@ package: dependencies: python: '>=3.8' hash: - md5: a993e42df87a292d8fd7396a2e2a8d75 - sha256: c2a5db01537aae91a54dbd163b85421de2b623c75803af4e38ea01ba000317d1 + md5: 20edd290b319aa0eff3e9055375756dc + sha256: cbb5c77c0217cda9bf4f4240158de11822a099a6eaa05ba626e822819a54f46d manager: conda name: fsspec optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.4.0-pyh1a96a4e_0.conda - version: 2023.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.5.0-pyh1a96a4e_0.conda + version: 2023.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -2346,13 +2330,13 @@ package: gcc: 12.2.0.* gxx_impl_linux-64: 12.2.0.* hash: - md5: 56e0d282569b6cd349035a1bb5efae47 - sha256: b428f0af395194cb327fb212167efc3a837866d11b9f1a8bbad7e953c595c6cb + md5: de605ff437f3fdc010f1b529642339f1 + sha256: 58bc0a7ff843c4ac2fd53b1370d266d635b59cf8d1d6f165cc26cf1f5324c9f8 manager: conda name: gxx optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_12.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_13.conda version: 12.2.0 - category: main dependencies: @@ -2495,46 +2479,31 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' - hash: - md5: 276ec1f956a520363016f909ec166f65 - sha256: 48c0820ba1fe5701d11a5b7967a2c93d73607741a20e511214ece7fec7b9dc7f - manager: conda - name: libclang-cpp15 - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp15-15.0.7-default_had23c3d_1.conda - version: 15.0.7 -- category: main - dependencies: - libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 2c00ecf8081a8f23043b055a68d7ba90 - sha256: 5f3eb78832674b8038dd65c80d09837a01f3300bf516370fc16650f33b8b87ed + md5: 205aca93c1bc4a0bc663dd787c224025 + sha256: 66e0e925088acbc1306c814ca8441e61dd2f2a2ff93ff752b914939b87864d24 manager: conda name: libclang-cpp16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libclang-cpp16-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 48c2eb0c9988c76ad34c47910fee3077 - sha256: aa4a685e98221cee06b6de93c9ac8efc329c648fdbbffbdd02f41cb1d228b3d8 + md5: e0f95087543b73c7bc2689f0aeb86a6d + sha256: 40c7a6ebfe181b3683fa4c0a378ff25eca1a77d68c35578b9c237dd58c4d458d manager: conda name: libclang13 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.1-default_h9b593c0_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_hd781213_0.conda + version: 16.0.3 - category: main dependencies: krb5: '>=1.20.1,<1.21.0a0' @@ -2723,14 +2692,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: b7085457309e206174b8e234d90a7605 - sha256: d2c58f7f9a0c023c5fe130ef781e0d77b3717cc5f78587fe97b9a57635e2a93d + md5: 844b150744d30f256d7937f3f60fcd2f + sha256: d531c8dcbecb2d47d26fcafce00dd244bfb4fdc787eddea40e61b5b57b0e5da2 manager: conda name: numpy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py310h8deb116_0.conda - version: 1.24.2 + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.3-py310ha4c1d20_0.conda + version: 1.24.3 - category: main dependencies: libgcc-ng: '>=12' @@ -2785,15 +2754,16 @@ package: version: 1.9.6 - category: main dependencies: - python: '>=3.8' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 7d301a0d25f424d96175f810935f0da9 - sha256: c25e1757e4e90638bb1e778aba3ee5f3c01fae9752e3c3929f9be7d367f6c7f3 + md5: 02e428ab589e3cefe070352c905cefec + sha256: 28967130059ac29a1298de5f4555c0ec6344ea56e32642c44f40c19d83f38162 manager: conda name: pluggy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pluggy-1.0.0-py310hff52083_4.tar.bz2 version: 1.0.0 - category: main dependencies: @@ -2876,14 +2846,14 @@ package: dependencies: python: '>=3.6' hash: - md5: 56d08bbebf5b3719ca2b1688fcfd98a4 - sha256: 177ce344fc9668cc1e7daa637ef375f6765e60fbb52e83a5744a0513751200aa + md5: 99e28be5a278e2319834d7dc99e7bfdd + sha256: f3a64306fa0f405f10f4108d7ff42043d6fd393f940f9e98e395a3756687fc98 manager: conda name: pyjwt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2 - version: 2.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.7.0-pyhd8ed1ab_0.conda + version: 2.7.0 - category: main dependencies: python: '>=3.3' @@ -2924,16 +2894,16 @@ package: version: 0.19.3 - category: main dependencies: - __unix: '' - python: '>=3.8' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 2a7de29fb590ca14b5243c4c812c8025 - sha256: a42f826e958a8d22e65b3394f437af7332610e43ee313393d1cf143f0a2d274b + md5: 378f2260e871f3ea46c6fa58d9f05277 + sha256: cb6e4821234cee05acd1996cef88e40dfc2d5ab12cf12c5b1d6ed9118f7f41a7 manager: conda name: pysocks optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py310hff52083_5.tar.bz2 version: 1.7.1 - category: main dependencies: @@ -3039,14 +3009,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 6c443cccff3daa3d83b2b807b0a298ce - sha256: 6595024174d318848468c0e61899ff3c2f08a3545c85727b9a2871d6f8d0062a + md5: 3b68bc43ec6baa48f7354a446267eefe + sha256: 3ac44771fce01f19218bcdf3992e24984748048db69889a9df65abcc6a10e29b manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.1-pyhd8ed1ab_0.conda - version: 67.6.1 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.7.2-pyhd8ed1ab_0.conda + version: 67.7.2 - category: main dependencies: python: '' @@ -3179,6 +3149,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2 version: 2.0.1 +- category: main + dependencies: + python: '>=3.7' + hash: + md5: 75838e8556166263a82038b51d01d5f1 + sha256: 3002e87338a98ba501fbf53981f8267b2def2548265a3622d403d06747872ccd + manager: conda + name: tomlkit + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.8-pyha770c72_0.conda + version: 0.11.8 - category: main dependencies: python: '>=3.5' @@ -3233,26 +3215,14 @@ package: dependencies: python: '>=3.6' hash: - md5: 1c44c106ac42fde5774d31e37220f4df - sha256: b9df570c65f14a002a3972bf9e9ed0c0ef8ff6a29087ba8d6be6493bfd1ea8ef + md5: 8b7a7a28f8a274b98f0387c13c56c94c + sha256: e07d313a9c7aa2dfe425ca5a3bdc65cd015a8819cda8e576edb3b3a47535da1a manager: conda name: types-urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.10-pyhd8ed1ab_0.conda - version: 1.26.25.10 -- category: main - dependencies: - python: '>=3' - hash: - md5: e6573ac68718f17b9d4f5c8eda3190f2 - sha256: ec1cfe0b7dc55a22223562cad799e0b16d122dab611c9923b6068d27a784ba2f - manager: conda - name: typing - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2 - version: 3.10.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.12-pyhd8ed1ab_0.conda + version: 1.26.25.12 - category: main dependencies: python: '>=3.7' @@ -3285,18 +3255,19 @@ package: gxx_impl_linux-64: '' libgcc-ng: '>=12' libstdcxx-ng: '>=12' - libzlib: '>=1.2.12,<1.3.0a0' + libzlib: '>=1.2.13,<1.3.0a0' make: '' perl: '' + python: '' hash: - md5: 41af6df1758bae89161daf268566384e - sha256: e2f2302d69c0d6928d95a1c699b5ef0b14e0243e78495734962c78136d2e6b9f + md5: efb0e7909f1a41159856e688e216bd26 + sha256: c24f5fc704ee3c0737456e7a4b8f75114b25a51812c6f801a22ed43652e0b211 manager: conda name: verilator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/verilator-4.226-he0ac6c6_1.tar.bz2 - version: '4.226' + url: https://conda.anaconda.org/conda-forge/linux-64/verilator-5.008-h514fc35_1.conda + version: '5.008' - category: main dependencies: python: '' @@ -3430,19 +3401,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda version: 3.15.0 -- category: main - dependencies: - python: '>=3.6' - typing_extensions: '>=4.0' - hash: - md5: 59c40397276a286241c65faec5e1be3c - sha256: be2dbd6710438fa48b83bf06841091227276ae545d145dfe5cb5149c6484e951 - manager: conda - name: aioitertools - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aioitertools-0.11.0-pyhd8ed1ab_0.tar.bz2 - version: 0.11.0 - category: main dependencies: frozenlist: '>=1.1.0' @@ -3514,35 +3472,19 @@ package: version: 1.15.1 - category: main dependencies: - libclang-cpp15: '>=15.0.7,<15.1.0a0' + libclang-cpp16: '>=16.0.3,<16.1.0a0' libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' - hash: - md5: d2fcc7c0381194ca6fcb38a6d06255b8 - sha256: eee53b98b40099c9289a732f6c915f9c80714d8a7a8a977f921c0782c6f5200f - manager: conda - name: clang-format-15 - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15-15.0.7-default_had23c3d_1.conda - version: 15.0.7 -- category: main - dependencies: - libclang-cpp16: '>=16.0.1,<16.1.0a0' - libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: cc2343dad8afb0b3d9cc368da2d58e22 - sha256: a3ae4c803ff00cdf74984c02ac8279e39861bb4aad16854c18a81792936714ac + md5: 14a18f87f492a905cee3d833eae4e86b + sha256: 0896316dbdcd3dca118c61127b2d79cc0c0bdb08f869cff9f35fe2c5a4673555 manager: conda name: clang-format-16 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: click: '' @@ -3725,14 +3667,14 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: ab2f9216e346f43599af3f7839931da1 - sha256: 1854da61b10c601bae3497e0d457b1bb029715d4bcabb5594199519de7c72f5a + md5: f91a5d5175fb7ff2a91952ec7da59cb9 + sha256: 33d49065756a73fbb92277c756fa00a41891408528eb90ae05ff3367a401ae6e manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.5.0-pyha770c72_0.conda - version: 6.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.6.0-pyha770c72_0.conda + version: 6.6.0 - category: main dependencies: more-itertools: '' @@ -3785,22 +3727,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/junit-xml-1.9-pyh9f0ad1d_0.tar.bz2 version: '1.9' -- category: main - dependencies: - libclang13: 15.0.7 default_h3e3d535_1 - libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' - hash: - md5: 36c65ed73b7c92589bd9562ef8a6023d - sha256: eba3ed760c72c992a04d86455556ecb90c0e1e3688defcac44b28a848d71651c - manager: conda - name: libclang - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang-15.0.7-default_had23c3d_1.conda - version: 15.0.7 - category: main dependencies: expat: '>=2.5.0,<3.0a0' @@ -3900,14 +3826,14 @@ package: setuptools: '' wheel: '' hash: - md5: 9ccbacfd1cbfa0be00cc345fe5ad8816 - sha256: 781992f04a8c765b1ad29b54fc9f76c12b0864f9defd2869eeb5edff15b51546 + md5: 7288da0d36821349cf1126e8670292df + sha256: 4fe1f47f6eac5b2635a622b6f985640bf835843c1d8d7ccbbae0f7d27cadec92 manager: conda name: pip optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pip-23.1-pyhd8ed1ab_0.conda - version: '23.1' + url: https://conda.anaconda.org/conda-forge/noarch/pip-23.1.2-pyhd8ed1ab_0.conda + version: 23.1.2 - category: main dependencies: python: '>=3.6' @@ -3961,27 +3887,14 @@ package: ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: 97204ae92b703d74a983db0e6d07d009 - sha256: 2e390037976718f762b8db6703aadeb950fe4c409c64a7e5985157cbb2d58d52 + md5: 475a6b5d3a01fc0d7d494ccd94db0b1d + sha256: 90ea9bbd357fa206ac07623f57d990adb318a43bc402a85d31bcb907552e2b5e manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.21-py310h1fa729e_3.conda - version: 0.17.21 -- category: main - dependencies: - python: '>=3.7' - typing: '>=3.7,<4.0' - hash: - md5: 547d15e217a398578900787bf39ef01d - sha256: fd3747a968670b3db2e017102860d2087d193fdd99ebd17c6496ff4ec9287a5b - manager: conda - name: tomlkit - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda - version: 0.11.7 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.25-py310h2372a71_0.conda + version: 0.17.25 - category: main dependencies: colorama: '' @@ -4000,14 +3913,14 @@ package: python: '>=3.6' types-urllib3: <1.27 hash: - md5: 856c0ae2398368dba2555354564d5228 - sha256: caacc1f5c91c39754611cd74cdc3b34a87efa5963d38c937fc927960586c18dd + md5: 1ab2e9a47f24fac257f88956828f1956 + sha256: 19d2affb4d3fab4d1d60eb3748b2d80b9ff2983c9b196e74aae7a0dc03fe74d8 manager: conda name: types-requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.28.11.17-pyhd8ed1ab_0.conda - version: 2.28.11.17 + url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.30.0.0-pyhd8ed1ab_0.conda + version: 2.30.0.0 - category: main dependencies: typing_extensions: 4.5.0 pyha770c72_0 @@ -4032,27 +3945,27 @@ package: xorg-libx11: '>=1.8.4,<2.0a0' xorg-libxt: '' hash: - md5: 895f3629b577b0581598259037f40f2a - sha256: b208a6e91286a20c7ea0b21c15c56092051db953004efd20efed6e5624d360ca + md5: e7f0a31678b40de1586967a9087cca8b + sha256: f996584fc8c85e11d9caf7554b0c857060498e5dc6ba608d0551b14b67ccaa1d manager: conda name: vim optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.1425-py310pl5321he38944a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.1425-py310pl5321he660f0e_0.conda version: 9.0.1425 - category: main dependencies: markupsafe: '>=2.1.1' - python: '>=3.7' + python: '>=3.8' hash: - md5: 94dea682ba9d8e091e1f46872886fb1f - sha256: 38f68541580b74ed91396a67766fb96088f7b161bfd203675ed7a257d642e2e3 + md5: 23ddbe41ab0115bc0bfb75dcbf5de7cf + sha256: 2df1970270839b36e13a4ba7e4b393cfa95aa1d7438909aa8c3db14170ea207c manager: conda name: werkzeug optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda - version: 2.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.3.4-pyhd8ed1ab_0.conda + version: 2.3.4 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -4077,14 +3990,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: a88cda17074955bdb5e93b8e3be59e7d - sha256: eb7fd99bf87e0d150ee6946479172688ded1c4fb51382ad27be5da217cd8815b + md5: e8ede9a6fedf3e0e640e810749b4cb6e + sha256: d56b21d563c673023561a4e83e9f5731441ce2bce80ca5cfe55cfa8bfa5d5eb1 manager: conda name: yarl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py310h5764c6d_0.conda - version: 1.8.2 + url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.1-py310h2372a71_0.conda + version: 1.9.1 - category: main dependencies: python: '>=3.6' @@ -4132,20 +4045,20 @@ package: version: 0.7.0 - category: main dependencies: - clang-format-16: 16.0.1 default_h62803fd_0 - libclang-cpp16: '>=16.0.1,<16.1.0a0' + clang-format-16: 16.0.3 default_h83cc7fd_0 + libclang-cpp16: '>=16.0.3,<16.1.0a0' libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 00d5150c0a2e28a2d32eceb23425b989 - sha256: 6205ff6e3545d6084103a9885bb173af652326c6927ac5008154ea664e3981c1 + md5: a1f13606e670bdaaee724536218f5c40 + sha256: 5eb61124b6f96015aee46217f081953cb4efee9f9d39ac7c98e76d734f384693 manager: conda name: clang-format optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: cffi: '>=1.12' @@ -4178,26 +4091,27 @@ package: version: 0.36.0 - category: main dependencies: - click: '>=8.0' + blinker: '>=1.6.2' + click: '>=8.1.3' importlib-metadata: '>=3.6.0' - itsdangerous: '>=2.0' - jinja2: '>=3.0' - python: '>=3.7' - werkzeug: '>=2.2.2' + itsdangerous: '>=2.1.2' + jinja2: '>=3.1.2' + python: '>=3.8' + werkzeug: '>=2.3.3' hash: - md5: 917e433886a05676857035483214c70c - sha256: f38a7b55f17c5ad47464d4f02455e2ba722e9e08e2c3dc8a7f9fdd82188b72d8 + md5: 816d75d4c0f2e41b5765d17498c57a2e + sha256: f93246be286f2d0f93e85c4f08f9ce48f3eed875a79225e2ea119e70c0237421 manager: conda name: flask optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/flask-2.2.3-pyhd8ed1ab_0.conda - version: 2.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/flask-2.3.2-pyhd8ed1ab_0.conda + version: 2.3.2 - category: main dependencies: curl: '' - expat: '>=2.5.0,<3.0a0' gettext: '' + libexpat: '>=2.5.0,<3.0a0' libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' @@ -4205,14 +4119,14 @@ package: pcre2: '>=10.40,<10.41.0a0' perl: 5.* hash: - md5: 06b9b63f77ee1dea0d3a0c97f839385a - sha256: 3734da309ef157024b69fb01947fa71a04dfd8ca798eba962e8575da9ebfac9a + md5: 0cb5ff348eb4c201b3b920eff851675d + sha256: 528c9fdaf799b38611276d6f676da6018da2aaf93fb5b0328c00923909e99432 manager: conda name: git optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.0-pl5321h3ca6407_1.conda - version: 2.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.1-pl5321h86e50cf_0.conda + version: 2.40.1 - category: main dependencies: gitdb: '>=4.0.1,<5' @@ -4247,16 +4161,16 @@ package: version: 6.0.0 - category: main dependencies: - importlib-metadata: '>=6.5.0,<6.5.1.0a0' + importlib-metadata: '>=6.6.0,<6.6.1.0a0' hash: - md5: 24bfc0314deeea53d54c71de2b436ed6 - sha256: 11c866dd631856dfa043ced5d85b892798a93bd5cd617bce2368a83b90b5c93d + md5: 3cbc9615f10a3d471532b83e4250b971 + sha256: 5de35d3c019d8a36e0a0deeb04a62689837bd68234a0a73a3355b860b442eca4 manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.5.0-hd8ed1ab_0.conda - version: 6.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.6.0-hd8ed1ab_0.conda + version: 6.6.0 - category: main dependencies: attrs: '>=17.4.0' @@ -4325,14 +4239,14 @@ package: python_abi: 3.10.* *_cp310 pytz: '>=2020.1' hash: - md5: 38dd747dcb3403c0958c4f510ed4316e - sha256: 1757d0991592083172a63fc79a576dd16e94cb4a353da4d00ac7280806e5dd30 + md5: 25fc16ee9a1df69e91c8213530f2cc8c + sha256: 4af68421353f552c6d321bfc8b76040eaa89fa35c0a7854be8acaddf154be63e manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.0-py310h9b08913_0.conda - version: 2.0.0 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.1-py310h7cbd5c2_1.conda + version: 2.0.1 - category: main dependencies: pip: '' @@ -4351,14 +4265,14 @@ package: python: '>=3.7' typing-extensions: '>=4.5' hash: - md5: f10c2cf447ca96f12a326b83c75b8e33 - sha256: 51816d5471cc42059cc7a8616c8899b6fda7347999359c3979fefd0035ab274c + md5: 6c36f1c42dd0069b7f23acc74f19be46 + sha256: e6d247b9a645ac6a2e4909cbe9cfad5cf9ba1a2f4352fee7aac3acb640371a54 manager: conda name: platformdirs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda - version: 3.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.0-pyhd8ed1ab_0.conda + version: 3.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -4415,14 +4329,14 @@ package: pip: '' python: '>=3.7,<4.0' hash: - md5: fb6a4bb2c52647f4422e8a47d706ef1c - sha256: 092ddd70025bbe90042fb77bc21aa467b6181f486e7137d2c47b72f824688ea9 + md5: 8462b4f53fa7d7dc057a26d589ec71de + sha256: dc2928817ff89e3628f82f3cedd4369c84d7079d04493b33dc67e4288d1de35d manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.15-pyhd8ed1ab_0.conda - version: 0.16.15 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.17-pyhd8ed1ab_0.conda + version: 0.16.17 - category: main dependencies: cffi: '' @@ -4499,31 +4413,31 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: a2b0b88e5b4bcfdab4c03acd24667046 - sha256: 161c95587e95cedcf2587b1e666827d29c02383e4bbfdc338dfe0f8183af3747 + md5: 01961f718d29cabd188e863a61d8fd81 + sha256: 1fc8f40eb33d7e38590d88d847fb39329628c31269c8a2e5aaab7d51cc5b501f manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.115-pyhd8ed1ab_0.conda - version: 1.29.115 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.129-pyhd8ed1ab_0.conda + version: 1.29.129 - category: main dependencies: - clang-format: 16.0.1 default_h62803fd_0 - libclang-cpp16: '>=16.0.1,<16.1.0a0' - libclang13: '>=16.0.1' + clang-format: 16.0.3 default_h83cc7fd_0 + libclang-cpp16: '>=16.0.3,<16.1.0a0' + libclang13: '>=16.0.3' libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm16: '>=16.0.3,<16.1.0a0' libstdcxx-ng: '>=12' hash: - md5: 6fa41767486e911517c03bb069b9f5fa - sha256: a0acf37ed406a66e72577d40b52185488644a9a1ce56a99823c3318f9900260b + md5: ceedc73b354682b0d63d61d654ebcd33 + sha256: b5ea9bef3e3316c34bfbde0a3a50cb53a2bf2db89221c9b145d37fc1e5c89576 manager: conda name: clang-tools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.1-default_h62803fd_0.conda - version: 16.0.1 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.3-default_h83cc7fd_0.conda + version: 16.0.3 - category: main dependencies: python: '>=3.7' @@ -4556,14 +4470,14 @@ package: python: '>=3.6' ukkonen: '' hash: - md5: b8d16e273396a0115199a83769a39246 - sha256: 45cbad9e8329b33d348c536ef0c49fb1811261201072e3d536199c106562d607 + md5: a4085ab0562d5081a9333435837b538a + sha256: 4027103c59220a68b41aed056d2ce89d46e4971033d259293ca07198a8a81fdc manager: conda name: identify optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda - version: 2.5.22 + url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.24-pyhd8ed1ab_0.conda + version: 2.5.24 - category: main dependencies: importlib_metadata: '' @@ -4774,14 +4688,14 @@ package: platformdirs: <4,>=3.2 python: '>=3.8' hash: - md5: 054007ab693cb77a029ea4f1f12f34a7 - sha256: acb9f18ef811cda29690d41e0e7c54f7088d35e6b5aa5db6403d13c9eb18336a + md5: a920e114c4c2ced2280e266da65ab5e6 + sha256: 13d667887ea08b6d1fe2eb09d2d737f9af7343735d3bfa5ffaa3f67eec8eaff7 manager: conda name: virtualenv optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.22.0-pyhd8ed1ab_0.conda - version: 20.22.0 + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.23.0-pyhd8ed1ab_0.conda + version: 20.23.0 - category: main dependencies: conda-package-streaming: '>=0.7.0' @@ -4888,14 +4802,14 @@ package: pyyaml: '>=5.1' virtualenv: '>=20.10.0' hash: - md5: c4aab94cab4ddeb340e36d4c670a5f24 - sha256: 4331584fffa05cf3096799c95495ce97563699dc7c4da341e9b1ced96e4f5526 + md5: c3ad8d291556452edb6c301c91f330ed + sha256: db90abf2c06c8bace41c491e2af445d06178fa8c9111e0e2ae4738866cb929ef manager: conda name: pre-commit optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.2-pyha770c72_0.conda - version: 3.2.2 + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.1-pyha770c72_0.conda + version: 3.3.1 - category: main dependencies: __unix: '' @@ -4934,14 +4848,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: c23737efb6d9e44fa00795cded4f5ed9 - sha256: 38e65d48b017160bbcc455159616e1025ca48a8e54304d5f9448d304837021e2 + md5: 7da51e7dabbb80ebe3064e9343e8e818 + sha256: 1806dfc46c9f4b51ff56575025e7e5491ee630a6be5997dd1536009585da4c4c manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.76-pyhd8ed1ab_0.conda - version: 1.29.76 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.131-pyhd8ed1ab_0.conda + version: 1.29.131 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4955,8 +4869,8 @@ package: libexpat: '>=2.5.0,<3.0a0' libgcc-ng: '>=12' libgd: '>=2.3.3,<2.4.0a0' - libglib: '>=2.76.1,<3.0a0' - librsvg: '>=2.54.4,<3.0a0' + libglib: '>=2.76.2,<3.0a0' + librsvg: '>=2.56.0,<3.0a0' libstdcxx-ng: '>=12' libtool: '' libwebp-base: '>=1.3.0,<2.0a0' @@ -4964,46 +4878,30 @@ package: pango: '>=1.50.14,<2.0a0' zlib: '' hash: - md5: 09c3cfc5ec50aef65f67c5f1bde535c6 - sha256: 9da43e1550de05f9e56d0b1d452d9567d9156e3fbcba0e0291ff458300bb70b4 + md5: 597e2d0e1c6bc2e4457714ff479fe142 + sha256: 4bfb42de2d28406666ef6729169cae3f49c216c5ebd9f34afa40223755e2aaf8 manager: conda name: graphviz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/graphviz-8.0.3-h2e5815a_0.conda - version: 8.0.3 + url: https://conda.anaconda.org/conda-forge/linux-64/graphviz-8.0.5-h28d9a01_0.conda + version: 8.0.5 - category: main dependencies: certifi: '>=2017.4.17' charset-normalizer: '>=2,<4' idna: '>=2.5,<4' - python: '>=3.7,<4.0' + python: '>=3.7' urllib3: '>=1.21.1,<1.27' hash: - md5: 3bfbd6ead1d7299ed46dab3a7bf0bc8c - sha256: 9a7c3410970217fa035cca7f72c175989e1c8b22f855b852b9d5fde07c3550dd + md5: 5fa992d972fbccfc069161805122cb8d + sha256: bd06a6603104050fc9c4fd9bf3de7b28bbb6b9ce4b33130519d8611488213f67 manager: conda name: requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_1.conda - version: 2.28.2 -- category: main - dependencies: - aiohttp: '>=3.3.1' - aioitertools: '>=0.5.1' - botocore: '>=1.29.76,<1.29.77' - python: '>=3.7' - wrapt: '>=1.10.10' - hash: - md5: 7e3b07efee162390a72ef004440198c1 - sha256: 1e301342489a5c01fcc823e27a7b835eb7a953f827ff0d4253fb4493476f1569 - manager: conda - name: aiobotocore - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aiobotocore-2.5.0-pyhd8ed1ab_0.conda - version: 2.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/requests-2.29.0-pyhd8ed1ab_0.conda + version: 2.29.0 - category: main dependencies: botocore: '>=1.11.3' @@ -5079,14 +4977,14 @@ package: urllib3: '>=1.26.0' websocket-client: '>=0.32.0' hash: - md5: 8b0d1b5227ce39053aa69c3ff18417ec - sha256: 45e16e6f7e4105c71c1494ca523b01e676349a25ee1f8114a6c10bbdd8549d50 + md5: 543336c6aa9516cfb29c51d5c162b177 + sha256: 5e01e15e20ee573c99b530633a0d5c71fd515e4ac6d2f5f5f57baece8b915cc3 manager: conda name: docker-py optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.0.0-pyhd8ed1ab_0.tar.bz2 - version: 6.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.1.0-pyhd8ed1ab_0.conda + version: 6.1.0 - category: main dependencies: appdirs: '' @@ -5150,14 +5048,14 @@ package: botocore: '>=1.12.36,<2.0a.0' python: '>=3.7' hash: - md5: 900e74d8547fbea3af028937df28ed77 - sha256: 0e459ed32b00e96b62c2ab7e2dba0135c73fd980120fe1a7bd49901f2d50760f + md5: b19a857ac845097e9c823c9f4d35f80e + sha256: 99512bf4f4e297cc7565c94eee8ccc908411f836b341668e2b5d064273e21762 manager: conda name: s3transfer optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.6.0-pyhd8ed1ab_0.tar.bz2 - version: 0.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.6.1-pyhd8ed1ab_0.conda + version: 0.6.1 - category: main dependencies: alabaster: '>=0.7,<0.8' @@ -5189,7 +5087,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.76 + botocore: 1.29.131 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5198,29 +5096,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 8c10a8f0d1fdf0bcaf3e7ddba412dab1 - sha256: 80b95da17548e8ba8e2b3aa292829bc0c0e8edf37f25019b2a1ce97b94bb66f7 + md5: a8803614b98f834dd8e9239b1c172bb1 + sha256: 627c4db1e6c5e2febb5b9a7acf92b68a3c26afc26800700b510e076c46c02129 manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.76-py310hff52083_0.conda - version: 1.27.76 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.131-py310hff52083_0.conda + version: 1.27.131 - category: main dependencies: - botocore: '>=1.29.76,<1.30.0' + botocore: '>=1.29.131,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 5246a3712ba575428ab1e4cf8c5e289d - sha256: bd52736dcdcf9a46d7fd93baea1140b0185af3880bdfef78b9d62fdf586b65fc + md5: f51fe6d09662dc8ec9672be8567b7430 + sha256: 888fa362ba6db8b881a200539c1cc4379379ec1937168e5e475245fa1a3544c7 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.76-pyhd8ed1ab_0.conda - version: 1.26.76 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.131-pyhd8ed1ab_0.conda + version: 1.26.131 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5281,21 +5179,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/msal_extensions-1.0.0-pyhd8ed1ab_0.tar.bz2 version: 1.0.0 -- category: main - dependencies: - aiobotocore: '>=2.5.0,<2.5.1' - aiohttp: '' - fsspec: 2023.4.0 - python: '>=3.8' - hash: - md5: 4a0d69ed950a71844181abc227bc0bfc - sha256: cf9a0c2dabbd465b6ec4d1387babea78a39886d71444efc63061f62e79af8ec2 - manager: conda - name: s3fs - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/s3fs-2023.4.0-pyhd8ed1ab_0.conda - version: 2023.4.0 - category: main dependencies: livereload: '>=2.3.0' @@ -5361,14 +5244,14 @@ package: python: '' typing_extensions: '' hash: - md5: cfd95e43a27c0af1a206f7557d7f132e - sha256: 02570a9062717ec9b3293199ab8e8983c92f2320f5f8066ef541929a1166d9f1 + md5: da03042814034e36f0938058b7b218fb + sha256: d18385d39e4af117b99cbd931cb68cbd33582949a837ae4e6453964ecc64d80a manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.117-pyhd8ed1ab_0.conda - version: 1.26.117 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.130-pyhd8ed1ab_0.conda + version: 1.26.130 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5409,28 +5292,42 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: cfc72b1b83d1b8503b1071455534ebac - sha256: 1df5aa62e1fc8d498a37f30723d15a1626dc9b686603e79b4b44ba6c95f8f659 + md5: adb30ee4ef9f506b62f732c8a78d250b + sha256: 281ba68f92f05626bf37df32156abbf62e6ed963ab40b2205277a066391cc06f manager: conda name: mypy-boto3-s3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.116-pyhd8ed1ab_0.conda - version: 1.26.116 + url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.127-pyhd8ed1ab_0.conda + version: 1.26.127 - category: main dependencies: boto3: '' python: '>=3.6' typing-extensions: '' hash: - md5: 93e899cf501d962cfd1b251a45416825 - sha256: ef57856f4313eac453b53a119cedf121bd16fc98c64beaee8e3309959673daea + md5: 35a0dc87b7ff0abd9e3012bea164f439 + sha256: 706be4a8f070af47d29e18315c3053977315c1c58479ecfebb2443d3a72edf87 manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.106-pyhd8ed1ab_0.conda - version: 1.26.106 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.129-pyhd8ed1ab_0.conda + version: 1.26.129 +- category: main + dependencies: + boto3: '' + fsspec: '>=0.6.0' + python: '>=3.5' + hash: + md5: ead328eb12f01d88706126ba061e7a69 + sha256: 7a4cb574ff7edf773e5e4c396733dcb08ffcfd6e4f8b27e5b84b35fd4666ef5b + manager: conda + name: s3fs + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/s3fs-0.4.2-py_0.tar.bz2 + version: 0.4.2 - category: main dependencies: docutils: <0.19 @@ -5495,24 +5392,24 @@ package: werkzeug: '>=0.5,!=2.2.0,!=2.2.1' xmltodict: '' hash: - md5: c4172149b03b032cd60cc79f1484a1dd - sha256: 5891a5ce23d274406bda81e202ddc303d30a3355c01c7d9ae461fc5313247e9d + md5: 89dfb6776dcc992a100cafd0c612b7fb + sha256: f5de61e07e99798c0f73947fae9f947a4eb7aeff7adc04e78b9a9a3ef2ddc780 manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.7-pyhd8ed1ab_2.conda - version: 4.1.7 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.9-pyhd8ed1ab_0.conda + version: 4.1.9 - category: main dependencies: {} hash: - sha256: c41cfb1e99ba5d341fbcc5308836e7d7c9786d302f995b2c271ce2144dece9eb + sha256: 0e0bc5ba78b8db3667ad636d964eb963dc97a59f04c6f6214c5f0e4a8f726c56 manager: pip name: mock optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/e6/88/8a05e7ad0bb823246b2add3d2e97f990c41c71a40762c8db77a4bd78eedf/mock-5.0.1-py3-none-any.whl - version: 5.0.1 + url: https://files.pythonhosted.org/packages/27/6f/fbb16f260a7107ee98871d83f6793d88c4311b7189b10ef239da0b2181db/mock-5.0.2-py3-none-any.whl + version: 5.0.2 - dependencies: {} hash: sha256: f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5 @@ -5557,15 +5454,15 @@ package: version: 2.8.10 - category: main dependencies: - ruamel.yaml.clib: '>=0.2.6' + ruamel.yaml.clib: '>=0.2.7' hash: - sha256: 742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 + sha256: 25d0ee82a0a9a6f44683dcf8c282340def4074a4562f3a24f55695bb254c1693 manager: pip name: ruamel.yaml optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl - version: 0.17.21 + url: https://files.pythonhosted.org/packages/23/33/dbc62343de0cf92e0f9c15bc0a287bdaea0953f1cadca0480c78d5ac6641/ruamel.yaml-0.17.26-py3-none-any.whl + version: 0.17.26 - category: main dependencies: mock: '*' diff --git a/generators/chipyard/src/main/resources/csrc/emulator.cc b/generators/chipyard/src/main/resources/csrc/emulator.cc deleted file mode 100644 index 40b5a2fa..00000000 --- a/generators/chipyard/src/main/resources/csrc/emulator.cc +++ /dev/null @@ -1,394 +0,0 @@ -// See LICENSE.SiFive for license details. -// See LICENSE.Berkeley for license details. - -#if VM_TRACE -#include -#if CY_FST_TRACE -#include "verilated_fst_c.h" -#else -#include "verilated.h" -#include "verilated_vcd_c.h" -#endif // CY_FST_TRACE -#endif // VM_TRACE -#include -#include -#include "remote_bitbang.h" -#include -#include -#include -#include -#include -#include -#include - -// For option parsing, which is split across this file, Verilog, and -// FESVR's HTIF, a few external files must be pulled in. The list of -// files and what they provide is enumerated: -// -// $RISCV/include/fesvr/htif.h: -// defines: -// - HTIF_USAGE_OPTIONS -// - HTIF_LONG_OPTIONS_OPTIND -// - HTIF_LONG_OPTIONS -// $(ROCKETCHIP_DIR)/generated-src(-debug)?/$(CONFIG).plusArgs: -// defines: -// - PLUSARG_USAGE_OPTIONS -// variables: -// - static const char * verilog_plusargs - -extern tsi_t* tsi; -extern dtm_t* dtm; -extern remote_bitbang_t * jtag; - -static uint64_t trace_count = 0; -bool verbose = false; -bool done_reset = false; - -void handle_sigterm(int sig) -{ - dtm->stop(); -} - -double sc_time_stamp() -{ - return trace_count; -} - -static void usage(const char * program_name) -{ - printf("Usage: %s [EMULATOR OPTION]... [VERILOG PLUSARG]... [HOST OPTION]... BINARY [TARGET OPTION]...\n", - program_name); - fputs("\ -Run a BINARY on the Rocket Chip emulator.\n\ -\n\ -Mandatory arguments to long options are mandatory for short options too.\n\ -\n\ -EMULATOR OPTIONS\n\ - -c, --cycle-count Print the cycle count before exiting\n\ - +cycle-count\n\ - -h, --help Display this help and exit\n\ - -m, --max-cycles=CYCLES Kill the emulation after CYCLES\n\ - +max-cycles=CYCLES\n\ - -s, --seed=SEED Use random number seed SEED\n\ - -r, --rbb-port=PORT Use PORT for remote bit bang (with OpenOCD and GDB) \n\ - If not specified, a random port will be chosen\n\ - automatically.\n\ - -V, --verbose Enable all Chisel printfs (cycle-by-cycle info)\n\ - +verbose\n\ -", stdout); -#if VM_TRACE == 0 - fputs("\ -\n\ -EMULATOR DEBUG OPTIONS (only supported in debug build -- try `make debug`)\n", - stdout); -#endif - fputs("\ - -v, --vcd=FILE, Write vcd trace to FILE (or '-' for stdout)\n\ - -x, --dump-start=CYCLE Start VCD tracing at CYCLE\n\ - +dump-start\n\ -", stdout); - fputs("\n" PLUSARG_USAGE_OPTIONS, stdout); - fputs("\n" HTIF_USAGE_OPTIONS, stdout); - printf("\n" -"EXAMPLES\n" -" - run a bare metal test:\n" -" %s $RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-add\n" -" - run a bare metal test showing cycle-by-cycle information:\n" -" %s +verbose $RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-add 2>&1 | spike-dasm\n" -#if VM_TRACE -" - run a bare metal test to generate a VCD waveform:\n" -" %s -v rv64ui-p-add.vcd $RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-add\n" -#endif -" - run an ELF (you wrote, called 'hello') using the proxy kernel:\n" -" %s pk hello\n", - program_name, program_name, program_name -#if VM_TRACE - , program_name -#endif - ); -} - -int main(int argc, char** argv) -{ - unsigned random_seed = (unsigned)time(NULL) ^ (unsigned)getpid(); - uint64_t max_cycles = -1; - int ret = 0; - bool print_cycles = false; - // Port numbers are 16 bit unsigned integers. - uint16_t rbb_port = 0; -#if VM_TRACE - const char* vcdfile_name = NULL; - FILE * vcdfile = NULL; - uint64_t start = 0; -#endif - int verilog_plusargs_legal = 1; - - int verilated_argc = 1; - char** verilated_argv = new char*[argc]; - verilated_argv[0] = argv[0]; - - opterr = 1; - - while (1) { - static struct option long_options[] = { - {"cycle-count", no_argument, 0, 'c' }, - {"help", no_argument, 0, 'h' }, - {"max-cycles", required_argument, 0, 'm' }, - {"seed", required_argument, 0, 's' }, - {"rbb-port", required_argument, 0, 'r' }, - {"verbose", no_argument, 0, 'V' }, - {"permissive", no_argument, 0, 'p' }, - {"permissive-off", no_argument, 0, 'o' }, -#if VM_TRACE - {"vcd", required_argument, 0, 'v' }, - {"dump-start", required_argument, 0, 'x' }, -#endif - HTIF_LONG_OPTIONS - }; - int option_index = 0; -#if VM_TRACE - int c = getopt_long(argc, argv, "-chm:s:r:v:Vx:po", long_options, &option_index); -#else - int c = getopt_long(argc, argv, "-chm:s:r:Vpo", long_options, &option_index); -#endif - if (c == -1) break; - retry: - switch (c) { - // Process long and short EMULATOR options - case '?': usage(argv[0]); return 1; - case 'c': print_cycles = true; break; - case 'h': usage(argv[0]); return 0; - case 'm': max_cycles = atoll(optarg); break; - case 's': random_seed = atoi(optarg); break; - case 'r': rbb_port = atoi(optarg); break; - case 'V': verbose = true; break; - case 'p': opterr = 0; break; - case 'o': opterr = 1; break; -#if VM_TRACE - case 'v': { - vcdfile_name = optarg; - vcdfile = strcmp(optarg, "-") == 0 ? stdout : fopen(optarg, "w"); - if (!vcdfile) { - std::cerr << "Unable to open " << optarg << " for VCD write\n"; - return 1; - } - break; - } - case 'x': start = atoll(optarg); break; -#endif - // Process legacy '+' EMULATOR arguments by replacing them with - // their getopt equivalents - case 1: { - std::string arg = optarg; - if (arg.substr(0, 1) != "+") { - optind--; - goto done_processing; - } - if (arg == "+verbose") - c = 'V'; - else if (arg.substr(0, 12) == "+max-cycles=") { - c = 'm'; - optarg = optarg+12; - } -#if VM_TRACE - else if (arg.substr(0, 12) == "+dump-start=") { - c = 'x'; - optarg = optarg+12; - } -#endif - else if (arg.substr(0, 12) == "+cycle-count") - c = 'c'; - else if (arg == "+permissive") - { - c = 'p'; - verilated_argv[verilated_argc++] = optarg; - } - else if (arg == "+permissive-off") - { - c = 'o'; - verilated_argv[verilated_argc++] = optarg; - } - // If we don't find a legacy '+' EMULATOR argument, it still could be - // a VERILOG_PLUSARG and not an error. - else if (verilog_plusargs_legal) { - const char ** plusarg = &verilog_plusargs[0]; - int legal_verilog_plusarg = 0; - while (*plusarg && (legal_verilog_plusarg == 0)){ - if (arg.substr(1, strlen(*plusarg)) == *plusarg) { - legal_verilog_plusarg = 1; - } - plusarg ++; - } - if (!legal_verilog_plusarg) { - verilog_plusargs_legal = 0; - } else { - c = 'P'; - } - goto retry; - } - // If we STILL don't find a legacy '+' argument, it still could be - // an HTIF (HOST) argument and not an error. If this is the case, then - // we're done processing EMULATOR and VERILOG arguments. - else { - static struct option htif_long_options [] = { HTIF_LONG_OPTIONS }; - struct option * htif_option = &htif_long_options[0]; - while (htif_option->name) { - if (arg.substr(1, strlen(htif_option->name)) == htif_option->name) { - optind--; - goto done_processing; - } - htif_option++; - } - if(opterr) { - std::cerr << argv[0] << ": invalid plus-arg (Verilog or HTIF) \"" - << arg << "\"\n"; - c = '?'; - } else { - c = 'P'; - } - } - goto retry; - } - case 'P': // Verilog PlusArg, add to the argument list for verilator environment - verilated_argv[verilated_argc++] = optarg; - break; - // Realize that we've hit HTIF (HOST) arguments or error out - default: - if (c >= HTIF_LONG_OPTIONS_OPTIND) { - optind--; - goto done_processing; - } - c = '?'; - goto retry; - } - } - -done_processing: - if (optind == argc) { - std::cerr << "No binary specified for emulator\n"; - usage(argv[0]); - return 1; - } - - // Copy remaining HTIF arguments (if any) and the binary file name into the verilator argument stack - while (optind < argc) verilated_argv[verilated_argc++] = argv[optind++]; - - if (verbose) - fprintf(stderr, "using random seed %u\n", random_seed); - - srand(random_seed); - srand48(random_seed); - - Verilated::randReset(2); - Verilated::commandArgs(verilated_argc, verilated_argv); - TEST_HARNESS *tile = new TEST_HARNESS; - -#if VM_TRACE - Verilated::traceEverOn(true); // Verilator must compute traced signals -#if CY_FST_TRACE - std::unique_ptr tfp(new VerilatedFstC); -#else - std::unique_ptr vcdfd(new VerilatedVcdFILE(vcdfile)); - std::unique_ptr tfp(new VerilatedVcdC(vcdfd.get())); -#endif // CY_FST_TRACE - if (vcdfile_name) { - tile->trace(tfp.get(), 99); // Trace 99 levels of hierarchy - tfp->open(vcdfile_name); - } -#endif // VM_TRACE - - // RocketChip currently only supports RBB port 0, so this needs to stay here - jtag = new remote_bitbang_t(rbb_port); - - signal(SIGTERM, handle_sigterm); - - bool dump; - // start reset off low so a rising edge triggers async reset - tile->reset = 0; - tile->clock = 0; - tile->eval(); - // reset for several cycles to handle pipelined reset - for (int i = 0; i < 100; i++) { - tile->reset = 1; - tile->clock = 0; - tile->eval(); -#if VM_TRACE - dump = tfp && trace_count >= start; - if (dump) - tfp->dump(static_cast(trace_count * 2)); -#endif - tile->clock = 1; - tile->eval(); -#if VM_TRACE - if (dump) - tfp->dump(static_cast(trace_count * 2 + 1)); -#endif - trace_count ++; - } - tile->reset = 0; - done_reset = true; - - do { - tile->clock = 0; - tile->eval(); -#if VM_TRACE - dump = tfp && trace_count >= start; - if (dump) - tfp->dump(static_cast(trace_count * 2)); -#endif - - tile->clock = 1; - tile->eval(); -#if VM_TRACE - if (dump) - tfp->dump(static_cast(trace_count * 2 + 1)); -#endif - trace_count++; - } - // for verilator multithreading. need to do 1 loop before checking if - // tsi exists, since tsi is created by verilated thread on the first - // serial_tick. - while ((!dtm || !dtm->done()) && - (!jtag || !jtag->done()) && - (!tsi || !tsi->done()) && - !tile->io_success && trace_count < max_cycles); - -#if VM_TRACE - if (tfp) - tfp->close(); - if (vcdfile) - fclose(vcdfile); -#endif - - if (dtm && dtm->exit_code()) - { - fprintf(stderr, "*** FAILED *** via dtm (code = %d, seed %d) after %ld cycles\n", dtm->exit_code(), random_seed, trace_count); - ret = dtm->exit_code(); - } - else if (tsi && tsi->exit_code()) - { - fprintf(stderr, "*** FAILED *** (code = %d, seed %d) after %ld cycles\n", tsi->exit_code(), random_seed, trace_count); - ret = tsi->exit_code(); - } - else if (jtag && jtag->exit_code()) - { - fprintf(stderr, "*** FAILED *** via jtag (code = %d, seed %d) after %ld cycles\n", jtag->exit_code(), random_seed, trace_count); - ret = jtag->exit_code(); - } - else if (trace_count == max_cycles) - { - fprintf(stderr, "*** FAILED *** via trace_count (timeout, seed %d) after %ld cycles\n", random_seed, trace_count); - ret = 2; - } - else if (verbose || print_cycles) - { - fprintf(stderr, "*** PASSED *** Completed after %ld cycles\n", trace_count); - } - - if (dtm) delete dtm; - if (tsi) delete tsi; - if (jtag) delete jtag; - if (tile) delete tile; - if (verilated_argv) delete[] verilated_argv; - return ret; -} diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index 7af98c57..621a152c 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -186,6 +186,22 @@ class FireSimRocketConfig extends Config( new chipyard.RocketConfig) // DOC include end: firesimconfig +class FireSimRocket1GiBDRAMConfig extends Config( + new freechips.rocketchip.subsystem.WithExtMemSize((1 << 30) * 1L) ++ + new FireSimRocketConfig) + +class FireSimRocketMMIOOnly1GiBDRAMConfig extends Config( + new freechips.rocketchip.subsystem.WithExtMemSize((1 << 30) * 1L) ++ + new FireSimRocketMMIOOnlyConfig) + +class FireSimRocket4GiBDRAMConfig extends Config( + new freechips.rocketchip.subsystem.WithExtMemSize((1 << 30) * 4L) ++ + new FireSimRocketConfig) + +class FireSimRocketMMIOOnly4GiBDRAMConfig extends Config( + new freechips.rocketchip.subsystem.WithExtMemSize((1 << 30) * 4L) ++ + new FireSimRocketMMIOOnlyConfig) + class FireSimQuadRocketConfig extends Config( new WithDefaultFireSimBridges ++ new WithDefaultMemModel ++ diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index a09f4359..02e1fd81 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -114,11 +114,12 @@ if run_step "1"; then # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154 CONDA_REQS=$CYDIR/conda-reqs CONDA_LOCK_REQS=$CONDA_REQS/conda-lock-reqs + # must match with the file generated by generate-conda-lockfile.sh LOCKFILE=$CONDA_LOCK_REQS/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml if [ "$USE_UNPINNED_DEPS" = true ]; then - # auto-gen the lockfile - conda-lock -f $CONDA_REQS/chipyard.yaml -f $CONDA_REQS/$TOOLCHAIN_TYPE.yaml --lockfile $LOCKFILE + # auto-gen the lockfiles + $CYDIR/scripts/generate-conda-lockfiles.sh fi # use conda-lock to create env diff --git a/scripts/generate-conda-lockfiles.sh b/scripts/generate-conda-lockfiles.sh new file mode 100755 index 00000000..f2e81106 --- /dev/null +++ b/scripts/generate-conda-lockfiles.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -ex + +CUR_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +REQS_DIR="$CUR_DIR/../conda-reqs" +if [ ! -d "$REQS_DIR" ]; then + echo "$REQS_DIR does not exist, make sure you're calling this script from chipyard/" + exit 1 +fi + +for TOOLCHAIN_TYPE in riscv-tools esp-tools; do + # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154 + LOCKFILE=$REQS_DIR/conda-lock-reqs/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml + + conda-lock -f "$REQS_DIR/chipyard.yaml" -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" -p linux-64 --lockfile $LOCKFILE +done diff --git a/sims/common-sim-flags.mk b/sims/common-sim-flags.mk index 0736b43c..c2ae022c 100644 --- a/sims/common-sim-flags.mk +++ b/sims/common-sim-flags.mk @@ -33,3 +33,17 @@ SIM_LDFLAGS = \ -lfesvr \ -ldramsim \ $(EXTRA_SIM_LDFLAGS) + +CLOCK_PERIOD ?= 1.0 +RESET_DELAY ?= 777.7 + +SIM_PREPROC_DEFINES = \ + +define+CLOCK_PERIOD=$(CLOCK_PERIOD) \ + +define+RESET_DELAY=$(RESET_DELAY) \ + +define+PRINTF_COND=$(TB).printf_cond \ + +define+STOP_COND=!$(TB).reset \ + +define+MODEL=$(MODEL) \ + +define+RANDOMIZE_MEM_INIT \ + +define+RANDOMIZE_REG_INIT \ + +define+RANDOMIZE_GARBAGE_ASSIGN \ + +define+RANDOMIZE_INVALID_ASSIGN diff --git a/sims/firesim b/sims/firesim index 5f9bf2b4..966e0990 160000 --- a/sims/firesim +++ b/sims/firesim @@ -1 +1 @@ -Subproject commit 5f9bf2b42b9dedadaee857b6524f9222136280d4 +Subproject commit 966e09907cde52f0ce68eb654bf6020b5b97a6c3 diff --git a/sims/vcs/Makefile b/sims/vcs/Makefile index b6f11a80..fc0a9fdb 100644 --- a/sims/vcs/Makefile +++ b/sims/vcs/Makefile @@ -25,7 +25,7 @@ sim_prefix = simv sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG) sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug -include $(base_dir)/vcs.mk +include $(sim_dir)/vcs.mk .PHONY: default debug default: $(sim) @@ -56,7 +56,7 @@ include $(base_dir)/common.mk ######################################################################################### VCS = vcs -full64 -VCS_OPTS = $(VCS_CC_OPTS) $(VCS_NONCC_OPTS) $(PREPROC_DEFINES) +VCS_OPTS = $(VCS_CC_OPTS) $(VCS_NONCC_OPTS) $(SIM_PREPROC_DEFINES) $(VCS_PREPROC_DEFINES) ######################################################################################### # vcs build paths diff --git a/vcs.mk b/sims/vcs/vcs.mk similarity index 82% rename from vcs.mk rename to sims/vcs/vcs.mk index edd19f8c..31784ad9 100644 --- a/vcs.mk +++ b/sims/vcs/vcs.mk @@ -53,17 +53,8 @@ VCS_NONCC_OPTS = \ -debug_pp \ +incdir+$(GEN_COLLATERAL_DIR) -PREPROC_DEFINES = \ - +define+VCS \ - +define+CLOCK_PERIOD=$(CLOCK_PERIOD) \ - +define+RESET_DELAY=$(RESET_DELAY) \ - +define+PRINTF_COND=$(TB).printf_cond \ - +define+STOP_COND=!$(TB).reset \ - +define+MODEL=$(MODEL) \ - +define+RANDOMIZE_MEM_INIT \ - +define+RANDOMIZE_REG_INIT \ - +define+RANDOMIZE_GARBAGE_ASSIGN \ - +define+RANDOMIZE_INVALID_ASSIGN +VCS_PREPROC_DEFINES = \ + +define+VCS ifndef USE_VPD PREPROC_DEFINES += +define+FSDB diff --git a/sims/verilator/Makefile b/sims/verilator/Makefile index e1291bbe..9e22821d 100644 --- a/sims/verilator/Makefile +++ b/sims/verilator/Makefile @@ -28,8 +28,6 @@ sim_prefix = simulator sim = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG) sim_debug = $(sim_dir)/$(sim_prefix)-$(MODEL_PACKAGE)-$(CONFIG)-debug -WAVEFORM_FLAG=-v$(sim_out_name).vcd - include $(base_dir)/sims/common-sim-flags.mk # If verilator seed unspecified, verilator uses srand as random seed @@ -47,24 +45,7 @@ debug: $(sim_debug) # simulaton requirements ######################################################################################### SIM_FILE_REQS += \ - $(CHIPYARD_RSRCS_DIR)/csrc/emulator.cc \ - $(ROCKETCHIP_RSRCS_DIR)/csrc/verilator.h \ - -# the following files are needed for emulator.cc to compile (even if they aren't part of the RTL build) -SIM_FILE_REQS += \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/SimTSI.cc \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/testchip_tsi.cc \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/testchip_tsi.h \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/SimDRAM.cc \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/mm.h \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/mm.cc \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/mm_dramsim2.h \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/mm_dramsim2.cc \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/testchip_dtm.cc \ - $(TESTCHIP_RSRCS_DIR)/testchipip/csrc/testchip_dtm.h \ - $(ROCKETCHIP_RSRCS_DIR)/csrc/SimJTAG.cc \ - $(ROCKETCHIP_RSRCS_DIR)/csrc/remote_bitbang.h \ - $(ROCKETCHIP_RSRCS_DIR)/csrc/remote_bitbang.cc + $(ROCKETCHIP_RSRCS_DIR)/vsrc/TestDriver.v # copy files and add -FI for *.h files in *.f $(sim_files): $(SIM_FILE_REQS) $(ALL_MODS_FILELIST) | $(GEN_COLLATERAL_DIR) @@ -88,12 +69,15 @@ HELP_COMPILATION_VARIABLES += \ " 'all' if full verilator runtime profiling" \ " 'threads' if runtime thread profiling only" \ " VERILATOR_THREADS = how many threads the simulator will use (default 1)" \ -" VERILATOR_FST_MODE = enable FST waveform instead of VCD. use with debug build" +" USE_FST = set to '1' to build Verilator simulator to emit FST instead of VCD." + +HELP_SIMULATION_VARIABLES += \ +" USE_FST = set to '1' to run Verilator simulator emitting FST instead of VCD." ######################################################################################### # verilator/cxx binary and flags ######################################################################################### -VERILATOR := verilator --cc --exe +VERILATOR := verilator --main --timing --cc --exe #---------------------------------------------------------------------------------------- # user configs @@ -108,10 +92,12 @@ RUNTIME_PROFILING_VFLAGS := $(if $(filter $(VERILATOR_PROFILE),all),\ VERILATOR_THREADS ?= 1 RUNTIME_THREADS := --threads $(VERILATOR_THREADS) --threads-dpi all -VERILATOR_FST_MODE ?= 0 -TRACING_OPTS := $(if $(filter $(VERILATOR_FST_MODE),0),\ +USE_FST ?= 0 +TRACING_OPTS := $(if $(filter $(USE_FST),0),\ --trace,--trace-fst --trace-threads 1) -TRACING_CFLAGS := $(if $(filter $(VERILATOR_FST_MODE),0),,-DCY_FST_TRACE) +# TODO: consider renaming +vcdfile in TestDriver.v to +waveformfile (or similar) +WAVEFORM_FLAG := +vcdfile=$(sim_out_name).$(if $(filter $(USE_FST),0),\ + vcd,fst) #---------------------------------------------------------------------------------------- # verilation configuration/optimization @@ -154,9 +140,8 @@ TIMESCALE_OPTS := $(shell verilator --version | perl -lne 'if (/(\d.\d+)/ && $$1 # see: https://github.com/ucb-bar/riscv-mini/issues/31 MAX_WIDTH_OPTS = $(shell verilator --version | perl -lne 'if (/(\d.\d+)/ && $$1 > 4.016) { print "--max-num-width 1048576"; }') -PREPROC_DEFINES := \ - +define+PRINTF_COND=\$$c\(\"verbose\",\"\&\&\"\,\"done_reset\"\) \ - +define+STOP_COND=\$$c\(\"done_reset\"\) +VERILATOR_PREPROC_DEFINES = \ + +define+VERILATOR VERILATOR_NONCC_OPTS = \ $(RUNTIME_PROFILING_VFLAGS) \ @@ -166,8 +151,9 @@ VERILATOR_NONCC_OPTS = \ -Wno-fatal \ $(TIMESCALE_OPTS) \ $(MAX_WIDTH_OPTS) \ - $(PREPROC_DEFINES) \ - --top-module $(VLOG_MODEL) \ + $(SIM_PREPROC_DEFINES) \ + $(VERILATOR_PREPROC_DEFINES) \ + --top-module $(TB) \ --vpi \ -f $(sim_common_files) @@ -177,12 +163,8 @@ VERILATOR_NONCC_OPTS = \ VERILATOR_CXXFLAGS = \ $(SIM_CXXFLAGS) \ $(RUNTIME_PROFILING_CFLAGS) \ - $(TRACING_CFLAGS) \ - -D__STDC_FORMAT_MACROS \ - -DTEST_HARNESS=V$(VLOG_MODEL) \ -DVERILATOR \ - -include $(build_dir)/$(long_name).plusArgs \ - -include $(GEN_COLLATERAL_DIR)/verilator.h + -include $(build_dir)/$(long_name).plusArgs VERILATOR_LDFLAGS = $(SIM_LDFLAGS) @@ -201,11 +183,11 @@ VERILATOR_OPTS = $(VERILATOR_CC_OPTS) $(VERILATOR_NONCC_OPTS) model_dir = $(build_dir)/$(long_name) model_dir_debug = $(build_dir)/$(long_name).debug -model_header = $(model_dir)/V$(VLOG_MODEL).h -model_header_debug = $(model_dir_debug)/V$(VLOG_MODEL).h +model_header = $(model_dir)/V$(TB).h +model_header_debug = $(model_dir_debug)/V$(TB).h -model_mk = $(model_dir)/V$(VLOG_MODEL).mk -model_mk_debug = $(model_dir_debug)/V$(VLOG_MODEL).mk +model_mk = $(model_dir)/V$(TB).mk +model_mk_debug = $(model_dir_debug)/V$(TB).mk ######################################################################################### # build makefile fragment that builds the verilator sim rules @@ -219,17 +201,17 @@ $(model_mk): $(sim_common_files) $(EXTRA_SIM_REQS) $(model_mk_debug): $(sim_common_files) $(EXTRA_SIM_REQS) rm -rf $(model_dir_debug) mkdir -p $(model_dir_debug) - $(VERILATOR) $(VERILATOR_OPTS) $(EXTRA_SIM_SOURCES) -o $(sim_debug) $(TRACING_OPTS) -Mdir $(model_dir_debug) -CFLAGS "-include $(model_header_debug)" + $(VERILATOR) $(VERILATOR_OPTS) +define+DEBUG $(EXTRA_SIM_SOURCES) -o $(sim_debug) $(TRACING_OPTS) -Mdir $(model_dir_debug) -CFLAGS "-include $(model_header_debug)" touch $@ ######################################################################################### # invoke make to make verilator sim rules ######################################################################################### $(sim): $(model_mk) $(dramsim_lib) - $(MAKE) VM_PARALLEL_BUILDS=1 -C $(model_dir) -f V$(VLOG_MODEL).mk + $(MAKE) VM_PARALLEL_BUILDS=1 -C $(model_dir) -f V$(TB).mk $(sim_debug): $(model_mk_debug) $(dramsim_lib) - $(MAKE) VM_PARALLEL_BUILDS=1 -C $(model_dir_debug) -f V$(VLOG_MODEL).mk + $(MAKE) VM_PARALLEL_BUILDS=1 -C $(model_dir_debug) -f V$(TB).mk ######################################################################################### # create a verilator vpd rule diff --git a/tools/DRAMSim2 b/tools/DRAMSim2 index 49ec2f32..44322e2f 160000 --- a/tools/DRAMSim2 +++ b/tools/DRAMSim2 @@ -1 +1 @@ -Subproject commit 49ec2f32eea6687a36acdb8d1d636d992d9e8daa +Subproject commit 44322e2f935d7dac83b7adf8dd270b41a54c6acb diff --git a/vlsi/Makefile b/vlsi/Makefile index ad51c754..8ca74d31 100644 --- a/vlsi/Makefile +++ b/vlsi/Makefile @@ -134,7 +134,7 @@ $(SYN_CONF): $(VLSI_RTL) ######################################################################################### # simulation and power input configuration ######################################################################################### -include $(base_dir)/vcs.mk +include $(base_dir)/sims/vcs/vcs.mk SIM_FILE_REQS += \ $(ROCKETCHIP_RSRCS_DIR)/vsrc/TestDriver.v