From 240c55193fb0e9a948f7e0f8b0f958ba55ab5645 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Fri, 14 Apr 2023 11:32:41 -0700 Subject: [PATCH 01/14] add python script, wip --- scripts/uniqify-module-names.py | 105 ++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100755 scripts/uniqify-module-names.py diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py new file mode 100755 index 0000000000..7269c63fe7 --- /dev/null +++ b/scripts/uniqify-module-names.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python3 + +import json +import argparse +import shutil +import os +import sh + + + +parser = argparse.ArgumentParser(description="") +parser.add_argument("--top-filelist", type=str, required=True, help="Abs path to ..top.f") +parser.add_argument("--mod-filelist", type=str, required=True, help="Abs path to ..model.f") +parser.add_argument("--gen-collateral-path", dest="gcpath", type=str, required=True, help="Abs path to the gen-collateral directory") +parser.add_argument("--model-hier-json", type=str, required=True, help="Path to hierarchy JSON emitted by firtool. Must include DUT as a module.") +parser.add_argument('--dut', type=str, required=True, help='Name of the DUT module.') +parser.add_argument('--model', type=str, required=True, help='Name of the MODEL module.') +args = parser.parse_args() + + +def get_filelist(filelist): + f = open(filelist, "r") + lines = f.readlines() + f.close() + + fnames = [] + for line in lines: + try: + fname = line.split("/")[-1].replace("\n", "") + fnames.append(fname) + except: + print(f"Something is wrong about this line {line}") + + return fnames + + +def generate_copy(c, sfx): + (cur_name, ext) = os.path.splitext(c) + new_name = cur_name + "_" + sfx + new_file = new_name + ext + + cur_file = os.path.join(args.gcpath, c) + new_file = os.path.join(args.gcpath, new_file) + + shutil.copy(cur_file, new_file) + sh.sed("-i", f"s/{cur_name}/{new_name}/", new_file) + + return new_file + + + +def dfs_update_modules(tree, common_fnames, visited): + # List of direct submodules to update + childs_to_update = list() + for child in tree['instances']: + if (child['module_name'] == args.dut) or (child['module_name'] in visited): + continue + if dfs_update_modules(child, common_fnames, visited): + childs_to_update.append(child['module_name']) + + cur_module = tree['module_name'] + cur_file = cur_module + ".sv" + new_file = None + + # cur_file is in the common list, generate a new file + for c in common_fnames: + if cur_file == c: + new_file = generate_copy(c, "Model") + + # has some child to update, but new_file wasn't generated + if (new_file is None) and len(childs_to_update) > 0: + if cur_module == args.model: + new_file = os.path.join(args.gcpath, cur_file) + else: + new_file = generate_copy(cur_file, "Model") + + if new_file is not None: + print(f"-- {cur_module}") + + for submodule_name in childs_to_update: + print(f"|- {submodule_name}") + sh.sed("-i", f"s/{submodule_name}/{submodule_name}_Model/", new_file) + + visited.add(cur_module) + return (new_file is not None) + + +def main(): + top_fnames = set(get_filelist(args.top_filelist)) + mod_fnames = set(get_filelist(args.mod_filelist)) + + common_fnames = top_fnames.intersection(mod_fnames) + for c in common_fnames: + print(c) + + imhj = open(args.model_hier_json, "r") + imhj_data = json.load(imhj) + + visited = set() + dfs_update_modules(imhj_data, common_fnames, visited) + + + +if __name__ == "__main__": + main() From e59ed50abb7f0d6bf4b1da7669e5cdafc8e27e1d Mon Sep 17 00:00:00 2001 From: joey0320 Date: Fri, 14 Apr 2023 16:44:30 -0700 Subject: [PATCH 02/14] script to unqify modules --- common.mk | 6 +++++ scripts/uniqify-module-names.py | 40 +++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/common.mk b/common.mk index a4668075dc..ed02a10e2c 100644 --- a/common.mk +++ b/common.mk @@ -243,6 +243,12 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL $(SED) -i 's/\.\///' $(TOP_MODS_FILELIST) $(SED) -i 's/\.\///' $(MODEL_MODS_FILELIST) $(SED) -i 's/\.\///' $(BB_MODS_FILELIST) + $(base_dir)/scripts/uniqify-module-names.py \ + --top-filelist $(TOP_MODS_FILELIST) \ + --mod-filelist $(MODEL_MODS_FILELIST) \ + --gen-collateral-path $(GEN_COLLATERAL_DIR) \ + --model-hier-json $(MFC_MODEL_HRCHY_JSON) \ + --dut $(TOP) sort -u $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(BB_MODS_FILELIST) > $(ALL_MODS_FILELIST) $(TOP_BB_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) &: $(BB_MODS_FILELIST) $(MFC_TOP_HRCHY_JSON) $(FINAL_ANNO_FILE) diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py index 7269c63fe7..a88d4147ce 100755 --- a/scripts/uniqify-module-names.py +++ b/scripts/uniqify-module-names.py @@ -14,7 +14,6 @@ parser.add_argument("--gen-collateral-path", dest="gcpath", type=str, required=True, help="Abs path to the gen-collateral directory") parser.add_argument("--model-hier-json", type=str, required=True, help="Path to hierarchy JSON emitted by firtool. Must include DUT as a module.") parser.add_argument('--dut', type=str, required=True, help='Name of the DUT module.') -parser.add_argument('--model', type=str, required=True, help='Name of the MODEL module.') args = parser.parse_args() @@ -33,6 +32,9 @@ def get_filelist(filelist): return fnames +def update_filelist(cur_file, new_file): + sh.sed("-i", f"s/\b{cur_file}\b/{new_file}/", os.path.join(args.gcpath, args.mod_filelist)) + def generate_copy(c, sfx): (cur_name, ext) = os.path.splitext(c) @@ -43,43 +45,45 @@ def generate_copy(c, sfx): new_file = os.path.join(args.gcpath, new_file) shutil.copy(cur_file, new_file) - sh.sed("-i", f"s/{cur_name}/{new_name}/", new_file) - + sh.sed("-i", f"s/\b{cur_name}\b/{new_name}/", new_file) return new_file -def dfs_update_modules(tree, common_fnames, visited): +def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules): # List of direct submodules to update childs_to_update = list() for child in tree['instances']: + # We don't have to change stuff that are under the dut if (child['module_name'] == args.dut) or (child['module_name'] in visited): continue - if dfs_update_modules(child, common_fnames, visited): + if dfs_update_modules(child, common_fnames, visited, top_fnames, updated_modules): childs_to_update.append(child['module_name']) + if (child['module_name'] + ".sv") in common_fnames: + child['module_name'] = child['module_name'] + "_Model" + updated_modules.append(child['module_name']) cur_module = tree['module_name'] cur_file = cur_module + ".sv" new_file = None # cur_file is in the common list, generate a new file - for c in common_fnames: - if cur_file == c: - new_file = generate_copy(c, "Model") + if cur_file in common_fnames: + new_file = generate_copy(cur_file, "Model") + update_filelist(cur_file, os.path.basename(new_file)) # has some child to update, but new_file wasn't generated if (new_file is None) and len(childs_to_update) > 0: - if cur_module == args.model: - new_file = os.path.join(args.gcpath, cur_file) - else: - new_file = generate_copy(cur_file, "Model") + new_file = os.path.join(args.gcpath, cur_file) + assert(cur_file not in top_fnames) if new_file is not None: print(f"-- {cur_module}") for submodule_name in childs_to_update: print(f"|- {submodule_name}") - sh.sed("-i", f"s/{submodule_name}/{submodule_name}_Model/", new_file) + if (submodule_name + ".sv") in common_fnames: + sh.sed("-i", f"s/\b{submodule_name}\b/{submodule_name}_Model/", new_file) visited.add(cur_module) return (new_file is not None) @@ -88,16 +92,18 @@ def dfs_update_modules(tree, common_fnames, visited): def main(): top_fnames = set(get_filelist(args.top_filelist)) mod_fnames = set(get_filelist(args.mod_filelist)) - common_fnames = top_fnames.intersection(mod_fnames) - for c in common_fnames: - print(c) imhj = open(args.model_hier_json, "r") imhj_data = json.load(imhj) visited = set() - dfs_update_modules(imhj_data, common_fnames, visited) + updated_modules = list() + dfs_update_modules(imhj_data, common_fnames, visited, top_fnames, updated_modules) + + out_file = open(args.model_hier_json, "w") + json.dump(imhj_data, out_file, indent=2) + out_file.close() From c204e4a3e4132c9014cbe0f943f09decfcd18a19 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Fri, 14 Apr 2023 16:44:54 -0700 Subject: [PATCH 03/14] rm print --- scripts/uniqify-module-names.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py index a88d4147ce..260f8fd3da 100755 --- a/scripts/uniqify-module-names.py +++ b/scripts/uniqify-module-names.py @@ -77,11 +77,7 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules new_file = os.path.join(args.gcpath, cur_file) assert(cur_file not in top_fnames) - if new_file is not None: - print(f"-- {cur_module}") - for submodule_name in childs_to_update: - print(f"|- {submodule_name}") if (submodule_name + ".sv") in common_fnames: sh.sed("-i", f"s/\b{submodule_name}\b/{submodule_name}_Model/", new_file) From 632a8957ffd7666e8fdea566a1ff30b7d913b416 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Fri, 14 Apr 2023 21:24:08 -0700 Subject: [PATCH 04/14] add sh to conda env --- conda-reqs/chipyard.yaml | 1 + ...ements-riscv-tools-linux-64.conda-lock.yml | 1135 ++++++++++------- 2 files changed, 697 insertions(+), 439 deletions(-) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index 59c5de5147..7b928cae64 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -39,6 +39,7 @@ dependencies: - coreutils - jq - pip + - sh # firemarshal deps - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock 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 ca4c96d264..22625f5a13 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 @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-riscv-tools-linux-64.conda-lock.yml # 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 +# 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 /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/chipyard.yaml -f /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,14 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 1a7b0ae002798a28682d700644302284790c06503a7d3d04caa019aa74da7123 + linux-64: 94be5f8cad4026c00d3aef6c3690da6cc358bc79c1f7398049754bd17e861420 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/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml + - /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -185,14 +187,14 @@ package: - category: main dependencies: {} hash: - md5: 7697d37e29669a14b053e82fad22a16b - sha256: ac993fa2774b90befcd6aba55b1c08853b2fa3b818753094c09bebd35fc55532 + md5: 0299e410bfb4300540bdc0012a7985ef + sha256: 8572efb7092c72fe7b73d2a0f1e5e27159a8edea0371e1bef533bcb7d85b19c6 manager: conda name: open_pdks.sky130a optional: false platform: linux-64 - url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.402_1_g12df12e-20230225_164303.tar.bz2 - version: 1.0.402_1_g12df12e + url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.406_0_g0c37b7c-20230412_103222.tar.bz2 + version: 1.0.406_0_g0c37b7c - category: main dependencies: {} hash: @@ -207,14 +209,14 @@ package: - category: main dependencies: {} hash: - md5: 51fc4fcfb19f5d95ffc8c339db5068e8 - sha256: 0bfae0b9962bc0dbf79048f9175b913ed4f53c4310d06708dc7acbb290ad82f6 + md5: 939e3e74d8be4dac89ce83b20de2492a + sha256: 0449138224adfa125b220154408419ec37c06b0b49f63c5954724325903ecf55 manager: conda name: tzdata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda - version: 2022g + url: https://conda.anaconda.org/conda-forge/noarch/tzdata-2023c-h71feb2d_0.conda + version: 2023c - category: main dependencies: font-ttf-dejavu-sans-mono: '' @@ -420,25 +422,13 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 + sha256: null manager: conda name: dromajo optional: false platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/dromajo-1.0.0-0_h1234567_g6a6e34e.tar.bz2 version: 1.0.0 -- category: main - dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - hash: - md5: c4fbad8d4bddeb3c085f18cbf97fbfad - sha256: b44db0b92ae926b3fbbcd57c179fceb64fa11a9f9d09082e03be58b74dcad832 - manager: conda - name: expat - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-h27087fc_0.tar.bz2 - version: 2.5.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -528,17 +518,17 @@ package: version: '1.12' - category: main dependencies: - libgcc-ng: '>=10.3.0' - libstdcxx-ng: '>=10.3.0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' hash: - md5: 87473a15119779e021c314249d4b4aed - sha256: 1d7950f3be4637ab915d886304e57731d39a41ab705ffc95c4681655c459374a + md5: 7c8d20d847bb45f56bd941578fcfa146 + sha256: e44cc00eec068e7f7a6dd117ba17bf5d57658729b7b841945546f82505138292 manager: conda name: icu optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/icu-70.1-h27087fc_0.tar.bz2 - version: '70.1' + url: https://conda.anaconda.org/conda-forge/linux-64/icu-72.1-hcb278e6_0.conda + version: '72.1' - category: main dependencies: libgcc-ng: '>=12' @@ -592,14 +582,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: 5cc781fd91968b11a8a7fdbee0982676 - sha256: f9983a8ea03531f2c14bce76c870ca325c0fddf0c4e872bff1f78bc52624179c + md5: 6aa9c9de5542ecb07fdda9ca626252d8 + sha256: 949d84ceea543802c1e085b2aa58f1d6cb5dd8cec5a9abaaf4e8ac65d6094b3a manager: conda name: libdeflate optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.17-h0b41bf4_0.conda - version: '1.17' + url: https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.18-h0b41bf4_0.conda + version: '1.18' - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -612,6 +602,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2 version: '4.33' +- category: main + dependencies: + libgcc-ng: '>=12' + hash: + md5: 6305a3dd2752c76335295da4e581f2fd + sha256: 74c98a563777ae2ad71f1f74d458a8ab043cee4a513467c159ccf159d0e461f3 + manager: conda + name: libexpat + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda + version: 2.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -648,6 +650,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2 version: '1.17' +- category: main + dependencies: + libgcc-ng: '>=12' + hash: + md5: 1edd9e67bdb90d78cea97733ff6b54e6 + sha256: b19de7bda34eac4fa931be11fa8d7640cdf1441dfd51c91786586a4a4c64c92f + manager: conda + name: libjpeg-turbo + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-2.1.5.1-h0b41bf4_0.conda + version: 2.1.5.1 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -736,16 +750,16 @@ package: version: 0.9.10 - category: main dependencies: - libgcc-ng: '>=9.3.0' + libgcc-ng: '>=12' hash: - md5: 772d69f030955d9646d3d0eaf21d859d - sha256: 54f118845498353c936826f8da79b5377d23032bcac8c4a02de2019e26c3f6b3 + md5: 40b61aab5c7ba9ff276c41cfffe6b80b + sha256: 787eb542f055a2b3de553614b25f09eefb0a0931b0c87dbcce6efdfd92f04f18 manager: conda name: libuuid optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2 - version: 2.32.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda + version: 2.38.1 - category: main dependencies: libgcc-ng: '>=12' @@ -762,14 +776,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: ac2ccf7323d21f2994e4d1f5da664f37 - sha256: 221f2e138dd264b7394b88f08884d93825d38800a51415059e813c02467abfd1 + md5: 0d4a7508d8c6c65314f2b9c1f56ad408 + sha256: ac3e073ea77803da71eb77e7fcef07defb345bda95eee3327c73ddf85b5714da manager: conda name: libwebp-base optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.4-h166bdaf_0.tar.bz2 - version: 1.2.4 + url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.3.0-h0b41bf4_0.conda + version: 1.3.0 - category: main dependencies: libgcc-ng: '>=12' @@ -954,15 +968,15 @@ package: version: '6.0' - category: main dependencies: - libgcc-ng: '>=7.3.0' + libgcc-ng: '>=12' hash: - md5: 2e5f1a8199794b21c9472c1a7f27e21a - sha256: a3ee6c02932fbee32babe39fa6bda9f781d6dc17122d2a90e62ff2b6866a5de8 + md5: 76d6bc123c1c75bf034c412856fcc935 + sha256: e94d0d5f75a5f58165ad8ac64a25df851c77ec6e9bf626c16807dcbd740226c8 manager: conda name: which optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/which-2.21-h516909a_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/which-2.21-h0b41bf4_1.conda version: '2.21' - category: main dependencies: @@ -1135,6 +1149,19 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/dtc-1.6.1-h166bdaf_2.tar.bz2 version: 1.6.1 +- category: main + dependencies: + libexpat: 2.5.0 hcb278e6_1 + libgcc-ng: '>=12' + hash: + md5: 8b9b5aca60558d02ddaa09d599e55920 + sha256: 36dfeb4375059b3bba75ce9b38c29c69fd257342a79e6cf20e9f25c1523f785f + manager: conda + name: expat + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-hcb278e6_1.conda + version: 2.5.0 - category: main dependencies: gettext: '' @@ -1373,20 +1400,20 @@ package: version: '1.13' - category: main dependencies: - icu: '>=70.1,<71.0a0' + icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' hash: - md5: bb808b654bdc3c783deaf107a2ffb503 - sha256: d4170f1fe356768758b13a51db123f990bff81b0eae0d5a0ba11c7ca6b9536f4 + md5: 241845899caff54ac1d2b3102ad988cf + sha256: 624b6e29e23a51353cff2aff7364c42b831139afd131d239e79f60aea4dae887 manager: conda name: libxml2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda - version: 2.10.3 + url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.4-hfdac1af_0.conda + version: 2.10.4 - category: main dependencies: libgcc-ng: '>=7.3.0' @@ -1472,14 +1499,14 @@ package: libgcc-ng: '>=12' ncurses: '>=6.3,<7.0a0' hash: - md5: db2ebbe2943aae81ed051a6a9af8e0fa - sha256: f5f383193bdbe01c41cb0d6f99fec68e820875e842e6e8b392dbe1a9b6c43ed8 + md5: 47d31b792659ce70f470b5c82fdfb7a4 + sha256: 5435cf39d039387fbdc977b0a762357ea909a7694d9528ab40f005e9208744d7 manager: conda name: readline optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.1.2-h0f457ee_0.tar.bz2 - version: 8.1.2 + url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + version: '8.2' - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -1589,17 +1616,17 @@ package: version: '2.71' - category: main dependencies: - libgcc-ng: '>=10.3.0' - readline: '>=8.1,<9.0a0' + libgcc-ng: '>=12' + readline: '>=8.2,<9.0a0' hash: - md5: 54d1a374b75f14ecc58aea8c4236c0c3 - sha256: 6415903ad8774fc0f1bf5b156ae0b6f9988427a0f14bb35467c5938f05fe8707 + md5: 23b559a791d63ba4f51906763eb6bc53 + sha256: a7b2ea50068d86ac6e3749f76b118b15947d3f5ce48535eb5ab2ff7e22659c49 manager: conda name: bash optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/bash-5.1.16-hd863ed2_0.tar.bz2 - version: 5.1.16 + url: https://conda.anaconda.org/conda-forge/linux-64/bash-5.2.15-hfbf034d_0.conda + version: 5.2.15 - category: main dependencies: flex: '' @@ -1685,13 +1712,13 @@ package: dependencies: gcc_impl_linux-64: 12.2.0.* hash: - md5: b4d86475bd1a21d139ea78770f606471 - sha256: 3cfb989723f8e115d35553c2b1d899b0f4185fc0551a996b9ff4037083a36432 + md5: c241b4f6676222c2feefc9dc4b9d1728 + sha256: f4b4184cc3e0864abadfc5b06ae869b479e736ff1dc46723967256d11b5bc7c4 manager: conda name: gcc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_11.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_12.conda version: 12.2.0 - category: main dependencies: @@ -1820,23 +1847,39 @@ package: version: 15.0.7 - category: main dependencies: - jpeg: '>=9e,<10a' + 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 + 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 +- category: main + dependencies: lerc: '>=4.0.0,<5.0a0' - libdeflate: '>=1.17,<1.18.0a0' + libdeflate: '>=1.18,<1.19.0a0' libgcc-ng: '>=12' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libstdcxx-ng: '>=12' - libwebp-base: '>=1.2.4,<2.0a0' + libwebp-base: '>=1.3.0,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 2e648a34072eb39d7c4fc2a9981c5f0c - sha256: e3e18d91fb282b61288d4fd2574dfa31f7ae90ef2737f96722fb6ad3257862ee + md5: 4e5ee4b062c21519efbee7e2ae608748 + sha256: caacb23e1b95fbdd8115be69228f9c82068ed87bf57f055027e31d093ae6a1a2 manager: conda name: libtiff optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-h6adf6a1_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-ha587672_6.conda version: 4.5.0 - category: main dependencies: @@ -1881,20 +1924,20 @@ package: libuuid: '>=2.32.1,<3.0a0' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' - openssl: '>=3.0.7,<4.0a0' - readline: '>=8.1.2,<9.0a0' + openssl: '>=3.1.0,<4.0a0' + readline: '>=8.2,<9.0a0' tk: '>=8.6.12,<8.7.0a0' tzdata: '' xz: '>=5.2.6,<6.0a0' hash: - md5: 3cb3e91b3fe66baa68a12c85f39b9b40 - sha256: 073878d7cc9c7e25cf04983d02e6d44b531d47e0166258cbce964dd78bb716a9 + md5: de25afc7041c103c7f510c746bb63435 + sha256: 67748307da3fa057d17d4e991f3c60f87595a517b98f4b323a17b5f3dc287159 manager: conda name: python optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.9-he550d4f_0_cpython.conda - version: 3.10.9 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.10-he550d4f_0_cpython.conda + version: 3.10.10 - category: main dependencies: libgcc-ng: '>=12' @@ -1990,14 +2033,14 @@ package: dependencies: python: '>=3.6' hash: - md5: b3c15cb1d45fd10bc6f652bbc51e023a - sha256: 8dbc6de55113ea67a64f0be5d16ba939d1b58a25dbd9a5cc62b571cef24ef85c + md5: 99b19895abe40280358488acb9589532 + sha256: 2b273efc522834e4c8563da7998b9b683eed467660fe8a5a3c24d58aaa85a9cb manager: conda name: argcomplete optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.2-pyhd8ed1ab_0.conda - version: 3.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/argcomplete-3.0.5-pyhd8ed1ab_0.conda + version: 3.0.5 - category: main dependencies: libgcc-ng: '>=12' @@ -2203,14 +2246,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 6f90f1dc834447823b11d155726fcb37 - sha256: 6a6901f20c5b4d81aebd25a0645b3578ebb6a323f9fd7e87ee05ecbcfe19069e + md5: ec5503e4e3142adde6061c54db438b51 + sha256: ceb2394be6276bb321e05741094568efc0421374713ff3c8226c09283ea2af65 manager: conda name: filelock optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.0-pyhd8ed1ab_0.conda - version: 3.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.11.0-pyhd8ed1ab_0.conda + version: 3.11.0 - category: main dependencies: expat: '>=2.5.0,<3.0a0' @@ -2245,29 +2288,30 @@ package: dependencies: python: '>=3.8' hash: - md5: 0db48a2f5a68e28e5af8d3df276f2255 - sha256: dfcee90620d13f4f667664620191d780c79ec7e9ba9908cd771d24a1361e0cc9 + md5: a993e42df87a292d8fd7396a2e2a8d75 + sha256: c2a5db01537aae91a54dbd163b85421de2b623c75803af4e38ea01ba000317d1 manager: conda name: fsspec optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda - version: 2023.3.0 + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.4.0-pyh1a96a4e_0.conda + version: 2023.4.0 - category: main dependencies: - jpeg: '>=9e,<10a' libgcc-ng: '>=12' libglib: '>=2.74.1,<3.0a0' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libtiff: '>=4.5.0,<4.6.0a0' + libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 1a109126a43003d65b39c1cad656bc9b - sha256: a27f49d85e0a730374cc77606e9484b23b0f3edf32df1994b6d7ff5dd44aef92 + md5: ee8220db21db8094998005990418fe5b + sha256: 7acc699871310e9a89aaa7e90de9ac949e2fa649232c8a8dfcafa67e8f36a266 manager: conda name: gdk-pixbuf optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h05c8ddd_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h6b639ba_2.conda version: 2.42.10 - category: main dependencies: @@ -2305,13 +2349,13 @@ package: gcc: 12.2.0.* gxx_impl_linux-64: 12.2.0.* hash: - md5: 2b54322e0dbb1345d64913e8b20b7d7c - sha256: f6c390055f2846d6013160c41dece0973daf577c5f1aaa73ff5dcf597b35d0ec + md5: 56e0d282569b6cd349035a1bb5efae47 + sha256: b428f0af395194cb327fb212167efc3a837866d11b9f1a8bbad7e953c595c6cb manager: conda name: gxx optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_11.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_12.conda version: 12.2.0 - category: main dependencies: @@ -2439,17 +2483,31 @@ package: version: 1.4.4 - category: main dependencies: - jpeg: '>=9e,<10a' libgcc-ng: '>=12' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 + hash: + md5: 8664f43451412071a7111211fe7e38f2 + sha256: a26e8c55b8d1b17e784c6e2ffa75ed4dec4a335c7df17f183dcc9c5149d6cd70 + manager: conda + name: lazy-object-proxy + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/lazy-object-proxy-1.9.0-py310h1fa729e_0.conda + version: 1.9.0 +- category: main + dependencies: + libgcc-ng: '>=12' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libtiff: '>=4.5.0,<4.6.0a0' hash: - md5: aa8840cdf17ef0c6084d1e24abc7a28b - sha256: 443e926b585528112ec6aa4d85bf087722914ed8d85a2f75ae47c023c55c4238 + md5: 980d8aca0bc23ca73fa8caa3e7c84c28 + sha256: 0d88e0e7f8dbf8f01788e21dd63dd49b89433ce7dfd10f53839441396f6481cd manager: conda name: lcms2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hfd0df8a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-haa2dc70_1.conda version: '2.15' - category: main dependencies: @@ -2469,18 +2527,31 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' + libllvm16: '>=16.0.1,<16.1.0a0' + libstdcxx-ng: '>=12' + hash: + md5: 2c00ecf8081a8f23043b055a68d7ba90 + sha256: 5f3eb78832674b8038dd65c80d09837a01f3300bf516370fc16650f33b8b87ed + 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 +- category: main + dependencies: + libgcc-ng: '>=12' + libllvm16: '>=16.0.1,<16.1.0a0' libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: a3a0f7a6f0885f5e1e0ec691566afb77 - sha256: e48481c37d02aefeddcfac20d48cf13b838c5f7b9018300fa7eac404d30f3d7f + md5: 48c2eb0c9988c76ad34c47910fee3077 + sha256: aa4a685e98221cee06b6de93c9ac8efc329c648fdbbffbdd02f41cb1d228b3d8 manager: conda name: libclang13 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-15.0.7-default_h3e3d535_1.conda - version: 15.0.7 + url: https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.1-default_h9b593c0_0.conda + version: 16.0.1 - category: main dependencies: krb5: '>=1.20.1,<1.21.0a0' @@ -2542,20 +2613,20 @@ package: - category: main dependencies: giflib: '>=5.2.1,<5.3.0a0' - jpeg: '>=9e,<10a' libgcc-ng: '>=12' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libtiff: '>=4.5.0,<4.6.0a0' - libwebp-base: '>=1.2.4,<2.0a0' + libwebp-base: '>=1.3.0,<2.0a0' hash: - md5: 77003f63d1763c1e6569a02c1742c9f4 - sha256: 43d563a16fe9db32b7d0be8d89968005f21139e9285dfe1fbfe9ae6647f1cc9f + md5: 9cfd7ad6e1539ca1ad172083586b3301 + sha256: 461fe2c0279309c21f206f114f3bd6592e906ef6f8cc181b2e28482941b8b925 manager: conda name: libwebp optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h1daa5a0_1.conda - version: 1.2.4 + url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.3.0-hb47c5f0_0.conda + version: 1.3.0 - category: main dependencies: python: '' @@ -2594,6 +2665,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/more-itertools-9.1.0-pyhd8ed1ab_0.conda version: 9.1.0 +- category: main + dependencies: + python: '>=3.6' + hash: + md5: dbf6e2d89137da32fa6670f3bffc024e + sha256: a4f025c712ec1502a55c471b56a640eaeebfce38dd497d5a1a33729014cac47a + manager: conda + name: mpmath + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/mpmath-1.3.0-pyhd8ed1ab_0.conda + version: 1.3.0 - category: main dependencies: libgcc-ng: '>=12' @@ -2697,14 +2780,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 1ff2e3ca41f0ce16afec7190db28288b - sha256: 00288f5e5e841711e8b8fef1f1242c858d8ef99ccbe5d7e0df4789d5d8d40645 + md5: 91cda59e66e1e4afe9476f8ef98f5c30 + sha256: ded536a96a00d45a693dbc2971bb688248324dadd129eddda2100e177583d768 manager: conda name: packaging optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda - version: '23.0' + url: https://conda.anaconda.org/conda-forge/noarch/packaging-23.1-pyhd8ed1ab_0.conda + version: '23.1' - category: main dependencies: python: '>=2.7' @@ -2717,6 +2800,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pastel-0.2.1-pyhd8ed1ab_0.tar.bz2 version: 0.2.1 +- category: main + dependencies: + python: '>=3.7' + hash: + md5: f3e7301de38fd621c902faf8087bc564 + sha256: 7258b7f6a8e5fcd5e5a22e0a85b89e03e9cf5049d1591bc98420fd080007f25d + manager: conda + name: pathable + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pathable-0.4.3-pyhd8ed1ab_0.tar.bz2 + version: 0.4.3 - category: main dependencies: python: '>=3.6' @@ -2729,6 +2824,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pkginfo-1.9.6-pyhd8ed1ab_0.conda version: 1.9.6 +- category: main + dependencies: + python: '>=3.6' + hash: + md5: 89e3c7cdde7d3aaa2aee933b604dd07f + sha256: 7d055ffc8a02bf781a89d069db3454b453605cdaff300b82cedcc7133283e47e + manager: conda + name: pkgutil-resolve-name + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2 + version: 1.3.10 - category: main dependencies: python: '>=3.8' @@ -2796,7 +2903,7 @@ package: version: 0.6.4 - category: main dependencies: - python: 2.7.*|>=3.4 + python: ==2.7.*|>=3.4 hash: md5: 076becd9e05608f8dc72757d5f3a91ff sha256: 74c63fd03f1f1ea2b54e8bc529fd1a600aaafb24027b738d0db87909ee3a33dc @@ -2806,6 +2913,18 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2 version: '2.21' +- category: main + dependencies: + python: '>=3.7' + hash: + md5: bd9547b9d70225f536627ac755ce8f56 + sha256: 6ab547ac8299513341e502cb3b80f4daf07dd92c7a6eb1858b801c4e1ce405c5 + manager: conda + name: pygments + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.15.0-pyhd8ed1ab_0.conda + version: 2.15.0 - category: main dependencies: python: '>=3.6' @@ -2873,14 +2992,26 @@ package: dependencies: python: '>=3.6' hash: - md5: f59d49a7b464901cf714b9e7984d01a2 - sha256: 93cfc7a92099e26b0575a343da4a667b52371cc38e4dee4ee264dc041ef77bac + md5: 2590495f608a63625e165915fb4e2e34 + sha256: 0108888507014fb24573c31e4deceb61c99e63d37776dddcadd7c89b2ecae0b6 + manager: conda + name: python-tzdata + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.3-pyhd8ed1ab_0.conda + version: '2023.3' +- category: main + dependencies: + python: '>=3.6' + hash: + md5: d3076b483092a435832603243567bc31 + sha256: e4999484f21763ca4b8f92c95b22cb6d1edc1b61d0a2bb073ee2bd11f39401b9 manager: conda name: pytz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda - version: 2022.7.1 + url: https://conda.anaconda.org/conda-forge/noarch/pytz-2023.3-pyhd8ed1ab_0.conda + version: '2023.3' - category: main dependencies: __unix: '' @@ -2909,6 +3040,20 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py310h5764c6d_4.tar.bz2 version: 5.4.1 +- category: main + dependencies: + libgcc-ng: '>=12' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 + hash: + md5: 684679589ab49049183640b15554be5d + sha256: 82ecf2ebd4a689101d979ff94ef0cf9f1d41ada82ded1d4861ad1b31fc921f32 + manager: conda + name: regex + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/regex-2023.3.23-py310h1fa729e_0.conda + version: 2023.3.23 - category: main dependencies: __glibc: '>=2.17,<3.0.a0' @@ -2961,14 +3106,27 @@ package: dependencies: python: '>=3.7' hash: - md5: e18ed61c37145bb9b48d1d98801960f7 - sha256: a5c48b1fc7c89c5c937475e9434a63af7ce2e591f8e51afd56e3b2e232a9989d + md5: 6c443cccff3daa3d83b2b807b0a298ce + sha256: 6595024174d318848468c0e61899ff3c2f08a3545c85727b9a2871d6f8d0062a manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda - version: 67.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.1-pyhd8ed1ab_0.conda + version: 67.6.1 +- category: main + dependencies: + __unix: '' + python: '>=3.8.1' + hash: + md5: 25c245540888eb278acfc05b1c1734d7 + sha256: 689ea9a1e0f3701248ad8721da8944c722b9df8fa2cf654a3a5636ff387c477e + manager: conda + name: sh + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/sh-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: main dependencies: python: '' @@ -3131,38 +3289,38 @@ package: dependencies: python: '>=3.6' hash: - md5: a4d6202101f04b76d545530728e696bf - sha256: 8e490e1d390be0ab59b538199b4cedec027c68ebaa3add554a6316a79d5a1dbe + md5: 2010a97e7298197221abc6295790ff62 + sha256: 5fb56cd0652e7cffc1141c66b09644f1dde588ef6dddcb47849a62d7b0186846 manager: conda name: types-pytz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-pytz-2022.7.1.2-pyhd8ed1ab_0.conda - version: 2022.7.1.2 + url: https://conda.anaconda.org/conda-forge/noarch/types-pytz-2023.3.0.0-pyhd8ed1ab_0.conda + version: 2023.3.0.0 - category: main dependencies: python: '>=3.6' hash: - md5: d398b385822d9425fb21c6c8f89dbc9e - sha256: 32233b8d558c118b9d856c6b7e52499c36b9f867bbf76b5c8b7edfb7655230cf + md5: 0c0c5edec27d8284bf75023737f74823 + sha256: 10290d04934693214ea9a3caaefac35c3fdfc72094ffa8b0f063141bef469bbe manager: conda name: types-pyyaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.8-pyhd8ed1ab_0.conda - version: 6.0.12.8 + url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.9-pyhd8ed1ab_0.conda + version: 6.0.12.9 - category: main dependencies: python: '>=3.6' hash: - md5: 617bb6391b4b676f9b062aff31ef978d - sha256: 17f157579b6f0e9c2ef56e3d9c74eef625717865f8503101317cedc69f059b46 + md5: 1c44c106ac42fde5774d31e37220f4df + sha256: b9df570c65f14a002a3972bf9e9ed0c0ef8ff6a29087ba8d6be6493bfd1ea8ef manager: conda name: types-urllib3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.8-pyhd8ed1ab_0.conda - version: 1.26.25.8 + 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' @@ -3179,14 +3337,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 43e7d9e50261fb11deb76e17d8431aac - sha256: f81eee64fcdfb379e27d01773b34041fbf7f9e86f33b157c9925d19e0a442452 + md5: 2d93b130d148d7fc77e583677792fc6a + sha256: 70c57b5ac94cd32e78f1a2fa2c38572bfac85b901a6a99aa254a9e8e126c132d manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda - version: 4.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2 + version: 4.4.0 - category: main dependencies: libgcc-ng: '>=12' @@ -3219,24 +3377,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/verilator-4.226-he0ac6c6_1.tar.bz2 version: '4.226' -- category: main - dependencies: - gettext: '>=0.21.1,<1.0a0' - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - ncurses: '>=6.3,<7.0a0' - perl: '>=5.32.1,<5.33.0a0 *_perl5' - python: '>=3.10,<3.11.0a0' - python_abi: 3.10.* *_cp310 - hash: - md5: 7cd55a1679e39c90e105c216d12af54b - sha256: fc189bde7d79ec70de87f176756b6cc04d9008c3e0de5d66f8832f7f9c85274c - manager: conda - name: vim - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.0814-py310pl5321hade1898_0.tar.bz2 - version: 9.0.0814 - category: main dependencies: python: '' @@ -3353,6 +3493,23 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2 version: 0.9.10 +- category: main + dependencies: + libgcc-ng: '>=9.3.0' + xorg-kbproto: '' + xorg-libice: 1.0.* + xorg-libsm: 1.2.* + xorg-libx11: '>=1.7.0,<2.0a0' + xorg-xproto: '' + hash: + md5: 60d6eec5273f1c9af096c10c268912e3 + sha256: 25bfc4d86df3498b88aac2f02ecf65e739bf99a687805c31a635df6f2e60a163 + manager: conda + name: xorg-libxt + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.2.1-h7f98852_2.tar.bz2 + version: 1.2.1 - category: main dependencies: python: '>=3.7' @@ -3406,30 +3563,30 @@ package: version: 2.12.1 - category: main dependencies: - fontconfig: '>=2.13.96,<3.0a0' + fontconfig: '>=2.14.2,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' - icu: '>=70.1,<71.0a0' + icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' - libglib: '>=2.72.1,<3.0a0' - libpng: '>=1.6.38,<1.7.0a0' + libglib: '>=2.74.1,<3.0a0' + libpng: '>=1.6.39,<1.7.0a0' libxcb: '>=1.13,<1.14.0a0' - libzlib: '>=1.2.12,<1.3.0a0' + libzlib: '>=1.2.13,<1.3.0a0' pixman: '>=0.40.0,<1.0a0' xorg-libice: '' xorg-libsm: '' - xorg-libx11: '' - xorg-libxext: '' + xorg-libx11: '>=1.8.4,<2.0a0' + xorg-libxext: '>=1.3.4,<2.0a0' xorg-libxrender: '' - zlib: '>=1.2.12,<1.3.0a0' + zlib: '' hash: - md5: d1a88f3ed5b52e1024b80d4bcd26a7a0 - sha256: f062cf56e6e50d3ad4b425ebb3765ca9138c6ebc52e6a42d1377de8bc8d954f6 + md5: 0c944213e40c9e4aa32292776b9c6903 + sha256: 0be3064cb30e3e69a47370abae85b2780cd81fbca00cbd17076d40c0f6302fdb manager: conda name: cairo optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h35add3b_1015.conda version: 1.16.0 - category: main dependencies: @@ -3463,6 +3620,21 @@ package: 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' + libstdcxx-ng: '>=12' + hash: + md5: cc2343dad8afb0b3d9cc368da2d58e22 + sha256: a3ae4c803ff00cdf74984c02ac8279e39861bb4aad16854c18a81792936714ac + 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 - category: main dependencies: click: '' @@ -3493,8 +3665,9 @@ package: - category: main dependencies: bzip2: '>=1.0.8,<2.0a0' - expat: '>=2.5.0,<3.0a0' - libcurl: '>=7.88.1,<8.0a0' + expat: '' + libcurl: '>=7.88.1,<9.0a0' + libexpat: '>=2.5.0,<3.0a0' libgcc-ng: '>=12' libstdcxx-ng: '>=12' libuv: '' @@ -3505,14 +3678,14 @@ package: zlib: '' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 02142080aee43c8ef90db543ffbc13dd - sha256: cbd17c0375a021b7de854e0841f3f1b28b1359bc52bdc0ba5aabaee0f65a0b7d + md5: 6edec767268ad8451d27bb65f38c7ea4 + sha256: 3bb9d7c35d5297d85516769eb0517c83f7fc2ed7ab944a8c028871bb375bed51 manager: conda name: cmake optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.0-h077f3f9_0.conda - version: 3.26.0 + url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.3-h077f3f9_0.conda + version: 3.26.3 - category: main dependencies: libgcc-ng: '>=12' @@ -3565,7 +3738,7 @@ package: dependencies: bzip2: '>=1.0.8,<2.0a0' libarchive: '>=3.5.2,<3.6.0a0' - libcurl: '>=7.82.0,<8.0a0' + libcurl: '>=7.82.0,<9.0a0' libgcc-ng: '>=10.3.0' libmicrohttpd: '>=0.9.75,<0.10.0a0' libstdcxx-ng: '>=10.3.0' @@ -3591,14 +3764,14 @@ package: python_abi: 3.10.* *_cp310 unicodedata2: '>=14.0.0' hash: - md5: 3b354798e12b65fa8ebe1d189de6a507 - sha256: 20b42570005cd3f6d961efa3ac1e389ef763a94224406a6f33121824390f5b71 + md5: 4f39f656d6ff2761d698e69af952be82 + sha256: 9c3765958a18d9bfc33e42d78a554aff00041d3da474db3045d6ce95ef6a4643 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py310h1fa729e_0.conda - version: 4.39.2 + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.3-py310h1fa729e_0.conda + version: 4.39.3 - category: main dependencies: python: '>=3.4' @@ -3644,14 +3817,27 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: 30b3127c385ca2ed5ef87f3d53d466bc - sha256: 4fe127138487a2aa171862407605f0cd601d005f85e0eee7f38c770b407e4145 + md5: c63decd397ca639c4b17f6ea5d26bd4d + sha256: 26a56c66c95389e9e2bd95e88f023fd94d4a60e4817bcbe4103f6220d0c17d86 manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda - version: 6.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.3.0-pyha770c72_0.conda + version: 6.3.0 +- category: main + dependencies: + python: '>=3.7' + zipp: '>=3.1.0' + hash: + md5: e5fd2260a231ee63b6969f4801082f2b + sha256: 091cca3e010f7a7353152f0abda2d68cfd83ddde80a15e974d9e18b2047e7be2 + manager: conda + name: importlib_resources + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda + version: 5.12.0 - category: main dependencies: more-itertools: '' @@ -3723,26 +3909,26 @@ package: - category: main dependencies: expat: '>=2.5.0,<3.0a0' - fontconfig: '>=2.14.1,<3.0a0' + fontconfig: '>=2.14.2,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' - icu: '>=70.1,<71.0a0' - jpeg: '>=9e,<10a' + icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libtiff: '>=4.5.0,<4.6.0a0' libwebp: '' - libwebp-base: '>=1.2.4,<2.0a0' + libwebp-base: '>=1.3.0,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' zlib: '' hash: - md5: 82ef57611ace65b59db35a9687264572 - sha256: 6674781023188deeda7752e5dc429a54fd1639c9d61cbb25296cbbb55367884a + md5: ef06bee47510a7f5db3c2297a51d6ce2 + sha256: 6335db21afc72f86cf4ee0298acde3af950087db2b24df3d28a81c7d24574244 manager: conda name: libgd optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h5aea950_4.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-hfa28ad5_6.conda version: 2.3.3 - category: main dependencies: @@ -3769,14 +3955,14 @@ package: tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: 7f519094ddab6b939cf6dae229c3b17b - sha256: d58fd7f0c34995d5dd829eff8b4261e782b65a6bb50f072919f0d0002fd35a77 + md5: 7696ac5b7bc40cd66e483f16ee652243 + sha256: 20901dc450437d7e583c1c8e63321bdaf105e6703a41f9d3a6d5551a0707bcfc manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.1.1-py310h1fa729e_0.conda - version: 1.1.1 + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.2.0-py310h1fa729e_0.conda + version: 1.2.0 - category: main dependencies: python: 2.7|>=3.7 @@ -3793,11 +3979,11 @@ package: - category: main dependencies: freetype: '>=2.12.1,<3.0a0' - jpeg: '>=9e,<10a' - lcms2: '>=2.14,<3.0a0' + lcms2: '>=2.15,<3.0a0' libgcc-ng: '>=12' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libtiff: '>=4.5.0,<4.6.0a0' - libwebp-base: '>=1.2.4,<2.0a0' + libwebp-base: '>=1.3.0,<2.0a0' libxcb: '>=1.13,<1.14.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' @@ -3805,14 +3991,14 @@ package: python_abi: 3.10.* *_cp310 tk: '>=8.6.12,<8.7.0a0' hash: - md5: bbea829b541aa15df5c65bd40b8c1981 - sha256: 6d17af4c8bc8d8668d033725dd4691cfac86fdf0f46f655ab6f5df3e3ae0bb7c + md5: 58ea77873883be5b59328e29ca50997e + sha256: ca081b2a1af2dcab802dece28ac1a95e873c9ee278bbd50a5c2882b621dd0d99 manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py310h023d228_1.conda - version: 9.4.0 + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py310h065c6d2_0.conda + version: 9.5.0 - category: main dependencies: python: '>=3.7' @@ -3827,38 +4013,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda version: 23.0.1 -- category: main - dependencies: - python: '>=3.6' - setuptools: '' - hash: - md5: c78cd16b11cd6a295484bd6c8f24bea1 - sha256: e8710e24f60b6a97289468f47914e53610101755088bc237621cc1980edbfcd9 - manager: conda - name: pygments - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda - version: 2.14.0 -- category: main - dependencies: - attrs: '>=19.2.0' - colorama: '' - exceptiongroup: '' - iniconfig: '' - packaging: '' - pluggy: '>=0.12,<2.0' - python: '>=3.8' - tomli: '>=1.0.0' - hash: - md5: 60958b19354e0ec295b43f6ab5cfab86 - sha256: d074ef1e2ffc3334927c281e4b79aebfa8eefd2d1588c3830a45ba4bce3e6ea9 - manager: conda - name: pytest - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda - version: 7.2.2 - category: main dependencies: python: '>=3.6' @@ -3891,6 +4045,19 @@ package: platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/qemu-5.0.0-hb15d774_0.tar.bz2 version: 5.0.0 +- category: main + dependencies: + python: '>=3.5' + six: '' + hash: + md5: fed45fc5ea0813240707998abe49f520 + sha256: 7c7052b51de0b5c558f890bb11f8b5edbb9934a653d76be086b1182b9f54185d + manager: conda + name: rfc3339-validator + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2 + version: 0.1.4 - category: main dependencies: pyasn1: '>=0.1.3' @@ -3922,17 +4089,32 @@ package: version: 0.17.21 - category: main dependencies: - python: '>=3.6' - typing: '>=3.6,<4.0' + __unix: '' + gmpy2: '>=2.0.8' + mpmath: '>=0.19' + python: '>=3.8' hash: - md5: 471bf9e605820b59988e830382b8d654 - sha256: e8b3bc2203266636740ce10536ef951c52b53b43bfed3b938117547efc47e374 + md5: 3893579a690fcd781c3dcedfd019bb9f + sha256: 8b5eb459c905758f96829ad93eb118f9b7cbbad8e9bc2b3328552abb7c658ec4 + manager: conda + name: sympy + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/sympy-1.11.1-pypyh9d50eac_103.conda + version: 1.11.1 +- 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.6-pyha770c72_0.tar.bz2 - version: 0.11.6 + url: https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda + version: 0.11.7 - category: main dependencies: colorama: '' @@ -3951,26 +4133,46 @@ package: python: '>=3.6' types-urllib3: <1.27 hash: - md5: 35221b6d2f75276b786fb53fac5c4c35 - sha256: 54b0949b6fcdbdc36474dd3403a926b55331de6c1ea543c1d87f444f7fa8702a + md5: 856c0ae2398368dba2555354564d5228 + sha256: caacc1f5c91c39754611cd74cdc3b34a87efa5963d38c937fc927960586c18dd manager: conda name: types-requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.28.11.15-pyhd8ed1ab_0.conda - version: 2.28.11.15 + url: https://conda.anaconda.org/conda-forge/noarch/types-requests-2.28.11.17-pyhd8ed1ab_0.conda + version: 2.28.11.17 - category: main dependencies: - typing_extensions: 4.5.0 pyha770c72_0 + typing_extensions: 4.4.0 pyha770c72_0 hash: - md5: b3c594fde1a80a1fc3eb9cc4a5dfe392 - sha256: 6da5e15fa533620ae2e7aca9a7d16013eed3a73ac64c47d7c3bf3deec39b63b9 + md5: be969210b61b897775a0de63cd9e9026 + sha256: 6f129b1bc18d111dcf3abaec6fcf6cbee00f1b77bb42d0f0bc8d85f8faa65cf0 manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda - version: 4.5.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2 + version: 4.4.0 +- category: main + dependencies: + gettext: '>=0.21.1,<1.0a0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + ncurses: '>=6.3,<7.0a0' + perl: '>=5.32.1,<5.33.0a0 *_perl5' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 + xorg-libx11: '>=1.8.4,<2.0a0' + xorg-libxt: '' + hash: + md5: 895f3629b577b0581598259037f40f2a + sha256: b208a6e91286a20c7ea0b21c15c56092051db953004efd20efed6e5624d360ca + 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 + version: 9.0.1425 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -4050,37 +4252,36 @@ package: version: 0.7.0 - category: main dependencies: - clang-format-15: 15.0.7 default_had23c3d_1 - libclang-cpp15: '>=15.0.7,<15.1.0a0' + clang-format-16: 16.0.1 default_h62803fd_0 + libclang-cpp16: '>=16.0.1,<16.1.0a0' libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' + libllvm16: '>=16.0.1,<16.1.0a0' libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 841d93c086f15b68916b3455711c2638 - sha256: 517c759576600decafd005b14f3df9660b525fdb85645a0c588ea979b62bdc5e + md5: 00d5150c0a2e28a2d32eceb23425b989 + sha256: 6205ff6e3545d6084103a9885bb173af652326c6927ac5008154ea664e3981c1 manager: conda name: clang-format optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-15.0.7-default_had23c3d_1.conda - version: 15.0.7 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-format-16.0.1-default_h62803fd_0.conda + version: 16.0.1 - category: main dependencies: cffi: '>=1.12' libgcc-ng: '>=12' - openssl: '>=3.0.8,<4.0a0' + openssl: '>=3.1.0,<4.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: 99dc5a02a8b16cd88ca9a12354496e78 - sha256: 23d3015849c45febab3085ecf2cc193c0966c1e2348756722b776f1cedea8596 + md5: 991a12eccbca3c9897c62f44b1104a54 + sha256: 692b0394bb3104ec117faa0130d67109a0132e9bd57084ebfde81fc2b9790e58 manager: conda name: cryptography optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.2-py310h34c0648_0.conda - version: 39.0.2 + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-40.0.2-py310h34c0648_0.conda + version: 40.0.2 - category: main dependencies: cloudpickle: '' @@ -4120,17 +4321,17 @@ package: libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' - openssl: '>=3.0.8,<4.0a0' + openssl: '>=3.1.0,<4.0a0' pcre2: '>=10.40,<10.41.0a0' perl: 5.* hash: - md5: 70fd89375d9b5ca90c15dcf3662b1b42 - sha256: fba1e93848c20e29d205726142fb37ad7e2be785699f98aac348524080354f6d + md5: 06b9b63f77ee1dea0d3a0c97f839385a + sha256: 3734da309ef157024b69fb01947fa71a04dfd8ca798eba962e8575da9ebfac9a manager: conda name: git optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.0-pl5321h693f4a3_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.0-pl5321h3ca6407_1.conda version: 2.40.0 - category: main dependencies: @@ -4151,48 +4352,49 @@ package: cairo: '>=1.16.0,<2.0a0' freetype: '>=2.12.1,<3.0a0' graphite2: '' - icu: '>=70.1,<71.0a0' + icu: '>=72.1,<73.0a0' libgcc-ng: '>=12' libglib: '>=2.74.1,<3.0a0' libstdcxx-ng: '>=12' hash: - md5: 448fe40d2fed88ccf4d9ded37cbb2b38 - sha256: f300fcb390253d6d63346ee71e56f82bc830783d1682ac933fe9ac86f39da942 + md5: 73d2c2d25fdcec40c24929bab9f44831 + sha256: d4bf8a3e23478efefe39ac2d965f44b55cee4058277f2ad7478384e7973fc97f manager: conda name: harfbuzz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h8e241bc_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h3ff4399_1.conda version: 6.0.0 - category: main dependencies: - importlib-metadata: '>=6.1.0,<6.1.1.0a0' + importlib-metadata: '>=6.3.0,<6.3.1.0a0' hash: - md5: 90bab1d97fdb6bb40c8e00207bf222dc - sha256: 80a10ad1bacf5bb85d497fd3e5629f5805b6e90ad8c8b923daa3e36729e7429a + md5: 1dee0ac2ed01030b56bdd33eabebc42f + sha256: 0aee044df634fb4d652ecf117b17ab2dd24f8f863334d3010c37e3a96989f0fa manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda - version: 6.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.3.0-hd8ed1ab_0.conda + version: 6.3.0 - category: main dependencies: attrs: '>=17.4.0' importlib-metadata: '' - pyrsistent: '>=0.14.0' - python: '>=3.6' - setuptools: '' - six: '>=1.11.0' + importlib_resources: '>=1.4.0' + pkgutil-resolve-name: '>=1.3.10' + pyrsistent: '!=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0' + python: '>=3.7' + typing_extensions: '' hash: - md5: 66125e28711d8ffc04a207a2b170316d - sha256: d74a3ddd3c3dd9bd7b00110a196e3af90490c5660674f18bfd53a8fdf91de418 + md5: 723268a468177cd44568eb8f794e0d80 + sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada manager: conda name: jsonschema optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2 - version: 3.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda + version: 4.17.3 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4200,6 +4402,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 + sha256: null manager: conda name: libdwarf optional: false @@ -4240,17 +4443,18 @@ package: numpy: '>=1.21.6,<2.0a0' python: '>=3.10,<3.11.0a0' python-dateutil: '>=2.8.1' + python-tzdata: '>=2022a' python_abi: 3.10.* *_cp310 pytz: '>=2020.1' hash: - md5: 467244b0dbb7da40927ac6ee0e9491de - sha256: 289bdc902fb8c536d8fe1297fdc97bb17f01a9b19ad15d96fc8ba0dbe239a379 + md5: 38dd747dcb3403c0958c4f510ed4316e + sha256: 1757d0991592083172a63fc79a576dd16e94cb4a353da4d00ac7280806e5dd30 manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py310h9b08913_0.conda - version: 1.5.3 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.0-py310h9b08913_0.conda + version: 2.0.0 - category: main dependencies: pip: '' @@ -4284,14 +4488,14 @@ package: python_abi: 3.10.* *_cp310 typing-extensions: '>=4.2.0' hash: - md5: d84eeeb2a7ef8ef996bb6acdb5ecdeb6 - sha256: 8ea1a03876dcf6432acd88f15cdb64bf4f985ea54599adef552f376cf68cf7a7 + md5: 6306ca76bc0635d84940349cf8d96264 + sha256: b0d9edaba389b3714bbc59266cfe7e7fef9c7f0bc664f455026455c998129b30 manager: conda name: pydantic optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.6-py310h1fa729e_0.conda - version: 1.10.6 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.7-py310h1fa729e_0.conda + version: 1.10.7 - category: main dependencies: cffi: '>=1.4.1' @@ -4311,43 +4515,36 @@ package: version: 1.5.0 - category: main dependencies: - pytest: '>=3.6.0' - python: '' - hash: - md5: b6764e23dece9f9cda0469af044fafeb - sha256: bdb25a7daf3efb7255b1a19d7b5d41d7d4d96bc647b8e5f7407ec4dd9e384257 - manager: conda - name: pytest-dependency - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-dependency-0.5.1-pyh9f0ad1d_0.tar.bz2 - version: 0.5.1 -- category: main - dependencies: - pytest: '>=5.0' - python: '>=3.7' + colorama: '' + exceptiongroup: '' + importlib-metadata: '>=0.12' + iniconfig: '' + packaging: '' + pluggy: '>=0.12,<2.0' + python: '>=3.8' + tomli: '>=1.0.0' hash: - md5: db93caa9fe182f0cd20291aeb22f57ac - sha256: 87bb8edc9976403237a0e6c3bd7b2224c346c95e4c7345971f411aef21593450 + md5: 547c7de697ec99b494a28ddde185b5a4 + sha256: 42f89db577266b9dc195d09189b92f3af3354fb50c98b1f996c580322dffa8b5 manager: conda - name: pytest-mock + name: pytest optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2 - version: 3.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.3.1-pyhd8ed1ab_0.conda + version: 7.3.1 - category: main dependencies: pip: '' python: '>=3.7,<4.0' hash: - md5: 25923bf9620c56f8bc0d4923d870edd8 - sha256: 3f8be46ba1cbd8533d25eba1a5b32062bb9231b16e308bbbc92b5e32177cbdad + md5: 093158575159054e73bb3e58f3be95f2 + sha256: 1189b96bc4307c371143f43a7deae839f0e73c04ff9df02bd5fc7dd6f248bafd manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.13-pyhd8ed1ab_0.conda - version: 0.16.13 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.14-pyhd8ed1ab_0.conda + version: 0.16.14 - category: main dependencies: cffi: '' @@ -4424,32 +4621,31 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 96971bc5cc944a1743fdde0634e55480 - sha256: fee2b0596dd34a70081d745e06f9302dd06fb56dd366e51a302f93c9764126d9 + md5: 39387401b8d302b94a16bb2cf77f6ff8 + sha256: 8deed72652219ab079ec5fd0bae5327a947622dcc40210e88837b62703780ecc manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.94-pyhd8ed1ab_0.conda - version: 1.29.94 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.113-pyhd8ed1ab_0.conda + version: 1.29.113 - category: main dependencies: - clang-format: 15.0.7 default_had23c3d_1 - libclang: '>=15.0.7,<15.1.0a0' - libclang-cpp15: '>=15.0.7,<15.1.0a0' + clang-format: 16.0.1 default_h62803fd_0 + libclang-cpp16: '>=16.0.1,<16.1.0a0' + libclang13: '>=16.0.1' libgcc-ng: '>=12' - libllvm15: '>=15.0.7,<15.1.0a0' + libllvm16: '>=16.0.1,<16.1.0a0' libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: c23e2b0154fb2eb92442fa8ecbcf571c - sha256: d9931c1ce5907073de0269666881309cc896267723f38ef269101bd211e49062 + md5: 6fa41767486e911517c03bb069b9f5fa + sha256: a0acf37ed406a66e72577d40b52185488644a9a1ce56a99823c3318f9900260b manager: conda name: clang-tools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-15.0.7-default_had23c3d_1.conda - version: 15.0.7 + url: https://conda.anaconda.org/conda-forge/linux-64/clang-tools-16.0.1-default_h62803fd_0.conda + version: 16.0.1 - category: main dependencies: python: '>=3.7' @@ -4482,18 +4678,18 @@ package: python: '>=3.6' ukkonen: '' hash: - md5: b5ada314668cded097e08fea86262317 - sha256: 88bcba64d462867b5759e29784cf24685e1e49fffea75452b94d438d6bd9587c + md5: b8d16e273396a0115199a83769a39246 + sha256: 45cbad9e8329b33d348c536ef0c49fb1811261201072e3d536199c106562d607 manager: conda name: identify optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.21-pyhd8ed1ab_0.conda - version: 2.5.21 + url: https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda + version: 2.5.22 - category: main dependencies: importlib_metadata: '' - python: 2.7.*|>=3.5 + python: ==2.7.*|>=3.5 hash: md5: 35f19fabdfd44c8b53889be95333848c sha256: d497c6f3b064d3dd8b76f277ea8d6a507acfe8cb04e31811baf66d8c533b8c08 @@ -4503,6 +4699,22 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/jsonpickle-2.2.0-pyhd8ed1ab_0.tar.bz2 version: 2.2.0 +- category: main + dependencies: + jsonschema: '>=4.0.0,<4.18.0' + pathable: '>=0.4.1,<0.5.0' + python: '>=3.6' + pyyaml: '>=5.1' + typing_extensions: '>=4.3.0,<5.0.0' + hash: + md5: eff09facc908d5619097edd090678347 + sha256: 9ed0cbf1fec505c4ed2238453b42c964f8f85baa30490daeb84dbf5afd65c0b1 + manager: conda + name: jsonschema-spec + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-spec-0.1.4-pyhd8ed1ab_0.conda + version: 0.1.4 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4511,6 +4723,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 + sha256: null manager: conda name: libdwarf-dev optional: false @@ -4519,45 +4732,47 @@ package: version: 0.0.0.20190110_28_ga81397fc4 - category: main dependencies: - jsonschema: '>=3.0.0,<5.0.0' + attrs: '>=19.2.0' + jsonschema: '>=4.0.0,<4.18.0' python: '>=3.7' + rfc3339-validator: '' hash: - md5: 277aff70bb1def188c9c016ba4564e23 - sha256: 0c2f971f86211f2b6db431de9d8ab4c9e38eed5422bd06f93cd8be3cbb882a2c + md5: 6294c4a75fdeeca454e99abbea3f250a + sha256: 6b6fff6441e2673a822793776217f1c07d595ad7a73e7b631c7aeb8ac6663041 manager: conda name: openapi-schema-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.2.3-pyhd8ed1ab_0.tar.bz2 - version: 0.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.4.4-pyhd8ed1ab_0.conda + version: 0.4.4 - category: main dependencies: alsa-lib: '>=1.2.8,<1.2.9.0a0' - fontconfig: '>=2.14.1,<3.0a0' + fontconfig: '>=2.14.2,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' giflib: '>=5.2.1,<5.3.0a0' harfbuzz: '>=6.0.0,<7.0a0' - jpeg: '>=9e,<10a' - lcms2: '>=2.14,<3.0a0' + lcms2: '>=2.15,<3.0a0' libcups: '>=2.3.3,<2.4.0a0' libgcc-ng: '>=12' + libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - xorg-libx11: '' - xorg-libxext: '' + xorg-libx11: '>=1.8.4,<2.0a0' + xorg-libxext: '>=1.3.4,<2.0a0' xorg-libxi: '' xorg-libxrender: '' xorg-libxtst: '' hash: - md5: 71a5dfe4a375fc43497cdc6f4aedff9d - sha256: baa527e6b59572e00e68c2362e1771f7741f3f062dac7a8c6365a97f48c04413 + md5: 33527b036cd6d369be12fd772cdd49e4 + sha256: 221de13214f051654177dd331c019a889ab1bbe3b2cf30d5cf17596378740359 manager: conda name: openjdk optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h58dac75_5.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h4335b31_6.conda version: 17.0.3 - category: main dependencies: @@ -4596,17 +4811,43 @@ package: version: 3.1.0 - category: main dependencies: - cryptography: '>=38.0.0,<40' + cryptography: '>=38.0.0,<41' python: '>=3.6' hash: - md5: d41957700e83bbb925928764cb7f8878 - sha256: adbf8951f22bfa950b9e24394df1ef1d2b2d7dfb194d91c7f42bc11900695785 + md5: 0b34aa3ab7e7ccb1765a03dd9ed29938 + sha256: 458428cb867f70f2af2a4ed59d382291ea3eb3f10490196070a15d1d71d5432a manager: conda name: pyopenssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.0.0-pyhd8ed1ab_0.conda - version: 23.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.1.1-pyhd8ed1ab_0.conda + version: 23.1.1 +- category: main + dependencies: + pytest: '>=3.6.0' + python: '' + hash: + md5: b6764e23dece9f9cda0469af044fafeb + sha256: bdb25a7daf3efb7255b1a19d7b5d41d7d4d96bc647b8e5f7407ec4dd9e384257 + manager: conda + name: pytest-dependency + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-dependency-0.5.1-pyh9f0ad1d_0.tar.bz2 + version: 0.5.1 +- category: main + dependencies: + pytest: '>=5.0' + python: '>=3.7' + hash: + md5: db93caa9fe182f0cd20291aeb22f57ac + sha256: 87bb8edc9976403237a0e6c3bd7b2224c346c95e4c7345971f411aef21593450 + manager: conda + name: pytest-mock + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2 + version: 3.10.0 - category: main dependencies: cryptography: '' @@ -4766,20 +5007,21 @@ package: version: 2.54.4 - category: main dependencies: - jsonschema: '>=3.2.0,<5.0.0' - openapi-schema-validator: '>=0.2.0,<0.3.0' + importlib_resources: '>=5.8.0,<6.0.0' + jsonschema: '>=4.0.0,<4.18.0' + jsonschema-spec: '>=0.1.1,<0.2.0' + lazy-object-proxy: '>=1.7.1,<2.0.0' + openapi-schema-validator: '>=0.4.2,<0.5' python: '>=3.7' - pyyaml: '>=5.1' - setuptools: '' hash: - md5: 5ff3ff67d18fd4938c4ae38c3baf21bb - sha256: 11f24d36001aaba0a7197ff7b9a07ab943d05f969b13e5a9c4ffec13eca19cd0 + md5: a6e9e3fc7321a5fa6a9344c366e85fac + sha256: db9346beb615afab028631b35752ab12c7172455016aba29d9f8da280431c517 manager: conda name: openapi-spec-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.4.0-pyhd8ed1ab_1.tar.bz2 - version: 0.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.5.6-pyhd8ed1ab_0.conda + version: 0.5.6 - category: main dependencies: cfgv: '>=2.0.0' @@ -4789,14 +5031,14 @@ package: pyyaml: '>=5.1' virtualenv: '>=20.10.0' hash: - md5: 9a160452d1d88a9f10c373888f93586b - sha256: 91e104de6854e07a580603a7affb1a6e77823e9d4246486ecfd47d3978839212 + md5: c4aab94cab4ddeb340e36d4c670a5f24 + sha256: 4331584fffa05cf3096799c95495ce97563699dc7c4da341e9b1ced96e4f5526 manager: conda name: pre-commit optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda - version: 3.2.0 + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.2-pyha770c72_0.conda + version: 3.2.2 - category: main dependencies: __unix: '' @@ -4835,14 +5077,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 3faabd8720a81a91566e6c01bf7bbacb - sha256: c677cba87c7027ccf264574a87130bf44f69be008315d2a840ae6cfaa61b7e44 + md5: 28e3074f0184e908a78dd99ad7206916 + sha256: 3812de59fe902fbd6ca6096bdfd02ccd8300a460948979071e7e45bc7ebbb66c manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.27.59-pyhd8ed1ab_0.tar.bz2 - version: 1.27.59 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.113-pyhd8ed1ab_0.conda + version: 1.29.113 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4875,18 +5117,18 @@ package: - category: main dependencies: certifi: '>=2017.4.17' - charset-normalizer: '>=2,<3' + charset-normalizer: '>=2,<4' idna: '>=2.5,<4' python: '>=3.7,<4.0' urllib3: '>=1.21.1,<1.27' hash: - md5: 11d178fc55199482ee48d6812ea83983 - sha256: 22c081b4cdd023a514400413f50efdf2c378f56f2a5ea9d65666aacf4696490a + md5: 3bfbd6ead1d7299ed46dab3a7bf0bc8c + sha256: 9a7c3410970217fa035cca7f72c175989e1c8b22f855b852b9d5fde07c3550dd manager: conda name: requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_1.conda version: 2.28.2 - category: main dependencies: @@ -4910,14 +5152,14 @@ package: python: '>=3.4' wrapt: '' hash: - md5: 2f18ecd9ec078c10f7086ad7ee05289b - sha256: ab3afec58f5368351efac43e813e62f944d41bd879c99e45ad49910aac666447 + md5: a9f8851a7aad0fa6ec843b1beb95decf + sha256: ad37f3f8a6653fb91354716adec29dfb9f5917b7aa06d77f33af8ea7947eb116 manager: conda name: aws-xray-sdk optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aws-xray-sdk-2.11.0-pyhd8ed1ab_0.tar.bz2 - version: 2.11.0 + url: https://conda.anaconda.org/conda-forge/noarch/aws-xray-sdk-2.12.0-pyhd8ed1ab_0.conda + version: 2.12.0 - category: main dependencies: python: '>=3.6' @@ -4925,14 +5167,14 @@ package: six: '>=1.11.0' typing-extensions: '>=4.0.1' hash: - md5: e49892b87d27fce696b7118a27558fae - sha256: bb995e74396dc34da1a1f9931f40949979913c7b2802c51c799a604edbb45516 + md5: f4d871cde207029fbd3059fc4ad76af9 + sha256: 85884ae07cd171b577dba67059b633df5c6ad0a8fff8222de4bf77530426aea6 manager: conda name: azure-core optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.26.3-pyhd8ed1ab_0.conda - version: 1.26.3 + url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.26.4-pyhd8ed1ab_0.conda + version: 1.26.4 - category: main dependencies: msgpack-python: '>=0.5.2' @@ -5089,7 +5331,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.27.59 + botocore: 1.29.113 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5098,29 +5340,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 7fca00e32e7d64340bebb17799aafd16 - sha256: 118e95635796784bb1d0072d65be0fc1151ba7aca7118a5c79764ff2667301ad + md5: 3e9e90cd2b4355932b94898eda78783d + sha256: 6eda3942ffb8bd320e5b2ee0538bdb6b2333835653f2990666dc660c4fd3b6ee manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.25.60-py310hff52083_0.tar.bz2 - version: 1.25.60 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.113-py310hff52083_0.conda + version: 1.27.113 - category: main dependencies: - botocore: '>=1.27.59,<1.28.0' + botocore: '>=1.29.113,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: ffb13a0a5fc8e17ce396f4dfcdf5dab5 - sha256: 89fd09bdc9d9a608387fd80b19fd084f26309d7857bd9a3957216a718f58b3de + md5: df6d2b9af30a1cca57b65514af77aeb9 + sha256: 166352179c0be643a1b103a3e504f8704cbc528bf7d9723b28429cbf3ee36bfe manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.24.59-pyhd8ed1ab_0.tar.bz2 - version: 1.24.59 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.113-pyhd8ed1ab_0.conda + version: 1.26.113 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5142,13 +5384,13 @@ package: networkx: '' python: '>=3.6' hash: - md5: f47b4fbd862cc05b914d2e4862df72a1 - sha256: 3a7f989bdcb5a6a284d092745892f8f27d15b348a02b95229d258899d418fd82 + md5: 184216409957e082712d750862782903 + sha256: 54e9cf114ca4eaeda91b5bb11a09d4391ba4be8a4fb2911259fc7dc2ec636054 manager: conda name: conda-tree optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/conda-tree-1.1.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/conda-tree-1.1.0-pyhd8ed1ab_2.conda version: 1.1.0 - category: main dependencies: @@ -5181,21 +5423,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.4.2,<2.4.3' - aiohttp: '' - fsspec: 2023.3.0 - python: '>=3.8' - hash: - md5: 53b2e3e80df2a18eb74d53729b9464f2 - sha256: 2737102a9d3d538dccf22fc32e32e2ec608d69c2a002a1f137091b9611bf5d6e - manager: conda - name: s3fs - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/s3fs-2023.3.0-pyhd8ed1ab_0.conda - version: 2023.3.0 - category: main dependencies: livereload: '>=2.3.0' @@ -5225,19 +5452,20 @@ package: version: '4.1' - category: main dependencies: - boto3: ~=1.5 - jsonschema: ~=3.2 - python: '>=3.6' - six: ~=1.15 + boto3: '>=1.19.5,<2' + jsonschema: '>=3.2,<5' + pydantic: ~=1.10.2 + python: '>=3.7' + typing_extensions: ~=4.4.0 hash: - md5: 6a8ad721f4edea85a40070c78f379dd4 - sha256: d9b2ff5fdf1e8de7cf80f2a14a7cb76c65c0bae18a2fe51700e6ed3c71fdb5b5 + md5: a2ff8ae9166304e1d92de1d0a27c685f + sha256: b31c644b69c40dd6054dd3b7fb37a4842787e424363cdbef58f0277ac7cf8f53 manager: conda name: aws-sam-translator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.55.0-pyhd8ed1ab_0.conda - version: 1.55.0 + url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.64.0-pyhd8ed1ab_0.conda + version: 1.64.0 - category: main dependencies: azure-core: '>=1.11.0,<2.0.0' @@ -5261,14 +5489,14 @@ package: python: '' typing_extensions: '' hash: - md5: 009fa15810ae5d376e1bd29ab93c1081 - sha256: 380426f97ae074ad86a1b52bb106e1f10e868bc8b7c575bea6ea5ac7725bc84d + md5: 7c21abb869df9bd06d48ef16a2b0ba6f + sha256: 3c8a8e4bbbce0568d7c7c80afc32267ccd72abdc721fe58fc091d06cbfdfae32 manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.95-pyhd8ed1ab_0.conda - version: 1.26.95 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.114-pyhd8ed1ab_0.conda + version: 1.26.114 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5309,28 +5537,42 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: 0c79de238c80f668f5a4e85a2ca1dced - sha256: 348b0bdb9d9fcfdfc24c43ea93a29e2c5aba7f8d0e5570517e965c758c380419 + md5: ce2ab763906935235cb7c8b3e9277fed + sha256: c861637ebae5ba4fd193c2ea0dd0216cb5e1fff9924e118d45775a06930048ee manager: conda name: mypy-boto3-s3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.62-pyhd8ed1ab_0.conda - version: 1.26.62 + url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.104-pyhd8ed1ab_0.conda + version: 1.26.104 - category: main dependencies: boto3: '' python: '>=3.6' typing-extensions: '' hash: - md5: a0ead2e95ffa5942c419234c15463344 - sha256: 7e7bb339939a50d9e682c01938062d2d4e1157a7b034d7f91e44e11d98c0d05d + md5: 93e899cf501d962cfd1b251a45416825 + sha256: ef57856f4313eac453b53a119cedf121bd16fc98c64beaee8e3309959673daea manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.91-pyhd8ed1ab_0.conda - version: 1.26.91 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.106-pyhd8ed1ab_0.conda + version: 1.26.106 +- 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 @@ -5348,24 +5590,26 @@ package: version: 1.2.0 - category: main dependencies: - aws-sam-translator: '>=1.55.0' + aws-sam-translator: '>=1.62.0' jschema-to-python: ~=1.2.3 jsonpatch: '' jsonschema: '>=3.0,<5' junit-xml: ~=1.9 - networkx: ~=2.4 + networkx: ~=2.4,<4 python: '>=3.7' pyyaml: '>5.4' + regex: '' sarif-om: ~=1.0.4 + sympy: '>=1.0.0' hash: - md5: 97bf916949bb4eb9f69c77d365a4da72 - sha256: 7d8c32e83b839abbb4c2a6b476b2a4a60f03394ac6156740f81abba64dbcf756 + md5: 8a4bfed09432193675e0b0811f238162 + sha256: 7baaba7cca293448921fcc8afb7bb61a745dc830f4d616f4221fc061824d8102 manager: conda name: cfn-lint optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.75.1-pyhd8ed1ab_0.conda - version: 0.75.1 + url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.77.0-pyhd8ed1ab_0.conda + version: 0.77.0 - category: main dependencies: aws-xray-sdk: '!=0.96,>=0.93' @@ -5395,14 +5639,14 @@ package: werkzeug: <2.2.0,>=0.5 xmltodict: '' hash: - md5: 702e5d281f691be1bec2f23d1f24fee8 - sha256: 5f7094094ef361b135068b12facdf34c18d2b285c4bd87a935ab1c7e633990ee + md5: 32f26257ac824d26493bf387694eb35d + sha256: 86f6ae6a96d28ca6e1e72790e1bf6d33b2ec1ba9274619283d29a593a34494fe manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.5-pyhd8ed1ab_0.conda - version: 4.1.5 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.7-pyhd8ed1ab_0.conda + version: 4.1.7 - category: main dependencies: {} hash: @@ -5411,6 +5655,7 @@ package: name: mock optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/e6/88/8a05e7ad0bb823246b2add3d2e97f990c41c71a40762c8db77a4bd78eedf/mock-5.0.1-py3-none-any.whl version: 5.0.1 - dependencies: {} @@ -5419,6 +5664,7 @@ package: manager: pip name: pyyaml platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/02/25/6ba9f6bb50a3d4fbe22c1a02554dc670682a07c8701d1716d19ddea2c940/PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl version: '6.0' - category: main @@ -5430,6 +5676,7 @@ package: name: asttokens optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl version: 2.2.1 - category: main @@ -5441,6 +5688,7 @@ package: name: gdspy optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip version: '1.4' - category: main @@ -5453,15 +5701,19 @@ package: name: paramiko-ng optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/9f/53/1ac75eab589149b1e02e38185ecebf09e1b805fc3fdeadbc16d1a2b7d208/paramiko_ng-2.8.10-py2.py3-none-any.whl version: 2.8.10 -- dependencies: +- category: main + dependencies: ruamel.yaml.clib: '>=0.2.6' hash: sha256: 742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 manager: pip name: ruamel.yaml + optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl version: 0.17.21 - category: main @@ -5474,6 +5726,7 @@ package: name: sure optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/dd/ae/eb28ee3b6768e51cb938abcf521cb678217203f33385a2df54d3f23331c5/sure-2.0.1.tar.gz version: 2.0.1 - category: main @@ -5486,6 +5739,7 @@ package: name: fab-classic optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/6b/0f/efc537eebfd2a2c470250c0ac8bd8a05ffc13d95a7fb22021367890d7c46/fab_classic-1.19.2-py2.py3-none-any.whl version: 1.19.2 - category: main @@ -5501,6 +5755,7 @@ package: name: hammer-vlsi optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/53/39/18367e6fb4f20e9ae4fb3097f7b80704ff5cccf62980ea2871ba1d817a74/hammer_vlsi-1.1.0-py3-none-any.whl version: 1.1.0 - category: main @@ -5513,6 +5768,7 @@ package: name: icontract optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/d8/91/9756e7cf0b155e80bf9a62beffdd1dec4afce43cc6ab7f432f2267c62762/icontract-2.6.2-py3-none-any.whl version: 2.6.2 - category: main @@ -5525,6 +5781,7 @@ package: name: pylddwrap optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/c9/12/4afd6542c43cd20271f0e53bf0211decc10079a76a41e53c0288025a7b85/pylddwrap-1.2.2.tar.gz version: 1.2.2 version: 1 From 611de45cb19946aa606e9b34a8069759f7eb9f21 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Sun, 16 Apr 2023 10:10:21 -0700 Subject: [PATCH 05/14] update conda-lock file again --- ...ements-riscv-tools-linux-64.conda-lock.yml | 84 ++++++++----------- 1 file changed, 36 insertions(+), 48 deletions(-) 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 22625f5a13..9e25cb5fa6 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 @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-riscv-tools-linux-64.conda-lock.yml # 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 +# 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 -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# 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 -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml -f /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/chipyard.yaml -f /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 94be5f8cad4026c00d3aef6c3690da6cc358bc79c1f7398049754bd17e861420 + linux-64: 661e3655416e9e5de13d6b7ef41dd4f18c6e4725072890cdc12d17cdbde356bc platforms: - linux-64 sources: @@ -29,6 +29,8 @@ metadata: - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml - /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml - /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml + - /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/chipyard.yaml + - /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -422,7 +424,6 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 - sha256: null manager: conda name: dromajo optional: false @@ -3817,14 +3818,14 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: c63decd397ca639c4b17f6ea5d26bd4d - sha256: 26a56c66c95389e9e2bd95e88f023fd94d4a60e4817bcbe4103f6220d0c17d86 + md5: b3c9bdaa68a0ba7549f67e7f5c766c83 + sha256: f51cfdafac71f7a3bb6e12cc68d7218de29391dd0798768b7775dea444bbdcae manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.3.0-pyha770c72_0.conda - version: 6.3.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.4.1-pyha770c72_0.conda + version: 6.4.1 - category: main dependencies: python: '>=3.7' @@ -4005,14 +4006,14 @@ package: setuptools: '' wheel: '' hash: - md5: 8025ca83b8ba5430b640b83917c2a6f7 - sha256: e1698cbf4964cd60a2885c0edbc654133cd0db5ac4cb568412250e577dbc42ad + md5: 9ccbacfd1cbfa0be00cc345fe5ad8816 + sha256: 781992f04a8c765b1ad29b54fc9f76c12b0864f9defd2869eeb5edff15b51546 manager: conda name: pip optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda - version: 23.0.1 + url: https://conda.anaconda.org/conda-forge/noarch/pip-23.1-pyhd8ed1ab_0.conda + version: '23.1' - category: main dependencies: python: '>=3.6' @@ -4367,16 +4368,16 @@ package: version: 6.0.0 - category: main dependencies: - importlib-metadata: '>=6.3.0,<6.3.1.0a0' + importlib-metadata: '>=6.4.1,<6.4.2.0a0' hash: - md5: 1dee0ac2ed01030b56bdd33eabebc42f - sha256: 0aee044df634fb4d652ecf117b17ab2dd24f8f863334d3010c37e3a96989f0fa + md5: 15b0c51cb977c0243b750687eff917b6 + sha256: 369e704eec7eca35dc10344113c778248b71c26fd17bec51412ca184808966ef manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.3.0-hd8ed1ab_0.conda - version: 6.3.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.4.1-hd8ed1ab_0.conda + version: 6.4.1 - category: main dependencies: attrs: '>=17.4.0' @@ -4402,7 +4403,6 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 - sha256: null manager: conda name: libdwarf optional: false @@ -4621,14 +4621,14 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 39387401b8d302b94a16bb2cf77f6ff8 - sha256: 8deed72652219ab079ec5fd0bae5327a947622dcc40210e88837b62703780ecc + md5: d981f03fa455593256ffa348118cd7d1 + sha256: cd2c92d0ab21305cd1afc9c503495564cf56397816af0a12c84c35fbfc849fba manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.113-pyhd8ed1ab_0.conda - version: 1.29.113 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.114-pyhd8ed1ab_0.conda + version: 1.29.114 - category: main dependencies: clang-format: 16.0.1 default_h62803fd_0 @@ -4723,7 +4723,6 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 - sha256: null manager: conda name: libdwarf-dev optional: false @@ -5077,14 +5076,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 28e3074f0184e908a78dd99ad7206916 - sha256: 3812de59fe902fbd6ca6096bdfd02ccd8300a460948979071e7e45bc7ebbb66c + md5: 3c403408336b409bc12867c0f1416771 + sha256: fd55f823f5649529d84162f4c1543b9fe6308b8d781078aff59a79b6d52e4e50 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.113-pyhd8ed1ab_0.conda - version: 1.29.113 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.114-pyhd8ed1ab_0.conda + version: 1.29.114 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -5331,7 +5330,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.113 + botocore: 1.29.114 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5340,29 +5339,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 3e9e90cd2b4355932b94898eda78783d - sha256: 6eda3942ffb8bd320e5b2ee0538bdb6b2333835653f2990666dc660c4fd3b6ee + md5: 6018d1a712d1982015b748e26975fa80 + sha256: cce05269e07a7709bf1c6808fe771997aebeff75431c0e1592fca2d4154c9ddb manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.113-py310hff52083_0.conda - version: 1.27.113 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.114-py310hff52083_0.conda + version: 1.27.114 - category: main dependencies: - botocore: '>=1.29.113,<1.30.0' + botocore: '>=1.29.114,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: df6d2b9af30a1cca57b65514af77aeb9 - sha256: 166352179c0be643a1b103a3e504f8704cbc528bf7d9723b28429cbf3ee36bfe + md5: e848c71388d684b223b6cc487acb0ff9 + sha256: 7e268ec2c2783d23a32f02170fec03edce32b4ba81a36b410399537d38a343b1 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.113-pyhd8ed1ab_0.conda - version: 1.26.113 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.114-pyhd8ed1ab_0.conda + version: 1.26.114 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5655,7 +5654,6 @@ package: name: mock optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/e6/88/8a05e7ad0bb823246b2add3d2e97f990c41c71a40762c8db77a4bd78eedf/mock-5.0.1-py3-none-any.whl version: 5.0.1 - dependencies: {} @@ -5664,7 +5662,6 @@ package: manager: pip name: pyyaml platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/02/25/6ba9f6bb50a3d4fbe22c1a02554dc670682a07c8701d1716d19ddea2c940/PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl version: '6.0' - category: main @@ -5676,7 +5673,6 @@ package: name: asttokens optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl version: 2.2.1 - category: main @@ -5688,7 +5684,6 @@ package: name: gdspy optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip version: '1.4' - category: main @@ -5701,7 +5696,6 @@ package: name: paramiko-ng optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/9f/53/1ac75eab589149b1e02e38185ecebf09e1b805fc3fdeadbc16d1a2b7d208/paramiko_ng-2.8.10-py2.py3-none-any.whl version: 2.8.10 - category: main @@ -5713,7 +5707,6 @@ package: name: ruamel.yaml optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl version: 0.17.21 - category: main @@ -5726,7 +5719,6 @@ package: name: sure optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/dd/ae/eb28ee3b6768e51cb938abcf521cb678217203f33385a2df54d3f23331c5/sure-2.0.1.tar.gz version: 2.0.1 - category: main @@ -5739,7 +5731,6 @@ package: name: fab-classic optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/6b/0f/efc537eebfd2a2c470250c0ac8bd8a05ffc13d95a7fb22021367890d7c46/fab_classic-1.19.2-py2.py3-none-any.whl version: 1.19.2 - category: main @@ -5755,7 +5746,6 @@ package: name: hammer-vlsi optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/53/39/18367e6fb4f20e9ae4fb3097f7b80704ff5cccf62980ea2871ba1d817a74/hammer_vlsi-1.1.0-py3-none-any.whl version: 1.1.0 - category: main @@ -5768,7 +5758,6 @@ package: name: icontract optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/d8/91/9756e7cf0b155e80bf9a62beffdd1dec4afce43cc6ab7f432f2267c62762/icontract-2.6.2-py3-none-any.whl version: 2.6.2 - category: main @@ -5781,7 +5770,6 @@ package: name: pylddwrap optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/c9/12/4afd6542c43cd20271f0e53bf0211decc10079a76a41e53c0288025a7b85/pylddwrap-1.2.2.tar.gz version: 1.2.2 version: 1 From bb6f8be801537aa538bfc8928b823d8b934d93c4 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Mon, 17 Apr 2023 10:05:11 -0700 Subject: [PATCH 06/14] bump testchipip --- generators/testchipip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/testchipip b/generators/testchipip index aa9170afe1..66ff09f611 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit aa9170afe133e74e1c66b0082dc943e272d9e6f0 +Subproject commit 66ff09f611b7b3af7d9413f216fe9890875b727c From 04f4260901e7a0a740074a4ffebd67a6b31fe5e8 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Mon, 17 Apr 2023 10:05:30 -0700 Subject: [PATCH 07/14] rm wrong assertion --- scripts/uniqify-module-names.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py index 260f8fd3da..d6fd6929e7 100755 --- a/scripts/uniqify-module-names.py +++ b/scripts/uniqify-module-names.py @@ -75,7 +75,6 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules # has some child to update, but new_file wasn't generated if (new_file is None) and len(childs_to_update) > 0: new_file = os.path.join(args.gcpath, cur_file) - assert(cur_file not in top_fnames) for submodule_name in childs_to_update: if (submodule_name + ".sv") in common_fnames: From 9ce0467bd3808b133ce8c1eb0b6548bce468b007 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 20 Apr 2023 14:26:38 -0700 Subject: [PATCH 08/14] fixes --- common.mk | 5 ++- scripts/uniqify-module-names.py | 68 ++++++++++++++++----------------- variables.mk | 1 + vlsi/sim.mk | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/common.mk b/common.mk index ed02a10e2c..e507140a92 100644 --- a/common.mk +++ b/common.mk @@ -248,6 +248,7 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL --mod-filelist $(MODEL_MODS_FILELIST) \ --gen-collateral-path $(GEN_COLLATERAL_DIR) \ --model-hier-json $(MFC_MODEL_HRCHY_JSON) \ + --out-model-hier-json $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) \ --dut $(TOP) sort -u $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(BB_MODS_FILELIST) > $(ALL_MODS_FILELIST) @@ -259,10 +260,10 @@ $(TOP_BB_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) &: $(BB_MODS_FILELIST) $(MFC_T --out-top-bb-f $(TOP_BB_MODS_FILELIST) \ --out-model-bb-f $(MODEL_BB_MODS_FILELIST) -$(TOP_SMEMS_CONF) $(MODEL_SMEMS_CONF) &: $(MFC_SMEMS_CONF) $(MFC_MODEL_HRCHY_JSON) +$(TOP_SMEMS_CONF) $(MODEL_SMEMS_CONF) &: $(MFC_SMEMS_CONF) $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) $(base_dir)/scripts/split-mems-conf.py \ --in-smems-conf $(MFC_SMEMS_CONF) \ - --in-model-hrchy-json $(MFC_MODEL_HRCHY_JSON) \ + --in-model-hrchy-json $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) \ --dut-module-name $(TOP) \ --model-module-name $(MODEL) \ --out-dut-smems-conf $(TOP_SMEMS_CONF) \ diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py index d6fd6929e7..858c0a19ab 100755 --- a/scripts/uniqify-module-names.py +++ b/scripts/uniqify-module-names.py @@ -5,7 +5,7 @@ import shutil import os import sh - +import datetime parser = argparse.ArgumentParser(description="") @@ -13,28 +13,35 @@ parser.add_argument("--mod-filelist", type=str, required=True, help="Abs path to ..model.f") parser.add_argument("--gen-collateral-path", dest="gcpath", type=str, required=True, help="Abs path to the gen-collateral directory") parser.add_argument("--model-hier-json", type=str, required=True, help="Path to hierarchy JSON emitted by firtool. Must include DUT as a module.") +parser.add_argument("--out-model-hier-json", type=str, required=True, help="Path to updated hierarchy JSON emitted by this script.") parser.add_argument('--dut', type=str, required=True, help='Name of the DUT module.') args = parser.parse_args() -def get_filelist(filelist): - f = open(filelist, "r") - lines = f.readlines() - f.close() +MODEL_SFX=str(datetime.date.today().year) - fnames = [] - for line in lines: - try: - fname = line.split("/")[-1].replace("\n", "") - fnames.append(fname) - except: - print(f"Something is wrong about this line {line}") +def bash(cmd): + fail = os.system(cmd) + if fail: + print(f'[*] failed to execute {cmd}') + sys.exit(1) + else: + print(cmd) +def get_filelist(filelist): + fnames = [] + with open(filelist) as f: + lines = f.readlines() + for line in lines: + try: + fname = line.split("/")[-1].strip() + fnames.append(fname) + except: + print(f"Something is wrong about this line '{line}'") return fnames def update_filelist(cur_file, new_file): - sh.sed("-i", f"s/\b{cur_file}\b/{new_file}/", os.path.join(args.gcpath, args.mod_filelist)) - + bash(f"echo \"{args.gcpath}/{new_file}\" >> {os.path.join(args.gcpath, args.mod_filelist)}") def generate_copy(c, sfx): (cur_name, ext) = os.path.splitext(c) @@ -45,23 +52,20 @@ def generate_copy(c, sfx): new_file = os.path.join(args.gcpath, new_file) shutil.copy(cur_file, new_file) - sh.sed("-i", f"s/\b{cur_name}\b/{new_name}/", new_file) + bash(f"sed -i s/\"module {cur_name}\"/\"module {new_name}\"/ {new_file}") return new_file - - -def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules): +def dfs_update_modules(tree, common_fnames, visited, top_fnames): # List of direct submodules to update childs_to_update = list() for child in tree['instances']: # We don't have to change stuff that are under the dut if (child['module_name'] == args.dut) or (child['module_name'] in visited): continue - if dfs_update_modules(child, common_fnames, visited, top_fnames, updated_modules): + if dfs_update_modules(child, common_fnames, visited, top_fnames): childs_to_update.append(child['module_name']) if (child['module_name'] + ".sv") in common_fnames: - child['module_name'] = child['module_name'] + "_Model" - updated_modules.append(child['module_name']) + child['module_name'] = child['module_name'] + "_" + MODEL_SFX cur_module = tree['module_name'] cur_file = cur_module + ".sv" @@ -69,7 +73,7 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules # cur_file is in the common list, generate a new file if cur_file in common_fnames: - new_file = generate_copy(cur_file, "Model") + new_file = generate_copy(cur_file, MODEL_SFX) update_filelist(cur_file, os.path.basename(new_file)) # has some child to update, but new_file wasn't generated @@ -78,29 +82,23 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames, updated_modules for submodule_name in childs_to_update: if (submodule_name + ".sv") in common_fnames: - sh.sed("-i", f"s/\b{submodule_name}\b/{submodule_name}_Model/", new_file) + bash(f"sed -i s/\"{submodule_name}\"/\"{submodule_name}_{MODEL_SFX}\"/ {new_file}") visited.add(cur_module) return (new_file is not None) - def main(): top_fnames = set(get_filelist(args.top_filelist)) mod_fnames = set(get_filelist(args.mod_filelist)) common_fnames = top_fnames.intersection(mod_fnames) - imhj = open(args.model_hier_json, "r") - imhj_data = json.load(imhj) - - visited = set() - updated_modules = list() - dfs_update_modules(imhj_data, common_fnames, visited, top_fnames, updated_modules) - - out_file = open(args.model_hier_json, "w") - json.dump(imhj_data, out_file, indent=2) - out_file.close() - + with open(args.model_hier_json) as imhj: + imhj_data = json.load(imhj) + with open(args.out_model_hier_json, "w+") as out_file: + visited = set() + dfs_update_modules(imhj_data, common_fnames, visited, top_fnames) + json.dump(imhj_data, out_file, indent=2) if __name__ == "__main__": main() diff --git a/variables.mk b/variables.mk index eb9620f25b..1f659ac7ca 100644 --- a/variables.mk +++ b/variables.mk @@ -162,6 +162,7 @@ SFC_ANNO_FILE ?= $(build_dir)/$(long_name).sfc.anno.json # firtool compiler outputs MFC_TOP_HRCHY_JSON ?= $(build_dir)/top_module_hierarchy.json MFC_MODEL_HRCHY_JSON ?= $(build_dir)/model_module_hierarchy.json +MFC_MODEL_HRCHY_JSON_UNIQUIFIED ?= $(build_dir)/model_module_hierarchy.uniquified.json MFC_SMEMS_CONF ?= $(build_dir)/$(long_name).mems.conf # hardcoded firtool outputs MFC_FILELIST = $(GEN_COLLATERAL_DIR)/filelist.f diff --git a/vlsi/sim.mk b/vlsi/sim.mk index 1f5b530d3b..13a7fcc3e0 100644 --- a/vlsi/sim.mk +++ b/vlsi/sim.mk @@ -10,7 +10,7 @@ $(SIM_CONF): $(sim_common_files) echo " top_module: $(VLSI_TOP)" >> $@ echo " tb_name: ''" >> $@ # don't specify -top echo " input_files:" >> $@ - for x in $$(comm -23 <(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) <(sort $(VLSI_RTL))) $(MODEL_SMEMS_FILE) $(SIM_FILE_REQS); do \ + for x in $$(cat $(MODEL_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) | sort -u) $(MODEL_SMEMS_FILE) $(SIM_FILE_REQS); do \ echo ' - "'$$x'"' >> $@; \ done echo " input_files_meta: 'append'" >> $@ From 41592fdad1c02b17da59054a8f156b3c13bbfd2e Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 20 Apr 2023 16:16:51 -0700 Subject: [PATCH 09/14] address comments --- common.mk | 3 ++- scripts/uniqify-module-names.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index e507140a92..213e37e531 100644 --- a/common.mk +++ b/common.mk @@ -249,7 +249,8 @@ $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILEL --gen-collateral-path $(GEN_COLLATERAL_DIR) \ --model-hier-json $(MFC_MODEL_HRCHY_JSON) \ --out-model-hier-json $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) \ - --dut $(TOP) + --dut $(TOP) \ + --model $(MODEL) sort -u $(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(BB_MODS_FILELIST) > $(ALL_MODS_FILELIST) $(TOP_BB_MODS_FILELIST) $(MODEL_BB_MODS_FILELIST) &: $(BB_MODS_FILELIST) $(MFC_TOP_HRCHY_JSON) $(FINAL_ANNO_FILE) diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py index 858c0a19ab..b573dfc6d9 100755 --- a/scripts/uniqify-module-names.py +++ b/scripts/uniqify-module-names.py @@ -4,7 +4,6 @@ import argparse import shutil import os -import sh import datetime @@ -14,11 +13,12 @@ parser.add_argument("--gen-collateral-path", dest="gcpath", type=str, required=True, help="Abs path to the gen-collateral directory") parser.add_argument("--model-hier-json", type=str, required=True, help="Path to hierarchy JSON emitted by firtool. Must include DUT as a module.") parser.add_argument("--out-model-hier-json", type=str, required=True, help="Path to updated hierarchy JSON emitted by this script.") -parser.add_argument('--dut', type=str, required=True, help='Name of the DUT module.') +parser.add_argument("--dut", type=str, required=True, help="Name of the DUT module.") +parser.add_argument("--model", type=str, required=True, help="Name of the Model module.") args = parser.parse_args() -MODEL_SFX=str(datetime.date.today().year) +MODEL_SFX=args.model + "_UNIQUIFIED" def bash(cmd): fail = os.system(cmd) From 10e641344bd77f270bc9046be3d3805393250b6e Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 20 Apr 2023 16:17:40 -0700 Subject: [PATCH 10/14] Revert "update conda-lock file again" This reverts commit 611de45cb19946aa606e9b34a8069759f7eb9f21. --- ...ements-riscv-tools-linux-64.conda-lock.yml | 84 +++++++++++-------- 1 file changed, 48 insertions(+), 36 deletions(-) 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 9e25cb5fa6..22625f5a13 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 @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-riscv-tools-linux-64.conda-lock.yml # 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 +# 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 -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml -f /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/chipyard.yaml -f /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# 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 -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,7 +21,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 661e3655416e9e5de13d6b7ef41dd4f18c6e4725072890cdc12d17cdbde356bc + linux-64: 94be5f8cad4026c00d3aef6c3690da6cc358bc79c1f7398049754bd17e861420 platforms: - linux-64 sources: @@ -29,8 +29,6 @@ metadata: - /bwrcq/C/harrisonliew/chipyard-new-hammer/conda-reqs/riscv-tools.yaml - /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml - /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml - - /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/chipyard.yaml - - /Users/joonhohwangbo/Documents/UCB-BAR/coding/chipyard/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -424,6 +422,7 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 + sha256: null manager: conda name: dromajo optional: false @@ -3818,14 +3817,14 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: b3c9bdaa68a0ba7549f67e7f5c766c83 - sha256: f51cfdafac71f7a3bb6e12cc68d7218de29391dd0798768b7775dea444bbdcae + md5: c63decd397ca639c4b17f6ea5d26bd4d + sha256: 26a56c66c95389e9e2bd95e88f023fd94d4a60e4817bcbe4103f6220d0c17d86 manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.4.1-pyha770c72_0.conda - version: 6.4.1 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.3.0-pyha770c72_0.conda + version: 6.3.0 - category: main dependencies: python: '>=3.7' @@ -4006,14 +4005,14 @@ package: setuptools: '' wheel: '' hash: - md5: 9ccbacfd1cbfa0be00cc345fe5ad8816 - sha256: 781992f04a8c765b1ad29b54fc9f76c12b0864f9defd2869eeb5edff15b51546 + md5: 8025ca83b8ba5430b640b83917c2a6f7 + sha256: e1698cbf4964cd60a2885c0edbc654133cd0db5ac4cb568412250e577dbc42ad 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.0.1-pyhd8ed1ab_0.conda + version: 23.0.1 - category: main dependencies: python: '>=3.6' @@ -4368,16 +4367,16 @@ package: version: 6.0.0 - category: main dependencies: - importlib-metadata: '>=6.4.1,<6.4.2.0a0' + importlib-metadata: '>=6.3.0,<6.3.1.0a0' hash: - md5: 15b0c51cb977c0243b750687eff917b6 - sha256: 369e704eec7eca35dc10344113c778248b71c26fd17bec51412ca184808966ef + md5: 1dee0ac2ed01030b56bdd33eabebc42f + sha256: 0aee044df634fb4d652ecf117b17ab2dd24f8f863334d3010c37e3a96989f0fa manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.4.1-hd8ed1ab_0.conda - version: 6.4.1 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.3.0-hd8ed1ab_0.conda + version: 6.3.0 - category: main dependencies: attrs: '>=17.4.0' @@ -4403,6 +4402,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 + sha256: null manager: conda name: libdwarf optional: false @@ -4621,14 +4621,14 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: d981f03fa455593256ffa348118cd7d1 - sha256: cd2c92d0ab21305cd1afc9c503495564cf56397816af0a12c84c35fbfc849fba + md5: 39387401b8d302b94a16bb2cf77f6ff8 + sha256: 8deed72652219ab079ec5fd0bae5327a947622dcc40210e88837b62703780ecc manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.114-pyhd8ed1ab_0.conda - version: 1.29.114 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.113-pyhd8ed1ab_0.conda + version: 1.29.113 - category: main dependencies: clang-format: 16.0.1 default_h62803fd_0 @@ -4723,6 +4723,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 + sha256: null manager: conda name: libdwarf-dev optional: false @@ -5076,14 +5077,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 3c403408336b409bc12867c0f1416771 - sha256: fd55f823f5649529d84162f4c1543b9fe6308b8d781078aff59a79b6d52e4e50 + md5: 28e3074f0184e908a78dd99ad7206916 + sha256: 3812de59fe902fbd6ca6096bdfd02ccd8300a460948979071e7e45bc7ebbb66c manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.114-pyhd8ed1ab_0.conda - version: 1.29.114 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.113-pyhd8ed1ab_0.conda + version: 1.29.113 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -5330,7 +5331,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.114 + botocore: 1.29.113 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5339,29 +5340,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 6018d1a712d1982015b748e26975fa80 - sha256: cce05269e07a7709bf1c6808fe771997aebeff75431c0e1592fca2d4154c9ddb + md5: 3e9e90cd2b4355932b94898eda78783d + sha256: 6eda3942ffb8bd320e5b2ee0538bdb6b2333835653f2990666dc660c4fd3b6ee manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.114-py310hff52083_0.conda - version: 1.27.114 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.113-py310hff52083_0.conda + version: 1.27.113 - category: main dependencies: - botocore: '>=1.29.114,<1.30.0' + botocore: '>=1.29.113,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: e848c71388d684b223b6cc487acb0ff9 - sha256: 7e268ec2c2783d23a32f02170fec03edce32b4ba81a36b410399537d38a343b1 + md5: df6d2b9af30a1cca57b65514af77aeb9 + sha256: 166352179c0be643a1b103a3e504f8704cbc528bf7d9723b28429cbf3ee36bfe manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.114-pyhd8ed1ab_0.conda - version: 1.26.114 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.113-pyhd8ed1ab_0.conda + version: 1.26.113 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5654,6 +5655,7 @@ package: name: mock optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/e6/88/8a05e7ad0bb823246b2add3d2e97f990c41c71a40762c8db77a4bd78eedf/mock-5.0.1-py3-none-any.whl version: 5.0.1 - dependencies: {} @@ -5662,6 +5664,7 @@ package: manager: pip name: pyyaml platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/02/25/6ba9f6bb50a3d4fbe22c1a02554dc670682a07c8701d1716d19ddea2c940/PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl version: '6.0' - category: main @@ -5673,6 +5676,7 @@ package: name: asttokens optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl version: 2.2.1 - category: main @@ -5684,6 +5688,7 @@ package: name: gdspy optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip version: '1.4' - category: main @@ -5696,6 +5701,7 @@ package: name: paramiko-ng optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/9f/53/1ac75eab589149b1e02e38185ecebf09e1b805fc3fdeadbc16d1a2b7d208/paramiko_ng-2.8.10-py2.py3-none-any.whl version: 2.8.10 - category: main @@ -5707,6 +5713,7 @@ package: name: ruamel.yaml optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl version: 0.17.21 - category: main @@ -5719,6 +5726,7 @@ package: name: sure optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/dd/ae/eb28ee3b6768e51cb938abcf521cb678217203f33385a2df54d3f23331c5/sure-2.0.1.tar.gz version: 2.0.1 - category: main @@ -5731,6 +5739,7 @@ package: name: fab-classic optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/6b/0f/efc537eebfd2a2c470250c0ac8bd8a05ffc13d95a7fb22021367890d7c46/fab_classic-1.19.2-py2.py3-none-any.whl version: 1.19.2 - category: main @@ -5746,6 +5755,7 @@ package: name: hammer-vlsi optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/53/39/18367e6fb4f20e9ae4fb3097f7b80704ff5cccf62980ea2871ba1d817a74/hammer_vlsi-1.1.0-py3-none-any.whl version: 1.1.0 - category: main @@ -5758,6 +5768,7 @@ package: name: icontract optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/d8/91/9756e7cf0b155e80bf9a62beffdd1dec4afce43cc6ab7f432f2267c62762/icontract-2.6.2-py3-none-any.whl version: 2.6.2 - category: main @@ -5770,6 +5781,7 @@ package: name: pylddwrap optional: false platform: linux-64 + source: null url: https://files.pythonhosted.org/packages/c9/12/4afd6542c43cd20271f0e53bf0211decc10079a76a41e53c0288025a7b85/pylddwrap-1.2.2.tar.gz version: 1.2.2 version: 1 From 776419e6aebd95a8afe70812dff7c96a0987dccb Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 20 Apr 2023 16:17:52 -0700 Subject: [PATCH 11/14] Revert "add sh to conda env" This reverts commit 632a8957ffd7666e8fdea566a1ff30b7d913b416. --- conda-reqs/chipyard.yaml | 1 - ...ements-riscv-tools-linux-64.conda-lock.yml | 1135 +++++++---------- 2 files changed, 439 insertions(+), 697 deletions(-) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index 7b928cae64..59c5de5147 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -39,7 +39,6 @@ dependencies: - coreutils - jq - pip - - sh # firemarshal deps - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock 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 22625f5a13..ca4c96d264 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 @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-riscv-tools-linux-64.conda-lock.yml # 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 +# 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 -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml -f /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# 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 metadata: channels: - url: ucb-bar @@ -21,14 +21,12 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 94be5f8cad4026c00d3aef6c3690da6cc358bc79c1f7398049754bd17e861420 + linux-64: 1a7b0ae002798a28682d700644302284790c06503a7d3d04caa019aa74da7123 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/joonho.whangbo/coding/circt-fix-cy/conda-reqs/chipyard.yaml - - /scratch/joonho.whangbo/coding/circt-fix-cy/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -187,14 +185,14 @@ package: - category: main dependencies: {} hash: - md5: 0299e410bfb4300540bdc0012a7985ef - sha256: 8572efb7092c72fe7b73d2a0f1e5e27159a8edea0371e1bef533bcb7d85b19c6 + md5: 7697d37e29669a14b053e82fad22a16b + sha256: ac993fa2774b90befcd6aba55b1c08853b2fa3b818753094c09bebd35fc55532 manager: conda name: open_pdks.sky130a optional: false platform: linux-64 - url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.406_0_g0c37b7c-20230412_103222.tar.bz2 - version: 1.0.406_0_g0c37b7c + url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.402_1_g12df12e-20230225_164303.tar.bz2 + version: 1.0.402_1_g12df12e - category: main dependencies: {} hash: @@ -209,14 +207,14 @@ package: - category: main dependencies: {} hash: - md5: 939e3e74d8be4dac89ce83b20de2492a - sha256: 0449138224adfa125b220154408419ec37c06b0b49f63c5954724325903ecf55 + md5: 51fc4fcfb19f5d95ffc8c339db5068e8 + sha256: 0bfae0b9962bc0dbf79048f9175b913ed4f53c4310d06708dc7acbb290ad82f6 manager: conda name: tzdata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/tzdata-2023c-h71feb2d_0.conda - version: 2023c + url: https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda + version: 2022g - category: main dependencies: font-ttf-dejavu-sans-mono: '' @@ -422,13 +420,25 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 - sha256: null manager: conda name: dromajo optional: false platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/dromajo-1.0.0-0_h1234567_g6a6e34e.tar.bz2 version: 1.0.0 +- category: main + dependencies: + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + hash: + md5: c4fbad8d4bddeb3c085f18cbf97fbfad + sha256: b44db0b92ae926b3fbbcd57c179fceb64fa11a9f9d09082e03be58b74dcad832 + manager: conda + name: expat + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-h27087fc_0.tar.bz2 + version: 2.5.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -518,17 +528,17 @@ package: version: '1.12' - category: main dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' + libgcc-ng: '>=10.3.0' + libstdcxx-ng: '>=10.3.0' hash: - md5: 7c8d20d847bb45f56bd941578fcfa146 - sha256: e44cc00eec068e7f7a6dd117ba17bf5d57658729b7b841945546f82505138292 + md5: 87473a15119779e021c314249d4b4aed + sha256: 1d7950f3be4637ab915d886304e57731d39a41ab705ffc95c4681655c459374a manager: conda name: icu optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/icu-72.1-hcb278e6_0.conda - version: '72.1' + url: https://conda.anaconda.org/conda-forge/linux-64/icu-70.1-h27087fc_0.tar.bz2 + version: '70.1' - category: main dependencies: libgcc-ng: '>=12' @@ -582,14 +592,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: 6aa9c9de5542ecb07fdda9ca626252d8 - sha256: 949d84ceea543802c1e085b2aa58f1d6cb5dd8cec5a9abaaf4e8ac65d6094b3a + md5: 5cc781fd91968b11a8a7fdbee0982676 + sha256: f9983a8ea03531f2c14bce76c870ca325c0fddf0c4e872bff1f78bc52624179c manager: conda name: libdeflate optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.18-h0b41bf4_0.conda - version: '1.18' + url: https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.17-h0b41bf4_0.conda + version: '1.17' - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -602,18 +612,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2 version: '4.33' -- category: main - dependencies: - libgcc-ng: '>=12' - hash: - md5: 6305a3dd2752c76335295da4e581f2fd - sha256: 74c98a563777ae2ad71f1f74d458a8ab043cee4a513467c159ccf159d0e461f3 - manager: conda - name: libexpat - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda - version: 2.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -650,18 +648,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2 version: '1.17' -- category: main - dependencies: - libgcc-ng: '>=12' - hash: - md5: 1edd9e67bdb90d78cea97733ff6b54e6 - sha256: b19de7bda34eac4fa931be11fa8d7640cdf1441dfd51c91786586a4a4c64c92f - manager: conda - name: libjpeg-turbo - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-2.1.5.1-h0b41bf4_0.conda - version: 2.1.5.1 - category: main dependencies: libgcc-ng: '>=9.4.0' @@ -750,16 +736,16 @@ package: version: 0.9.10 - category: main dependencies: - libgcc-ng: '>=12' + libgcc-ng: '>=9.3.0' hash: - md5: 40b61aab5c7ba9ff276c41cfffe6b80b - sha256: 787eb542f055a2b3de553614b25f09eefb0a0931b0c87dbcce6efdfd92f04f18 + md5: 772d69f030955d9646d3d0eaf21d859d + sha256: 54f118845498353c936826f8da79b5377d23032bcac8c4a02de2019e26c3f6b3 manager: conda name: libuuid optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda - version: 2.38.1 + url: https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2 + version: 2.32.1 - category: main dependencies: libgcc-ng: '>=12' @@ -776,14 +762,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: 0d4a7508d8c6c65314f2b9c1f56ad408 - sha256: ac3e073ea77803da71eb77e7fcef07defb345bda95eee3327c73ddf85b5714da + md5: ac2ccf7323d21f2994e4d1f5da664f37 + sha256: 221f2e138dd264b7394b88f08884d93825d38800a51415059e813c02467abfd1 manager: conda name: libwebp-base optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.3.0-h0b41bf4_0.conda - version: 1.3.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.4-h166bdaf_0.tar.bz2 + version: 1.2.4 - category: main dependencies: libgcc-ng: '>=12' @@ -968,15 +954,15 @@ package: version: '6.0' - category: main dependencies: - libgcc-ng: '>=12' + libgcc-ng: '>=7.3.0' hash: - md5: 76d6bc123c1c75bf034c412856fcc935 - sha256: e94d0d5f75a5f58165ad8ac64a25df851c77ec6e9bf626c16807dcbd740226c8 + md5: 2e5f1a8199794b21c9472c1a7f27e21a + sha256: a3ee6c02932fbee32babe39fa6bda9f781d6dc17122d2a90e62ff2b6866a5de8 manager: conda name: which optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/which-2.21-h0b41bf4_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/which-2.21-h516909a_0.tar.bz2 version: '2.21' - category: main dependencies: @@ -1149,19 +1135,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/dtc-1.6.1-h166bdaf_2.tar.bz2 version: 1.6.1 -- category: main - dependencies: - libexpat: 2.5.0 hcb278e6_1 - libgcc-ng: '>=12' - hash: - md5: 8b9b5aca60558d02ddaa09d599e55920 - sha256: 36dfeb4375059b3bba75ce9b38c29c69fd257342a79e6cf20e9f25c1523f785f - manager: conda - name: expat - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-hcb278e6_1.conda - version: 2.5.0 - category: main dependencies: gettext: '' @@ -1400,20 +1373,20 @@ package: version: '1.13' - category: main dependencies: - icu: '>=72.1,<73.0a0' + icu: '>=70.1,<71.0a0' libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' hash: - md5: 241845899caff54ac1d2b3102ad988cf - sha256: 624b6e29e23a51353cff2aff7364c42b831139afd131d239e79f60aea4dae887 + md5: bb808b654bdc3c783deaf107a2ffb503 + sha256: d4170f1fe356768758b13a51db123f990bff81b0eae0d5a0ba11c7ca6b9536f4 manager: conda name: libxml2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.4-hfdac1af_0.conda - version: 2.10.4 + url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda + version: 2.10.3 - category: main dependencies: libgcc-ng: '>=7.3.0' @@ -1499,14 +1472,14 @@ package: libgcc-ng: '>=12' ncurses: '>=6.3,<7.0a0' hash: - md5: 47d31b792659ce70f470b5c82fdfb7a4 - sha256: 5435cf39d039387fbdc977b0a762357ea909a7694d9528ab40f005e9208744d7 + md5: db2ebbe2943aae81ed051a6a9af8e0fa + sha256: f5f383193bdbe01c41cb0d6f99fec68e820875e842e6e8b392dbe1a9b6c43ed8 manager: conda name: readline optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda - version: '8.2' + url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.1.2-h0f457ee_0.tar.bz2 + version: 8.1.2 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -1616,17 +1589,17 @@ package: version: '2.71' - category: main dependencies: - libgcc-ng: '>=12' - readline: '>=8.2,<9.0a0' + libgcc-ng: '>=10.3.0' + readline: '>=8.1,<9.0a0' hash: - md5: 23b559a791d63ba4f51906763eb6bc53 - sha256: a7b2ea50068d86ac6e3749f76b118b15947d3f5ce48535eb5ab2ff7e22659c49 + md5: 54d1a374b75f14ecc58aea8c4236c0c3 + sha256: 6415903ad8774fc0f1bf5b156ae0b6f9988427a0f14bb35467c5938f05fe8707 manager: conda name: bash optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/bash-5.2.15-hfbf034d_0.conda - version: 5.2.15 + url: https://conda.anaconda.org/conda-forge/linux-64/bash-5.1.16-hd863ed2_0.tar.bz2 + version: 5.1.16 - category: main dependencies: flex: '' @@ -1712,13 +1685,13 @@ package: dependencies: gcc_impl_linux-64: 12.2.0.* hash: - md5: c241b4f6676222c2feefc9dc4b9d1728 - sha256: f4b4184cc3e0864abadfc5b06ae869b479e736ff1dc46723967256d11b5bc7c4 + md5: b4d86475bd1a21d139ea78770f606471 + sha256: 3cfb989723f8e115d35553c2b1d899b0f4185fc0551a996b9ff4037083a36432 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_11.tar.bz2 version: 12.2.0 - category: main dependencies: @@ -1847,39 +1820,23 @@ package: 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 - 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 -- category: main - dependencies: + jpeg: '>=9e,<10a' lerc: '>=4.0.0,<5.0a0' - libdeflate: '>=1.18,<1.19.0a0' + libdeflate: '>=1.17,<1.18.0a0' libgcc-ng: '>=12' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libstdcxx-ng: '>=12' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.2.4,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 4e5ee4b062c21519efbee7e2ae608748 - sha256: caacb23e1b95fbdd8115be69228f9c82068ed87bf57f055027e31d093ae6a1a2 + md5: 2e648a34072eb39d7c4fc2a9981c5f0c + sha256: e3e18d91fb282b61288d4fd2574dfa31f7ae90ef2737f96722fb6ad3257862ee manager: conda name: libtiff optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-ha587672_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-h6adf6a1_2.conda version: 4.5.0 - category: main dependencies: @@ -1924,20 +1881,20 @@ package: libuuid: '>=2.32.1,<3.0a0' libzlib: '>=1.2.13,<1.3.0a0' ncurses: '>=6.3,<7.0a0' - openssl: '>=3.1.0,<4.0a0' - readline: '>=8.2,<9.0a0' + openssl: '>=3.0.7,<4.0a0' + readline: '>=8.1.2,<9.0a0' tk: '>=8.6.12,<8.7.0a0' tzdata: '' xz: '>=5.2.6,<6.0a0' hash: - md5: de25afc7041c103c7f510c746bb63435 - sha256: 67748307da3fa057d17d4e991f3c60f87595a517b98f4b323a17b5f3dc287159 + md5: 3cb3e91b3fe66baa68a12c85f39b9b40 + sha256: 073878d7cc9c7e25cf04983d02e6d44b531d47e0166258cbce964dd78bb716a9 manager: conda name: python optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.10-he550d4f_0_cpython.conda - version: 3.10.10 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.9-he550d4f_0_cpython.conda + version: 3.10.9 - category: main dependencies: libgcc-ng: '>=12' @@ -2033,14 +1990,14 @@ package: dependencies: python: '>=3.6' hash: - md5: 99b19895abe40280358488acb9589532 - sha256: 2b273efc522834e4c8563da7998b9b683eed467660fe8a5a3c24d58aaa85a9cb + md5: b3c15cb1d45fd10bc6f652bbc51e023a + sha256: 8dbc6de55113ea67a64f0be5d16ba939d1b58a25dbd9a5cc62b571cef24ef85c 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.2-pyhd8ed1ab_0.conda + version: 3.0.2 - category: main dependencies: libgcc-ng: '>=12' @@ -2246,14 +2203,14 @@ package: dependencies: python: '>=3.7' hash: - md5: ec5503e4e3142adde6061c54db438b51 - sha256: ceb2394be6276bb321e05741094568efc0421374713ff3c8226c09283ea2af65 + md5: 6f90f1dc834447823b11d155726fcb37 + sha256: 6a6901f20c5b4d81aebd25a0645b3578ebb6a323f9fd7e87ee05ecbcfe19069e manager: conda name: filelock optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.11.0-pyhd8ed1ab_0.conda - version: 3.11.0 + url: https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.0-pyhd8ed1ab_0.conda + version: 3.10.0 - category: main dependencies: expat: '>=2.5.0,<3.0a0' @@ -2288,30 +2245,29 @@ package: dependencies: python: '>=3.8' hash: - md5: a993e42df87a292d8fd7396a2e2a8d75 - sha256: c2a5db01537aae91a54dbd163b85421de2b623c75803af4e38ea01ba000317d1 + md5: 0db48a2f5a68e28e5af8d3df276f2255 + sha256: dfcee90620d13f4f667664620191d780c79ec7e9ba9908cd771d24a1361e0cc9 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.3.0-pyhd8ed1ab_1.conda + version: 2023.3.0 - category: main dependencies: + jpeg: '>=9e,<10a' libgcc-ng: '>=12' libglib: '>=2.74.1,<3.0a0' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libtiff: '>=4.5.0,<4.6.0a0' - libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: ee8220db21db8094998005990418fe5b - sha256: 7acc699871310e9a89aaa7e90de9ac949e2fa649232c8a8dfcafa67e8f36a266 + md5: 1a109126a43003d65b39c1cad656bc9b + sha256: a27f49d85e0a730374cc77606e9484b23b0f3edf32df1994b6d7ff5dd44aef92 manager: conda name: gdk-pixbuf optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h6b639ba_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h05c8ddd_0.conda version: 2.42.10 - category: main dependencies: @@ -2349,13 +2305,13 @@ package: gcc: 12.2.0.* gxx_impl_linux-64: 12.2.0.* hash: - md5: 56e0d282569b6cd349035a1bb5efae47 - sha256: b428f0af395194cb327fb212167efc3a837866d11b9f1a8bbad7e953c595c6cb + md5: 2b54322e0dbb1345d64913e8b20b7d7c + sha256: f6c390055f2846d6013160c41dece0973daf577c5f1aaa73ff5dcf597b35d0ec 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_11.tar.bz2 version: 12.2.0 - category: main dependencies: @@ -2483,31 +2439,17 @@ package: version: 1.4.4 - category: main dependencies: + jpeg: '>=9e,<10a' libgcc-ng: '>=12' - python: '>=3.10,<3.11.0a0' - python_abi: 3.10.* *_cp310 - hash: - md5: 8664f43451412071a7111211fe7e38f2 - sha256: a26e8c55b8d1b17e784c6e2ffa75ed4dec4a335c7df17f183dcc9c5149d6cd70 - manager: conda - name: lazy-object-proxy - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/lazy-object-proxy-1.9.0-py310h1fa729e_0.conda - version: 1.9.0 -- category: main - dependencies: - libgcc-ng: '>=12' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libtiff: '>=4.5.0,<4.6.0a0' hash: - md5: 980d8aca0bc23ca73fa8caa3e7c84c28 - sha256: 0d88e0e7f8dbf8f01788e21dd63dd49b89433ce7dfd10f53839441396f6481cd + md5: aa8840cdf17ef0c6084d1e24abc7a28b + sha256: 443e926b585528112ec6aa4d85bf087722914ed8d85a2f75ae47c023c55c4238 manager: conda name: lcms2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-haa2dc70_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hfd0df8a_0.conda version: '2.15' - category: main dependencies: @@ -2527,31 +2469,18 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' - libstdcxx-ng: '>=12' - hash: - md5: 2c00ecf8081a8f23043b055a68d7ba90 - sha256: 5f3eb78832674b8038dd65c80d09837a01f3300bf516370fc16650f33b8b87ed - 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 -- category: main - dependencies: - libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm15: '>=15.0.7,<15.1.0a0' libstdcxx-ng: '>=12' + libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 48c2eb0c9988c76ad34c47910fee3077 - sha256: aa4a685e98221cee06b6de93c9ac8efc329c648fdbbffbdd02f41cb1d228b3d8 + md5: a3a0f7a6f0885f5e1e0ec691566afb77 + sha256: e48481c37d02aefeddcfac20d48cf13b838c5f7b9018300fa7eac404d30f3d7f 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-15.0.7-default_h3e3d535_1.conda + version: 15.0.7 - category: main dependencies: krb5: '>=1.20.1,<1.21.0a0' @@ -2613,20 +2542,20 @@ package: - category: main dependencies: giflib: '>=5.2.1,<5.3.0a0' + jpeg: '>=9e,<10a' libgcc-ng: '>=12' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libtiff: '>=4.5.0,<4.6.0a0' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.2.4,<2.0a0' hash: - md5: 9cfd7ad6e1539ca1ad172083586b3301 - sha256: 461fe2c0279309c21f206f114f3bd6592e906ef6f8cc181b2e28482941b8b925 + md5: 77003f63d1763c1e6569a02c1742c9f4 + sha256: 43d563a16fe9db32b7d0be8d89968005f21139e9285dfe1fbfe9ae6647f1cc9f manager: conda name: libwebp optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.3.0-hb47c5f0_0.conda - version: 1.3.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h1daa5a0_1.conda + version: 1.2.4 - category: main dependencies: python: '' @@ -2665,18 +2594,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/more-itertools-9.1.0-pyhd8ed1ab_0.conda version: 9.1.0 -- category: main - dependencies: - python: '>=3.6' - hash: - md5: dbf6e2d89137da32fa6670f3bffc024e - sha256: a4f025c712ec1502a55c471b56a640eaeebfce38dd497d5a1a33729014cac47a - manager: conda - name: mpmath - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mpmath-1.3.0-pyhd8ed1ab_0.conda - version: 1.3.0 - category: main dependencies: libgcc-ng: '>=12' @@ -2780,14 +2697,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 91cda59e66e1e4afe9476f8ef98f5c30 - sha256: ded536a96a00d45a693dbc2971bb688248324dadd129eddda2100e177583d768 + md5: 1ff2e3ca41f0ce16afec7190db28288b + sha256: 00288f5e5e841711e8b8fef1f1242c858d8ef99ccbe5d7e0df4789d5d8d40645 manager: conda name: packaging optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/packaging-23.1-pyhd8ed1ab_0.conda - version: '23.1' + url: https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda + version: '23.0' - category: main dependencies: python: '>=2.7' @@ -2800,18 +2717,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pastel-0.2.1-pyhd8ed1ab_0.tar.bz2 version: 0.2.1 -- category: main - dependencies: - python: '>=3.7' - hash: - md5: f3e7301de38fd621c902faf8087bc564 - sha256: 7258b7f6a8e5fcd5e5a22e0a85b89e03e9cf5049d1591bc98420fd080007f25d - manager: conda - name: pathable - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pathable-0.4.3-pyhd8ed1ab_0.tar.bz2 - version: 0.4.3 - category: main dependencies: python: '>=3.6' @@ -2824,18 +2729,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pkginfo-1.9.6-pyhd8ed1ab_0.conda version: 1.9.6 -- category: main - dependencies: - python: '>=3.6' - hash: - md5: 89e3c7cdde7d3aaa2aee933b604dd07f - sha256: 7d055ffc8a02bf781a89d069db3454b453605cdaff300b82cedcc7133283e47e - manager: conda - name: pkgutil-resolve-name - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2 - version: 1.3.10 - category: main dependencies: python: '>=3.8' @@ -2903,7 +2796,7 @@ package: version: 0.6.4 - category: main dependencies: - python: ==2.7.*|>=3.4 + python: 2.7.*|>=3.4 hash: md5: 076becd9e05608f8dc72757d5f3a91ff sha256: 74c63fd03f1f1ea2b54e8bc529fd1a600aaafb24027b738d0db87909ee3a33dc @@ -2913,18 +2806,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2 version: '2.21' -- category: main - dependencies: - python: '>=3.7' - hash: - md5: bd9547b9d70225f536627ac755ce8f56 - sha256: 6ab547ac8299513341e502cb3b80f4daf07dd92c7a6eb1858b801c4e1ce405c5 - manager: conda - name: pygments - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.15.0-pyhd8ed1ab_0.conda - version: 2.15.0 - category: main dependencies: python: '>=3.6' @@ -2992,26 +2873,14 @@ package: dependencies: python: '>=3.6' hash: - md5: 2590495f608a63625e165915fb4e2e34 - sha256: 0108888507014fb24573c31e4deceb61c99e63d37776dddcadd7c89b2ecae0b6 - manager: conda - name: python-tzdata - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.3-pyhd8ed1ab_0.conda - version: '2023.3' -- category: main - dependencies: - python: '>=3.6' - hash: - md5: d3076b483092a435832603243567bc31 - sha256: e4999484f21763ca4b8f92c95b22cb6d1edc1b61d0a2bb073ee2bd11f39401b9 + md5: f59d49a7b464901cf714b9e7984d01a2 + sha256: 93cfc7a92099e26b0575a343da4a667b52371cc38e4dee4ee264dc041ef77bac manager: conda name: pytz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytz-2023.3-pyhd8ed1ab_0.conda - version: '2023.3' + url: https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda + version: 2022.7.1 - category: main dependencies: __unix: '' @@ -3040,20 +2909,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py310h5764c6d_4.tar.bz2 version: 5.4.1 -- category: main - dependencies: - libgcc-ng: '>=12' - python: '>=3.10,<3.11.0a0' - python_abi: 3.10.* *_cp310 - hash: - md5: 684679589ab49049183640b15554be5d - sha256: 82ecf2ebd4a689101d979ff94ef0cf9f1d41ada82ded1d4861ad1b31fc921f32 - manager: conda - name: regex - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/regex-2023.3.23-py310h1fa729e_0.conda - version: 2023.3.23 - category: main dependencies: __glibc: '>=2.17,<3.0.a0' @@ -3106,27 +2961,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 6c443cccff3daa3d83b2b807b0a298ce - sha256: 6595024174d318848468c0e61899ff3c2f08a3545c85727b9a2871d6f8d0062a + md5: e18ed61c37145bb9b48d1d98801960f7 + sha256: a5c48b1fc7c89c5c937475e9434a63af7ce2e591f8e51afd56e3b2e232a9989d 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 -- category: main - dependencies: - __unix: '' - python: '>=3.8.1' - hash: - md5: 25c245540888eb278acfc05b1c1734d7 - sha256: 689ea9a1e0f3701248ad8721da8944c722b9df8fa2cf654a3a5636ff387c477e - manager: conda - name: sh - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sh-2.0.3-pyhd8ed1ab_0.conda - version: 2.0.3 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda + version: 67.6.0 - category: main dependencies: python: '' @@ -3289,38 +3131,38 @@ package: dependencies: python: '>=3.6' hash: - md5: 2010a97e7298197221abc6295790ff62 - sha256: 5fb56cd0652e7cffc1141c66b09644f1dde588ef6dddcb47849a62d7b0186846 + md5: a4d6202101f04b76d545530728e696bf + sha256: 8e490e1d390be0ab59b538199b4cedec027c68ebaa3add554a6316a79d5a1dbe manager: conda name: types-pytz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-pytz-2023.3.0.0-pyhd8ed1ab_0.conda - version: 2023.3.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/types-pytz-2022.7.1.2-pyhd8ed1ab_0.conda + version: 2022.7.1.2 - category: main dependencies: python: '>=3.6' hash: - md5: 0c0c5edec27d8284bf75023737f74823 - sha256: 10290d04934693214ea9a3caaefac35c3fdfc72094ffa8b0f063141bef469bbe + md5: d398b385822d9425fb21c6c8f89dbc9e + sha256: 32233b8d558c118b9d856c6b7e52499c36b9f867bbf76b5c8b7edfb7655230cf manager: conda name: types-pyyaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.9-pyhd8ed1ab_0.conda - version: 6.0.12.9 + url: https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.8-pyhd8ed1ab_0.conda + version: 6.0.12.8 - category: main dependencies: python: '>=3.6' hash: - md5: 1c44c106ac42fde5774d31e37220f4df - sha256: b9df570c65f14a002a3972bf9e9ed0c0ef8ff6a29087ba8d6be6493bfd1ea8ef + md5: 617bb6391b4b676f9b062aff31ef978d + sha256: 17f157579b6f0e9c2ef56e3d9c74eef625717865f8503101317cedc69f059b46 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 + url: https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.8-pyhd8ed1ab_0.conda + version: 1.26.25.8 - category: main dependencies: python: '>=3' @@ -3337,14 +3179,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 2d93b130d148d7fc77e583677792fc6a - sha256: 70c57b5ac94cd32e78f1a2fa2c38572bfac85b901a6a99aa254a9e8e126c132d + md5: 43e7d9e50261fb11deb76e17d8431aac + sha256: f81eee64fcdfb379e27d01773b34041fbf7f9e86f33b157c9925d19e0a442452 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2 - version: 4.4.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda + version: 4.5.0 - category: main dependencies: libgcc-ng: '>=12' @@ -3377,6 +3219,24 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/verilator-4.226-he0ac6c6_1.tar.bz2 version: '4.226' +- category: main + dependencies: + gettext: '>=0.21.1,<1.0a0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + ncurses: '>=6.3,<7.0a0' + perl: '>=5.32.1,<5.33.0a0 *_perl5' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 + hash: + md5: 7cd55a1679e39c90e105c216d12af54b + sha256: fc189bde7d79ec70de87f176756b6cc04d9008c3e0de5d66f8832f7f9c85274c + manager: conda + name: vim + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.0814-py310pl5321hade1898_0.tar.bz2 + version: 9.0.0814 - category: main dependencies: python: '' @@ -3493,23 +3353,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2 version: 0.9.10 -- category: main - dependencies: - libgcc-ng: '>=9.3.0' - xorg-kbproto: '' - xorg-libice: 1.0.* - xorg-libsm: 1.2.* - xorg-libx11: '>=1.7.0,<2.0a0' - xorg-xproto: '' - hash: - md5: 60d6eec5273f1c9af096c10c268912e3 - sha256: 25bfc4d86df3498b88aac2f02ecf65e739bf99a687805c31a635df6f2e60a163 - manager: conda - name: xorg-libxt - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxt-1.2.1-h7f98852_2.tar.bz2 - version: 1.2.1 - category: main dependencies: python: '>=3.7' @@ -3563,30 +3406,30 @@ package: version: 2.12.1 - category: main dependencies: - fontconfig: '>=2.14.2,<3.0a0' + fontconfig: '>=2.13.96,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' - icu: '>=72.1,<73.0a0' + icu: '>=70.1,<71.0a0' libgcc-ng: '>=12' - libglib: '>=2.74.1,<3.0a0' - libpng: '>=1.6.39,<1.7.0a0' + libglib: '>=2.72.1,<3.0a0' + libpng: '>=1.6.38,<1.7.0a0' libxcb: '>=1.13,<1.14.0a0' - libzlib: '>=1.2.13,<1.3.0a0' + libzlib: '>=1.2.12,<1.3.0a0' pixman: '>=0.40.0,<1.0a0' xorg-libice: '' xorg-libsm: '' - xorg-libx11: '>=1.8.4,<2.0a0' - xorg-libxext: '>=1.3.4,<2.0a0' + xorg-libx11: '' + xorg-libxext: '' xorg-libxrender: '' - zlib: '' + zlib: '>=1.2.12,<1.3.0a0' hash: - md5: 0c944213e40c9e4aa32292776b9c6903 - sha256: 0be3064cb30e3e69a47370abae85b2780cd81fbca00cbd17076d40c0f6302fdb + md5: d1a88f3ed5b52e1024b80d4bcd26a7a0 + sha256: f062cf56e6e50d3ad4b425ebb3765ca9138c6ebc52e6a42d1377de8bc8d954f6 manager: conda name: cairo optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-h35add3b_1015.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2 version: 1.16.0 - category: main dependencies: @@ -3620,21 +3463,6 @@ package: 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' - libstdcxx-ng: '>=12' - hash: - md5: cc2343dad8afb0b3d9cc368da2d58e22 - sha256: a3ae4c803ff00cdf74984c02ac8279e39861bb4aad16854c18a81792936714ac - 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 - category: main dependencies: click: '' @@ -3665,9 +3493,8 @@ package: - category: main dependencies: bzip2: '>=1.0.8,<2.0a0' - expat: '' - libcurl: '>=7.88.1,<9.0a0' - libexpat: '>=2.5.0,<3.0a0' + expat: '>=2.5.0,<3.0a0' + libcurl: '>=7.88.1,<8.0a0' libgcc-ng: '>=12' libstdcxx-ng: '>=12' libuv: '' @@ -3678,14 +3505,14 @@ package: zlib: '' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 6edec767268ad8451d27bb65f38c7ea4 - sha256: 3bb9d7c35d5297d85516769eb0517c83f7fc2ed7ab944a8c028871bb375bed51 + md5: 02142080aee43c8ef90db543ffbc13dd + sha256: cbd17c0375a021b7de854e0841f3f1b28b1359bc52bdc0ba5aabaee0f65a0b7d manager: conda name: cmake optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.3-h077f3f9_0.conda - version: 3.26.3 + url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.0-h077f3f9_0.conda + version: 3.26.0 - category: main dependencies: libgcc-ng: '>=12' @@ -3738,7 +3565,7 @@ package: dependencies: bzip2: '>=1.0.8,<2.0a0' libarchive: '>=3.5.2,<3.6.0a0' - libcurl: '>=7.82.0,<9.0a0' + libcurl: '>=7.82.0,<8.0a0' libgcc-ng: '>=10.3.0' libmicrohttpd: '>=0.9.75,<0.10.0a0' libstdcxx-ng: '>=10.3.0' @@ -3764,14 +3591,14 @@ package: python_abi: 3.10.* *_cp310 unicodedata2: '>=14.0.0' hash: - md5: 4f39f656d6ff2761d698e69af952be82 - sha256: 9c3765958a18d9bfc33e42d78a554aff00041d3da474db3045d6ce95ef6a4643 + md5: 3b354798e12b65fa8ebe1d189de6a507 + sha256: 20b42570005cd3f6d961efa3ac1e389ef763a94224406a6f33121824390f5b71 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.3-py310h1fa729e_0.conda - version: 4.39.3 + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py310h1fa729e_0.conda + version: 4.39.2 - category: main dependencies: python: '>=3.4' @@ -3817,27 +3644,14 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: c63decd397ca639c4b17f6ea5d26bd4d - sha256: 26a56c66c95389e9e2bd95e88f023fd94d4a60e4817bcbe4103f6220d0c17d86 + md5: 30b3127c385ca2ed5ef87f3d53d466bc + sha256: 4fe127138487a2aa171862407605f0cd601d005f85e0eee7f38c770b407e4145 manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.3.0-pyha770c72_0.conda - version: 6.3.0 -- category: main - dependencies: - python: '>=3.7' - zipp: '>=3.1.0' - hash: - md5: e5fd2260a231ee63b6969f4801082f2b - sha256: 091cca3e010f7a7353152f0abda2d68cfd83ddde80a15e974d9e18b2047e7be2 - manager: conda - name: importlib_resources - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda - version: 5.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda + version: 6.1.0 - category: main dependencies: more-itertools: '' @@ -3909,26 +3723,26 @@ package: - category: main dependencies: expat: '>=2.5.0,<3.0a0' - fontconfig: '>=2.14.2,<3.0a0' + fontconfig: '>=2.14.1,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' - icu: '>=72.1,<73.0a0' + icu: '>=70.1,<71.0a0' + jpeg: '>=9e,<10a' libgcc-ng: '>=12' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libtiff: '>=4.5.0,<4.6.0a0' libwebp: '' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.2.4,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' zlib: '' hash: - md5: ef06bee47510a7f5db3c2297a51d6ce2 - sha256: 6335db21afc72f86cf4ee0298acde3af950087db2b24df3d28a81c7d24574244 + md5: 82ef57611ace65b59db35a9687264572 + sha256: 6674781023188deeda7752e5dc429a54fd1639c9d61cbb25296cbbb55367884a manager: conda name: libgd optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-hfa28ad5_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h5aea950_4.conda version: 2.3.3 - category: main dependencies: @@ -3955,14 +3769,14 @@ package: tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: 7696ac5b7bc40cd66e483f16ee652243 - sha256: 20901dc450437d7e583c1c8e63321bdaf105e6703a41f9d3a6d5551a0707bcfc + md5: 7f519094ddab6b939cf6dae229c3b17b + sha256: d58fd7f0c34995d5dd829eff8b4261e782b65a6bb50f072919f0d0002fd35a77 manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.2.0-py310h1fa729e_0.conda - version: 1.2.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.1.1-py310h1fa729e_0.conda + version: 1.1.1 - category: main dependencies: python: 2.7|>=3.7 @@ -3979,11 +3793,11 @@ package: - category: main dependencies: freetype: '>=2.12.1,<3.0a0' - lcms2: '>=2.15,<3.0a0' + jpeg: '>=9e,<10a' + lcms2: '>=2.14,<3.0a0' libgcc-ng: '>=12' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libtiff: '>=4.5.0,<4.6.0a0' - libwebp-base: '>=1.3.0,<2.0a0' + libwebp-base: '>=1.2.4,<2.0a0' libxcb: '>=1.13,<1.14.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' @@ -3991,14 +3805,14 @@ package: python_abi: 3.10.* *_cp310 tk: '>=8.6.12,<8.7.0a0' hash: - md5: 58ea77873883be5b59328e29ca50997e - sha256: ca081b2a1af2dcab802dece28ac1a95e873c9ee278bbd50a5c2882b621dd0d99 + md5: bbea829b541aa15df5c65bd40b8c1981 + sha256: 6d17af4c8bc8d8668d033725dd4691cfac86fdf0f46f655ab6f5df3e3ae0bb7c manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py310h065c6d2_0.conda - version: 9.5.0 + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py310h023d228_1.conda + version: 9.4.0 - category: main dependencies: python: '>=3.7' @@ -4013,6 +3827,38 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda version: 23.0.1 +- category: main + dependencies: + python: '>=3.6' + setuptools: '' + hash: + md5: c78cd16b11cd6a295484bd6c8f24bea1 + sha256: e8710e24f60b6a97289468f47914e53610101755088bc237621cc1980edbfcd9 + manager: conda + name: pygments + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda + version: 2.14.0 +- category: main + dependencies: + attrs: '>=19.2.0' + colorama: '' + exceptiongroup: '' + iniconfig: '' + packaging: '' + pluggy: '>=0.12,<2.0' + python: '>=3.8' + tomli: '>=1.0.0' + hash: + md5: 60958b19354e0ec295b43f6ab5cfab86 + sha256: d074ef1e2ffc3334927c281e4b79aebfa8eefd2d1588c3830a45ba4bce3e6ea9 + manager: conda + name: pytest + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda + version: 7.2.2 - category: main dependencies: python: '>=3.6' @@ -4045,19 +3891,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/qemu-5.0.0-hb15d774_0.tar.bz2 version: 5.0.0 -- category: main - dependencies: - python: '>=3.5' - six: '' - hash: - md5: fed45fc5ea0813240707998abe49f520 - sha256: 7c7052b51de0b5c558f890bb11f8b5edbb9934a653d76be086b1182b9f54185d - manager: conda - name: rfc3339-validator - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2 - version: 0.1.4 - category: main dependencies: pyasn1: '>=0.1.3' @@ -4089,32 +3922,17 @@ package: version: 0.17.21 - category: main dependencies: - __unix: '' - gmpy2: '>=2.0.8' - mpmath: '>=0.19' - python: '>=3.8' - hash: - md5: 3893579a690fcd781c3dcedfd019bb9f - sha256: 8b5eb459c905758f96829ad93eb118f9b7cbbad8e9bc2b3328552abb7c658ec4 - manager: conda - name: sympy - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sympy-1.11.1-pypyh9d50eac_103.conda - version: 1.11.1 -- category: main - dependencies: - python: '>=3.7' - typing: '>=3.7,<4.0' + python: '>=3.6' + typing: '>=3.6,<4.0' hash: - md5: 547d15e217a398578900787bf39ef01d - sha256: fd3747a968670b3db2e017102860d2087d193fdd99ebd17c6496ff4ec9287a5b + md5: 471bf9e605820b59988e830382b8d654 + sha256: e8b3bc2203266636740ce10536ef951c52b53b43bfed3b938117547efc47e374 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/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2 + version: 0.11.6 - category: main dependencies: colorama: '' @@ -4133,46 +3951,26 @@ package: python: '>=3.6' types-urllib3: <1.27 hash: - md5: 856c0ae2398368dba2555354564d5228 - sha256: caacc1f5c91c39754611cd74cdc3b34a87efa5963d38c937fc927960586c18dd + md5: 35221b6d2f75276b786fb53fac5c4c35 + sha256: 54b0949b6fcdbdc36474dd3403a926b55331de6c1ea543c1d87f444f7fa8702a 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.28.11.15-pyhd8ed1ab_0.conda + version: 2.28.11.15 - category: main dependencies: - typing_extensions: 4.4.0 pyha770c72_0 + typing_extensions: 4.5.0 pyha770c72_0 hash: - md5: be969210b61b897775a0de63cd9e9026 - sha256: 6f129b1bc18d111dcf3abaec6fcf6cbee00f1b77bb42d0f0bc8d85f8faa65cf0 + md5: b3c594fde1a80a1fc3eb9cc4a5dfe392 + sha256: 6da5e15fa533620ae2e7aca9a7d16013eed3a73ac64c47d7c3bf3deec39b63b9 manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2 - version: 4.4.0 -- category: main - dependencies: - gettext: '>=0.21.1,<1.0a0' - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - ncurses: '>=6.3,<7.0a0' - perl: '>=5.32.1,<5.33.0a0 *_perl5' - python: '>=3.10,<3.11.0a0' - python_abi: 3.10.* *_cp310 - xorg-libx11: '>=1.8.4,<2.0a0' - xorg-libxt: '' - hash: - md5: 895f3629b577b0581598259037f40f2a - sha256: b208a6e91286a20c7ea0b21c15c56092051db953004efd20efed6e5624d360ca - 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 - version: 9.0.1425 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda + version: 4.5.0 - category: main dependencies: libgcc-ng: '>=9.3.0' @@ -4252,36 +4050,37 @@ 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-15: 15.0.7 default_had23c3d_1 + libclang-cpp15: '>=15.0.7,<15.1.0a0' libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm15: '>=15.0.7,<15.1.0a0' libstdcxx-ng: '>=12' + libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 00d5150c0a2e28a2d32eceb23425b989 - sha256: 6205ff6e3545d6084103a9885bb173af652326c6927ac5008154ea664e3981c1 + md5: 841d93c086f15b68916b3455711c2638 + sha256: 517c759576600decafd005b14f3df9660b525fdb85645a0c588ea979b62bdc5e 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-15.0.7-default_had23c3d_1.conda + version: 15.0.7 - category: main dependencies: cffi: '>=1.12' libgcc-ng: '>=12' - openssl: '>=3.1.0,<4.0a0' + openssl: '>=3.0.8,<4.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: 991a12eccbca3c9897c62f44b1104a54 - sha256: 692b0394bb3104ec117faa0130d67109a0132e9bd57084ebfde81fc2b9790e58 + md5: 99dc5a02a8b16cd88ca9a12354496e78 + sha256: 23d3015849c45febab3085ecf2cc193c0966c1e2348756722b776f1cedea8596 manager: conda name: cryptography optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-40.0.2-py310h34c0648_0.conda - version: 40.0.2 + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.2-py310h34c0648_0.conda + version: 39.0.2 - category: main dependencies: cloudpickle: '' @@ -4321,17 +4120,17 @@ package: libgcc-ng: '>=12' libiconv: '>=1.17,<2.0a0' libzlib: '>=1.2.13,<1.3.0a0' - openssl: '>=3.1.0,<4.0a0' + openssl: '>=3.0.8,<4.0a0' pcre2: '>=10.40,<10.41.0a0' perl: 5.* hash: - md5: 06b9b63f77ee1dea0d3a0c97f839385a - sha256: 3734da309ef157024b69fb01947fa71a04dfd8ca798eba962e8575da9ebfac9a + md5: 70fd89375d9b5ca90c15dcf3662b1b42 + sha256: fba1e93848c20e29d205726142fb37ad7e2be785699f98aac348524080354f6d 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 + url: https://conda.anaconda.org/conda-forge/linux-64/git-2.40.0-pl5321h693f4a3_0.conda version: 2.40.0 - category: main dependencies: @@ -4352,49 +4151,48 @@ package: cairo: '>=1.16.0,<2.0a0' freetype: '>=2.12.1,<3.0a0' graphite2: '' - icu: '>=72.1,<73.0a0' + icu: '>=70.1,<71.0a0' libgcc-ng: '>=12' libglib: '>=2.74.1,<3.0a0' libstdcxx-ng: '>=12' hash: - md5: 73d2c2d25fdcec40c24929bab9f44831 - sha256: d4bf8a3e23478efefe39ac2d965f44b55cee4058277f2ad7478384e7973fc97f + md5: 448fe40d2fed88ccf4d9ded37cbb2b38 + sha256: f300fcb390253d6d63346ee71e56f82bc830783d1682ac933fe9ac86f39da942 manager: conda name: harfbuzz optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h3ff4399_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h8e241bc_0.conda version: 6.0.0 - category: main dependencies: - importlib-metadata: '>=6.3.0,<6.3.1.0a0' + importlib-metadata: '>=6.1.0,<6.1.1.0a0' hash: - md5: 1dee0ac2ed01030b56bdd33eabebc42f - sha256: 0aee044df634fb4d652ecf117b17ab2dd24f8f863334d3010c37e3a96989f0fa + md5: 90bab1d97fdb6bb40c8e00207bf222dc + sha256: 80a10ad1bacf5bb85d497fd3e5629f5805b6e90ad8c8b923daa3e36729e7429a manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.3.0-hd8ed1ab_0.conda - version: 6.3.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda + version: 6.1.0 - category: main dependencies: attrs: '>=17.4.0' importlib-metadata: '' - importlib_resources: '>=1.4.0' - pkgutil-resolve-name: '>=1.3.10' - pyrsistent: '!=0.17.0,!=0.17.1,!=0.17.2,>=0.14.0' - python: '>=3.7' - typing_extensions: '' + pyrsistent: '>=0.14.0' + python: '>=3.6' + setuptools: '' + six: '>=1.11.0' hash: - md5: 723268a468177cd44568eb8f794e0d80 - sha256: 4f68a23430d1afc5c9b41c46fbac0ade33c0bf57a293c646bfdd6dc65350eada + md5: 66125e28711d8ffc04a207a2b170316d + sha256: d74a3ddd3c3dd9bd7b00110a196e3af90490c5660674f18bfd53a8fdf91de418 manager: conda name: jsonschema optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda - version: 4.17.3 + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-3.2.0-pyhd8ed1ab_3.tar.bz2 + version: 3.2.0 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4402,7 +4200,6 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 - sha256: null manager: conda name: libdwarf optional: false @@ -4443,18 +4240,17 @@ package: numpy: '>=1.21.6,<2.0a0' python: '>=3.10,<3.11.0a0' python-dateutil: '>=2.8.1' - python-tzdata: '>=2022a' python_abi: 3.10.* *_cp310 pytz: '>=2020.1' hash: - md5: 38dd747dcb3403c0958c4f510ed4316e - sha256: 1757d0991592083172a63fc79a576dd16e94cb4a353da4d00ac7280806e5dd30 + md5: 467244b0dbb7da40927ac6ee0e9491de + sha256: 289bdc902fb8c536d8fe1297fdc97bb17f01a9b19ad15d96fc8ba0dbe239a379 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-1.5.3-py310h9b08913_0.conda + version: 1.5.3 - category: main dependencies: pip: '' @@ -4488,14 +4284,14 @@ package: python_abi: 3.10.* *_cp310 typing-extensions: '>=4.2.0' hash: - md5: 6306ca76bc0635d84940349cf8d96264 - sha256: b0d9edaba389b3714bbc59266cfe7e7fef9c7f0bc664f455026455c998129b30 + md5: d84eeeb2a7ef8ef996bb6acdb5ecdeb6 + sha256: 8ea1a03876dcf6432acd88f15cdb64bf4f985ea54599adef552f376cf68cf7a7 manager: conda name: pydantic optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.7-py310h1fa729e_0.conda - version: 1.10.7 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.6-py310h1fa729e_0.conda + version: 1.10.6 - category: main dependencies: cffi: '>=1.4.1' @@ -4515,36 +4311,43 @@ package: version: 1.5.0 - category: main dependencies: - colorama: '' - exceptiongroup: '' - importlib-metadata: '>=0.12' - iniconfig: '' - packaging: '' - pluggy: '>=0.12,<2.0' - python: '>=3.8' - tomli: '>=1.0.0' + pytest: '>=3.6.0' + python: '' hash: - md5: 547c7de697ec99b494a28ddde185b5a4 - sha256: 42f89db577266b9dc195d09189b92f3af3354fb50c98b1f996c580322dffa8b5 + md5: b6764e23dece9f9cda0469af044fafeb + sha256: bdb25a7daf3efb7255b1a19d7b5d41d7d4d96bc647b8e5f7407ec4dd9e384257 manager: conda - name: pytest + name: pytest-dependency optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.3.1-pyhd8ed1ab_0.conda - version: 7.3.1 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-dependency-0.5.1-pyh9f0ad1d_0.tar.bz2 + version: 0.5.1 +- category: main + dependencies: + pytest: '>=5.0' + python: '>=3.7' + hash: + md5: db93caa9fe182f0cd20291aeb22f57ac + sha256: 87bb8edc9976403237a0e6c3bd7b2224c346c95e4c7345971f411aef21593450 + manager: conda + name: pytest-mock + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2 + version: 3.10.0 - category: main dependencies: pip: '' python: '>=3.7,<4.0' hash: - md5: 093158575159054e73bb3e58f3be95f2 - sha256: 1189b96bc4307c371143f43a7deae839f0e73c04ff9df02bd5fc7dd6f248bafd + md5: 25923bf9620c56f8bc0d4923d870edd8 + sha256: 3f8be46ba1cbd8533d25eba1a5b32062bb9231b16e308bbbc92b5e32177cbdad manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.14-pyhd8ed1ab_0.conda - version: 0.16.14 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.13-pyhd8ed1ab_0.conda + version: 0.16.13 - category: main dependencies: cffi: '' @@ -4621,31 +4424,32 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 39387401b8d302b94a16bb2cf77f6ff8 - sha256: 8deed72652219ab079ec5fd0bae5327a947622dcc40210e88837b62703780ecc + md5: 96971bc5cc944a1743fdde0634e55480 + sha256: fee2b0596dd34a70081d745e06f9302dd06fb56dd366e51a302f93c9764126d9 manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.113-pyhd8ed1ab_0.conda - version: 1.29.113 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.94-pyhd8ed1ab_0.conda + version: 1.29.94 - 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: 15.0.7 default_had23c3d_1 + libclang: '>=15.0.7,<15.1.0a0' + libclang-cpp15: '>=15.0.7,<15.1.0a0' libgcc-ng: '>=12' - libllvm16: '>=16.0.1,<16.1.0a0' + libllvm15: '>=15.0.7,<15.1.0a0' libstdcxx-ng: '>=12' + libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 6fa41767486e911517c03bb069b9f5fa - sha256: a0acf37ed406a66e72577d40b52185488644a9a1ce56a99823c3318f9900260b + md5: c23e2b0154fb2eb92442fa8ecbcf571c + sha256: d9931c1ce5907073de0269666881309cc896267723f38ef269101bd211e49062 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-15.0.7-default_had23c3d_1.conda + version: 15.0.7 - category: main dependencies: python: '>=3.7' @@ -4678,18 +4482,18 @@ package: python: '>=3.6' ukkonen: '' hash: - md5: b8d16e273396a0115199a83769a39246 - sha256: 45cbad9e8329b33d348c536ef0c49fb1811261201072e3d536199c106562d607 + md5: b5ada314668cded097e08fea86262317 + sha256: 88bcba64d462867b5759e29784cf24685e1e49fffea75452b94d438d6bd9587c 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.21-pyhd8ed1ab_0.conda + version: 2.5.21 - category: main dependencies: importlib_metadata: '' - python: ==2.7.*|>=3.5 + python: 2.7.*|>=3.5 hash: md5: 35f19fabdfd44c8b53889be95333848c sha256: d497c6f3b064d3dd8b76f277ea8d6a507acfe8cb04e31811baf66d8c533b8c08 @@ -4699,22 +4503,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/jsonpickle-2.2.0-pyhd8ed1ab_0.tar.bz2 version: 2.2.0 -- category: main - dependencies: - jsonschema: '>=4.0.0,<4.18.0' - pathable: '>=0.4.1,<0.5.0' - python: '>=3.6' - pyyaml: '>=5.1' - typing_extensions: '>=4.3.0,<5.0.0' - hash: - md5: eff09facc908d5619097edd090678347 - sha256: 9ed0cbf1fec505c4ed2238453b42c964f8f85baa30490daeb84dbf5afd65c0b1 - manager: conda - name: jsonschema-spec - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-spec-0.1.4-pyhd8ed1ab_0.conda - version: 0.1.4 - category: main dependencies: elfutils: '>=0.187,<0.188.0a0' @@ -4723,7 +4511,6 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 - sha256: null manager: conda name: libdwarf-dev optional: false @@ -4732,47 +4519,45 @@ package: version: 0.0.0.20190110_28_ga81397fc4 - category: main dependencies: - attrs: '>=19.2.0' - jsonschema: '>=4.0.0,<4.18.0' + jsonschema: '>=3.0.0,<5.0.0' python: '>=3.7' - rfc3339-validator: '' hash: - md5: 6294c4a75fdeeca454e99abbea3f250a - sha256: 6b6fff6441e2673a822793776217f1c07d595ad7a73e7b631c7aeb8ac6663041 + md5: 277aff70bb1def188c9c016ba4564e23 + sha256: 0c2f971f86211f2b6db431de9d8ab4c9e38eed5422bd06f93cd8be3cbb882a2c manager: conda name: openapi-schema-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.4.4-pyhd8ed1ab_0.conda - version: 0.4.4 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-schema-validator-0.2.3-pyhd8ed1ab_0.tar.bz2 + version: 0.2.3 - category: main dependencies: alsa-lib: '>=1.2.8,<1.2.9.0a0' - fontconfig: '>=2.14.2,<3.0a0' + fontconfig: '>=2.14.1,<3.0a0' fonts-conda-ecosystem: '' freetype: '>=2.12.1,<3.0a0' giflib: '>=5.2.1,<5.3.0a0' harfbuzz: '>=6.0.0,<7.0a0' - lcms2: '>=2.15,<3.0a0' + jpeg: '>=9e,<10a' + lcms2: '>=2.14,<3.0a0' libcups: '>=2.3.3,<2.4.0a0' libgcc-ng: '>=12' - libjpeg-turbo: '>=2.1.5.1,<3.0a0' libpng: '>=1.6.39,<1.7.0a0' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - xorg-libx11: '>=1.8.4,<2.0a0' - xorg-libxext: '>=1.3.4,<2.0a0' + xorg-libx11: '' + xorg-libxext: '' xorg-libxi: '' xorg-libxrender: '' xorg-libxtst: '' hash: - md5: 33527b036cd6d369be12fd772cdd49e4 - sha256: 221de13214f051654177dd331c019a889ab1bbe3b2cf30d5cf17596378740359 + md5: 71a5dfe4a375fc43497cdc6f4aedff9d + sha256: baa527e6b59572e00e68c2362e1771f7741f3f062dac7a8c6365a97f48c04413 manager: conda name: openjdk optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h4335b31_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openjdk-17.0.3-h58dac75_5.conda version: 17.0.3 - category: main dependencies: @@ -4811,43 +4596,17 @@ package: version: 3.1.0 - category: main dependencies: - cryptography: '>=38.0.0,<41' + cryptography: '>=38.0.0,<40' python: '>=3.6' hash: - md5: 0b34aa3ab7e7ccb1765a03dd9ed29938 - sha256: 458428cb867f70f2af2a4ed59d382291ea3eb3f10490196070a15d1d71d5432a + md5: d41957700e83bbb925928764cb7f8878 + sha256: adbf8951f22bfa950b9e24394df1ef1d2b2d7dfb194d91c7f42bc11900695785 manager: conda name: pyopenssl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.1.1-pyhd8ed1ab_0.conda - version: 23.1.1 -- category: main - dependencies: - pytest: '>=3.6.0' - python: '' - hash: - md5: b6764e23dece9f9cda0469af044fafeb - sha256: bdb25a7daf3efb7255b1a19d7b5d41d7d4d96bc647b8e5f7407ec4dd9e384257 - manager: conda - name: pytest-dependency - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-dependency-0.5.1-pyh9f0ad1d_0.tar.bz2 - version: 0.5.1 -- category: main - dependencies: - pytest: '>=5.0' - python: '>=3.7' - hash: - md5: db93caa9fe182f0cd20291aeb22f57ac - sha256: 87bb8edc9976403237a0e6c3bd7b2224c346c95e4c7345971f411aef21593450 - manager: conda - name: pytest-mock - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2 - version: 3.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.0.0-pyhd8ed1ab_0.conda + version: 23.0.0 - category: main dependencies: cryptography: '' @@ -5007,21 +4766,20 @@ package: version: 2.54.4 - category: main dependencies: - importlib_resources: '>=5.8.0,<6.0.0' - jsonschema: '>=4.0.0,<4.18.0' - jsonschema-spec: '>=0.1.1,<0.2.0' - lazy-object-proxy: '>=1.7.1,<2.0.0' - openapi-schema-validator: '>=0.4.2,<0.5' + jsonschema: '>=3.2.0,<5.0.0' + openapi-schema-validator: '>=0.2.0,<0.3.0' python: '>=3.7' + pyyaml: '>=5.1' + setuptools: '' hash: - md5: a6e9e3fc7321a5fa6a9344c366e85fac - sha256: db9346beb615afab028631b35752ab12c7172455016aba29d9f8da280431c517 + md5: 5ff3ff67d18fd4938c4ae38c3baf21bb + sha256: 11f24d36001aaba0a7197ff7b9a07ab943d05f969b13e5a9c4ffec13eca19cd0 manager: conda name: openapi-spec-validator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.5.6-pyhd8ed1ab_0.conda - version: 0.5.6 + url: https://conda.anaconda.org/conda-forge/noarch/openapi-spec-validator-0.4.0-pyhd8ed1ab_1.tar.bz2 + version: 0.4.0 - category: main dependencies: cfgv: '>=2.0.0' @@ -5031,14 +4789,14 @@ package: pyyaml: '>=5.1' virtualenv: '>=20.10.0' hash: - md5: c4aab94cab4ddeb340e36d4c670a5f24 - sha256: 4331584fffa05cf3096799c95495ce97563699dc7c4da341e9b1ced96e4f5526 + md5: 9a160452d1d88a9f10c373888f93586b + sha256: 91e104de6854e07a580603a7affb1a6e77823e9d4246486ecfd47d3978839212 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.2.0-pyha770c72_0.conda + version: 3.2.0 - category: main dependencies: __unix: '' @@ -5077,14 +4835,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 28e3074f0184e908a78dd99ad7206916 - sha256: 3812de59fe902fbd6ca6096bdfd02ccd8300a460948979071e7e45bc7ebbb66c + md5: 3faabd8720a81a91566e6c01bf7bbacb + sha256: c677cba87c7027ccf264574a87130bf44f69be008315d2a840ae6cfaa61b7e44 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.113-pyhd8ed1ab_0.conda - version: 1.29.113 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.27.59-pyhd8ed1ab_0.tar.bz2 + version: 1.27.59 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -5117,18 +4875,18 @@ package: - category: main dependencies: certifi: '>=2017.4.17' - charset-normalizer: '>=2,<4' + charset-normalizer: '>=2,<3' idna: '>=2.5,<4' python: '>=3.7,<4.0' urllib3: '>=1.21.1,<1.27' hash: - md5: 3bfbd6ead1d7299ed46dab3a7bf0bc8c - sha256: 9a7c3410970217fa035cca7f72c175989e1c8b22f855b852b9d5fde07c3550dd + md5: 11d178fc55199482ee48d6812ea83983 + sha256: 22c081b4cdd023a514400413f50efdf2c378f56f2a5ea9d65666aacf4696490a manager: conda name: requests optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda version: 2.28.2 - category: main dependencies: @@ -5152,14 +4910,14 @@ package: python: '>=3.4' wrapt: '' hash: - md5: a9f8851a7aad0fa6ec843b1beb95decf - sha256: ad37f3f8a6653fb91354716adec29dfb9f5917b7aa06d77f33af8ea7947eb116 + md5: 2f18ecd9ec078c10f7086ad7ee05289b + sha256: ab3afec58f5368351efac43e813e62f944d41bd879c99e45ad49910aac666447 manager: conda name: aws-xray-sdk optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aws-xray-sdk-2.12.0-pyhd8ed1ab_0.conda - version: 2.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/aws-xray-sdk-2.11.0-pyhd8ed1ab_0.tar.bz2 + version: 2.11.0 - category: main dependencies: python: '>=3.6' @@ -5167,14 +4925,14 @@ package: six: '>=1.11.0' typing-extensions: '>=4.0.1' hash: - md5: f4d871cde207029fbd3059fc4ad76af9 - sha256: 85884ae07cd171b577dba67059b633df5c6ad0a8fff8222de4bf77530426aea6 + md5: e49892b87d27fce696b7118a27558fae + sha256: bb995e74396dc34da1a1f9931f40949979913c7b2802c51c799a604edbb45516 manager: conda name: azure-core optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.26.4-pyhd8ed1ab_0.conda - version: 1.26.4 + url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.26.3-pyhd8ed1ab_0.conda + version: 1.26.3 - category: main dependencies: msgpack-python: '>=0.5.2' @@ -5331,7 +5089,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.113 + botocore: 1.27.59 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5340,29 +5098,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 3e9e90cd2b4355932b94898eda78783d - sha256: 6eda3942ffb8bd320e5b2ee0538bdb6b2333835653f2990666dc660c4fd3b6ee + md5: 7fca00e32e7d64340bebb17799aafd16 + sha256: 118e95635796784bb1d0072d65be0fc1151ba7aca7118a5c79764ff2667301ad manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.113-py310hff52083_0.conda - version: 1.27.113 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.25.60-py310hff52083_0.tar.bz2 + version: 1.25.60 - category: main dependencies: - botocore: '>=1.29.113,<1.30.0' + botocore: '>=1.27.59,<1.28.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: df6d2b9af30a1cca57b65514af77aeb9 - sha256: 166352179c0be643a1b103a3e504f8704cbc528bf7d9723b28429cbf3ee36bfe + md5: ffb13a0a5fc8e17ce396f4dfcdf5dab5 + sha256: 89fd09bdc9d9a608387fd80b19fd084f26309d7857bd9a3957216a718f58b3de manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.113-pyhd8ed1ab_0.conda - version: 1.26.113 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.24.59-pyhd8ed1ab_0.tar.bz2 + version: 1.24.59 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5384,13 +5142,13 @@ package: networkx: '' python: '>=3.6' hash: - md5: 184216409957e082712d750862782903 - sha256: 54e9cf114ca4eaeda91b5bb11a09d4391ba4be8a4fb2911259fc7dc2ec636054 + md5: f47b4fbd862cc05b914d2e4862df72a1 + sha256: 3a7f989bdcb5a6a284d092745892f8f27d15b348a02b95229d258899d418fd82 manager: conda name: conda-tree optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/conda-tree-1.1.0-pyhd8ed1ab_2.conda + url: https://conda.anaconda.org/conda-forge/noarch/conda-tree-1.1.0-pyhd8ed1ab_0.conda version: 1.1.0 - category: main dependencies: @@ -5423,6 +5181,21 @@ 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.4.2,<2.4.3' + aiohttp: '' + fsspec: 2023.3.0 + python: '>=3.8' + hash: + md5: 53b2e3e80df2a18eb74d53729b9464f2 + sha256: 2737102a9d3d538dccf22fc32e32e2ec608d69c2a002a1f137091b9611bf5d6e + manager: conda + name: s3fs + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/s3fs-2023.3.0-pyhd8ed1ab_0.conda + version: 2023.3.0 - category: main dependencies: livereload: '>=2.3.0' @@ -5452,20 +5225,19 @@ package: version: '4.1' - category: main dependencies: - boto3: '>=1.19.5,<2' - jsonschema: '>=3.2,<5' - pydantic: ~=1.10.2 - python: '>=3.7' - typing_extensions: ~=4.4.0 + boto3: ~=1.5 + jsonschema: ~=3.2 + python: '>=3.6' + six: ~=1.15 hash: - md5: a2ff8ae9166304e1d92de1d0a27c685f - sha256: b31c644b69c40dd6054dd3b7fb37a4842787e424363cdbef58f0277ac7cf8f53 + md5: 6a8ad721f4edea85a40070c78f379dd4 + sha256: d9b2ff5fdf1e8de7cf80f2a14a7cb76c65c0bae18a2fe51700e6ed3c71fdb5b5 manager: conda name: aws-sam-translator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.64.0-pyhd8ed1ab_0.conda - version: 1.64.0 + url: https://conda.anaconda.org/conda-forge/noarch/aws-sam-translator-1.55.0-pyhd8ed1ab_0.conda + version: 1.55.0 - category: main dependencies: azure-core: '>=1.11.0,<2.0.0' @@ -5489,14 +5261,14 @@ package: python: '' typing_extensions: '' hash: - md5: 7c21abb869df9bd06d48ef16a2b0ba6f - sha256: 3c8a8e4bbbce0568d7c7c80afc32267ccd72abdc721fe58fc091d06cbfdfae32 + md5: 009fa15810ae5d376e1bd29ab93c1081 + sha256: 380426f97ae074ad86a1b52bb106e1f10e868bc8b7c575bea6ea5ac7725bc84d manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.114-pyhd8ed1ab_0.conda - version: 1.26.114 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.95-pyhd8ed1ab_0.conda + version: 1.26.95 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5537,42 +5309,28 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: ce2ab763906935235cb7c8b3e9277fed - sha256: c861637ebae5ba4fd193c2ea0dd0216cb5e1fff9924e118d45775a06930048ee + md5: 0c79de238c80f668f5a4e85a2ca1dced + sha256: 348b0bdb9d9fcfdfc24c43ea93a29e2c5aba7f8d0e5570517e965c758c380419 manager: conda name: mypy-boto3-s3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.104-pyhd8ed1ab_0.conda - version: 1.26.104 + url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.62-pyhd8ed1ab_0.conda + version: 1.26.62 - category: main dependencies: boto3: '' python: '>=3.6' typing-extensions: '' hash: - md5: 93e899cf501d962cfd1b251a45416825 - sha256: ef57856f4313eac453b53a119cedf121bd16fc98c64beaee8e3309959673daea + md5: a0ead2e95ffa5942c419234c15463344 + sha256: 7e7bb339939a50d9e682c01938062d2d4e1157a7b034d7f91e44e11d98c0d05d 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 -- 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 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.91-pyhd8ed1ab_0.conda + version: 1.26.91 - category: main dependencies: docutils: <0.19 @@ -5590,26 +5348,24 @@ package: version: 1.2.0 - category: main dependencies: - aws-sam-translator: '>=1.62.0' + aws-sam-translator: '>=1.55.0' jschema-to-python: ~=1.2.3 jsonpatch: '' jsonschema: '>=3.0,<5' junit-xml: ~=1.9 - networkx: ~=2.4,<4 + networkx: ~=2.4 python: '>=3.7' pyyaml: '>5.4' - regex: '' sarif-om: ~=1.0.4 - sympy: '>=1.0.0' hash: - md5: 8a4bfed09432193675e0b0811f238162 - sha256: 7baaba7cca293448921fcc8afb7bb61a745dc830f4d616f4221fc061824d8102 + md5: 97bf916949bb4eb9f69c77d365a4da72 + sha256: 7d8c32e83b839abbb4c2a6b476b2a4a60f03394ac6156740f81abba64dbcf756 manager: conda name: cfn-lint optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.77.0-pyhd8ed1ab_0.conda - version: 0.77.0 + url: https://conda.anaconda.org/conda-forge/noarch/cfn-lint-0.75.1-pyhd8ed1ab_0.conda + version: 0.75.1 - category: main dependencies: aws-xray-sdk: '!=0.96,>=0.93' @@ -5639,14 +5395,14 @@ package: werkzeug: <2.2.0,>=0.5 xmltodict: '' hash: - md5: 32f26257ac824d26493bf387694eb35d - sha256: 86f6ae6a96d28ca6e1e72790e1bf6d33b2ec1ba9274619283d29a593a34494fe + md5: 702e5d281f691be1bec2f23d1f24fee8 + sha256: 5f7094094ef361b135068b12facdf34c18d2b285c4bd87a935ab1c7e633990ee manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.7-pyhd8ed1ab_0.conda - version: 4.1.7 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.5-pyhd8ed1ab_0.conda + version: 4.1.5 - category: main dependencies: {} hash: @@ -5655,7 +5411,6 @@ package: name: mock optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/e6/88/8a05e7ad0bb823246b2add3d2e97f990c41c71a40762c8db77a4bd78eedf/mock-5.0.1-py3-none-any.whl version: 5.0.1 - dependencies: {} @@ -5664,7 +5419,6 @@ package: manager: pip name: pyyaml platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/02/25/6ba9f6bb50a3d4fbe22c1a02554dc670682a07c8701d1716d19ddea2c940/PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl version: '6.0' - category: main @@ -5676,7 +5430,6 @@ package: name: asttokens optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl version: 2.2.1 - category: main @@ -5688,7 +5441,6 @@ package: name: gdspy optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/1d/e4/97b8add92fbec2a9890ad4777272e9a9e4d7a0ceeac42b7e1febe94f0e86/gdspy-1.4.zip version: '1.4' - category: main @@ -5701,19 +5453,15 @@ package: name: paramiko-ng optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/9f/53/1ac75eab589149b1e02e38185ecebf09e1b805fc3fdeadbc16d1a2b7d208/paramiko_ng-2.8.10-py2.py3-none-any.whl version: 2.8.10 -- category: main - dependencies: +- dependencies: ruamel.yaml.clib: '>=0.2.6' hash: sha256: 742b35d3d665023981bd6d16b3d24248ce5df75fdb4e2924e93a05c1f8b61ca7 manager: pip name: ruamel.yaml - optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/9e/cb/938214ac358fbef7058343b3765c79a1b7ed0c366f7f992ce7ff38335652/ruamel.yaml-0.17.21-py3-none-any.whl version: 0.17.21 - category: main @@ -5726,7 +5474,6 @@ package: name: sure optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/dd/ae/eb28ee3b6768e51cb938abcf521cb678217203f33385a2df54d3f23331c5/sure-2.0.1.tar.gz version: 2.0.1 - category: main @@ -5739,7 +5486,6 @@ package: name: fab-classic optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/6b/0f/efc537eebfd2a2c470250c0ac8bd8a05ffc13d95a7fb22021367890d7c46/fab_classic-1.19.2-py2.py3-none-any.whl version: 1.19.2 - category: main @@ -5755,7 +5501,6 @@ package: name: hammer-vlsi optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/53/39/18367e6fb4f20e9ae4fb3097f7b80704ff5cccf62980ea2871ba1d817a74/hammer_vlsi-1.1.0-py3-none-any.whl version: 1.1.0 - category: main @@ -5768,7 +5513,6 @@ package: name: icontract optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/d8/91/9756e7cf0b155e80bf9a62beffdd1dec4afce43cc6ab7f432f2267c62762/icontract-2.6.2-py3-none-any.whl version: 2.6.2 - category: main @@ -5781,7 +5525,6 @@ package: name: pylddwrap optional: false platform: linux-64 - source: null url: https://files.pythonhosted.org/packages/c9/12/4afd6542c43cd20271f0e53bf0211decc10079a76a41e53c0288025a7b85/pylddwrap-1.2.2.tar.gz version: 1.2.2 version: 1 From dfe34873f755c5e236933b46e268934eb4e96dbf Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 20 Apr 2023 16:39:05 -0700 Subject: [PATCH 12/14] Revert "bump testchipip" This reverts commit bb6f8be801537aa538bfc8928b823d8b934d93c4. --- generators/testchipip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/testchipip b/generators/testchipip index 66ff09f611..aa9170afe1 160000 --- a/generators/testchipip +++ b/generators/testchipip @@ -1 +1 @@ -Subproject commit 66ff09f611b7b3af7d9413f216fe9890875b727c +Subproject commit aa9170afe133e74e1c66b0082dc943e272d9e6f0 From 57d7e55457d8a223fcf0941ab5948787c896dcb4 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 20 Apr 2023 18:20:26 -0700 Subject: [PATCH 13/14] oops --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 213e37e531..5c1f2461d1 100644 --- a/common.mk +++ b/common.mk @@ -231,7 +231,7 @@ $(SFC_MFC_TARGETS) &: $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(SFC_LEVEL) $(EXTRA_FIR $(SED) -i 's/.*/& /' $(MFC_SMEMS_CONF) # need trailing space for SFC macrocompiler # DOC include end: FirrtlCompiler -$(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILELIST) &: $(MFC_MODEL_HRCHY_JSON) $(MFC_FILELIST) $(MFC_BB_MODS_FILELIST) +$(TOP_MODS_FILELIST) $(MODEL_MODS_FILELIST) $(ALL_MODS_FILELIST) $(BB_MODS_FILELIST) $(MFC_MODEL_HRCHY_JSON_UNIQUIFIED) &: $(MFC_MODEL_HRCHY_JSON) $(MFC_FILELIST) $(MFC_BB_MODS_FILELIST) $(base_dir)/scripts/split-module-files.py \ --model-hier-json $(MFC_MODEL_HRCHY_JSON) \ --dut $(TOP) \ From 4d988a24e9500010eb8c8391831bc197d51660cf Mon Sep 17 00:00:00 2001 From: joey0320 Date: Fri, 21 Apr 2023 09:41:56 -0700 Subject: [PATCH 14/14] fix --- scripts/uniqify-module-names.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/uniqify-module-names.py b/scripts/uniqify-module-names.py index b573dfc6d9..a6255a8c90 100755 --- a/scripts/uniqify-module-names.py +++ b/scripts/uniqify-module-names.py @@ -71,15 +71,11 @@ def dfs_update_modules(tree, common_fnames, visited, top_fnames): cur_file = cur_module + ".sv" new_file = None - # cur_file is in the common list, generate a new file - if cur_file in common_fnames: + # cur_file is in the common list, or is a ancestor of of them, generate a new file + if (cur_file in common_fnames) or len(childs_to_update) > 0: new_file = generate_copy(cur_file, MODEL_SFX) update_filelist(cur_file, os.path.basename(new_file)) - # has some child to update, but new_file wasn't generated - if (new_file is None) and len(childs_to_update) > 0: - new_file = os.path.join(args.gcpath, cur_file) - for submodule_name in childs_to_update: if (submodule_name + ".sv") in common_fnames: bash(f"sed -i s/\"{submodule_name}\"/\"{submodule_name}_{MODEL_SFX}\"/ {new_file}")