From a464776404ba99067b2d4ade39346e5e0c5bec37 Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Fri, 10 Mar 2023 15:51:30 -0800 Subject: [PATCH 1/5] Remove e2fsprogs | Bump RV toolchain --- conda-reqs/chipyard.yaml | 1 - ...irements-esp-tools-linux-64.conda-lock.yml | 89 +-- ...ements-riscv-tools-linux-64.conda-lock.yml | 604 +++++++++--------- conda-reqs/riscv-tools.yaml | 2 +- 4 files changed, 349 insertions(+), 347 deletions(-) diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index 9396f3b9e8..e2f6c84eeb 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -46,7 +46,6 @@ dependencies: - doit>=0.34.0 - gitpython - humanfriendly - - e2fsprogs - ctags - bison - flex diff --git a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml index 5fb65cd119..baf3e021b9 100644 --- a/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml +++ b/conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml @@ -9,7 +9,7 @@ # To update a single package to the latest version compatible with the version constraints in the source: # conda-lock lock --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/esp-tools.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/chipyard.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/esp-tools.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/chipyard.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/esp-tools.yaml -f /scratch/abejgonza/cy-conda-req/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-conda-req/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -19,7 +19,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: a2e9a43dff593648561b6f838ff55b44c214644cdbc5a34d94aefb37c8fac3eb + linux-64: 749e7dba3bc3ffdbcf8bc734717a8296b1f3ef463f7f2af0bee452c5ac028d10 platforms: - linux-64 sources: @@ -31,6 +31,8 @@ metadata: - /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/esp-tools.yaml - /scratch/abejgonza/cy-cfg-finder/conda-reqs/chipyard.yaml - /scratch/abejgonza/cy-cfg-finder/conda-reqs/esp-tools.yaml + - /scratch/abejgonza/cy-conda-req/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy-conda-req/conda-reqs/esp-tools.yaml package: - category: main dependencies: {} @@ -1421,16 +1423,16 @@ package: - category: main dependencies: gmp: '>=6.2.1,<7.0a0' - libgcc-ng: '>=7.5.0' + libgcc-ng: '>=12' hash: - md5: ea9ebeddb066da8fad4a815e61b139be - sha256: d2d71ac6ed3b32f06b7db2691e0a1760016ce13fb0c50a9de6ed1ccc33e35ff3 + md5: 14d87bdff2cbd3b1179a29fb316ed743 + sha256: 03097f21c75b0936471809e533dbae44af9d9ae696ecf264d1a929fc9f9e4b83 manager: conda name: mpfr optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.1.0-h9202a9a_1.tar.bz2 - version: 4.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.2.0-hb012696_0.conda + version: 4.2.0 - category: main dependencies: libffi: '>=3.4.2,<3.5.0a0' @@ -3078,14 +3080,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 5aec57dd42104f4916c397fe291f9697 - sha256: bf40dd7bde1902859517888f72802fbc97709af7675de78eec38a1cd73ab898a + md5: e18ed61c37145bb9b48d1d98801960f7 + sha256: a5c48b1fc7c89c5c937475e9434a63af7ce2e591f8e51afd56e3b2e232a9989d manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.5.1-pyhd8ed1ab_0.conda - version: 67.5.1 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda + version: 67.6.0 - category: main dependencies: python: '>=3.6' @@ -5109,14 +5111,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 3faabd8720a81a91566e6c01bf7bbacb - sha256: c677cba87c7027ccf264574a87130bf44f69be008315d2a840ae6cfaa61b7e44 + md5: 7aa03b260e0e7803fafc414707cac996 + sha256: 9c3f2b48b8b69e436f80c4b5bd716ba4410ea1fe5f851406916e43f3feca05df 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.88-pyhd8ed1ab_0.conda + version: 1.29.88 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -5376,7 +5378,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.27.59 + botocore: 1.29.88 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.9,<3.10.0a0' @@ -5385,29 +5387,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: fa62dd9ed5d234c493ff14914d43f332 - sha256: 61483c628f9751a038d5634ce8ba2ed7ab484ffad50a7e7da13c2e3b30f93eae + md5: e9c5b0e909628d74e4ce807bb2a7693f + sha256: 2c641bc5be23dc659180c46126cb509034c67e4e5d3f68dc286d06199459f57e manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.25.60-py39hf3d152e_0.tar.bz2 - version: 1.25.60 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.88-py39hf3d152e_0.conda + version: 1.27.88 - category: main dependencies: - botocore: '>=1.27.59,<1.28.0' + botocore: '>=1.29.88,<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: 6d9d3d9ed7d005bf4180948445cf15a7 + sha256: f073885ff0739d25e35d62aa202f44df59fa75beb95a247b0f041c4973964c4b 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.88-pyhd8ed1ab_0.conda + version: 1.26.88 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5499,21 +5501,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/poetry-1.1.15-py39hf3d152e_0.tar.bz2 version: 1.1.15 -- 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' @@ -5581,14 +5568,14 @@ package: python: '' typing_extensions: '' hash: - md5: 5a9a5263ff74eabd589aab692b8d56cf - sha256: 2f4a2d7918d6aa3256c9491ccd3786206c1329825c2b7a21c902b0cb77c82703 + md5: 0665225dcc452177ebf284917328c4c1 + sha256: b03ab85abbac40c456ae8447d8a03345f54a6c7690efc1e1cf687db0ace600b8 manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.87-pyhd8ed1ab_0.conda - version: 1.26.87 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.88-pyhd8ed1ab_0.conda + version: 1.26.88 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5651,6 +5638,20 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.87-pyhd8ed1ab_0.conda version: 1.26.87 +- 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 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 673bc0f9bb..75d28b2b38 100644 --- a/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml +++ b/conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml @@ -9,7 +9,7 @@ # To update a single package to the latest version compatible with the version constraints in the source: # conda-lock lock --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/riscv-tools.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/chipyard.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy-circt/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-circt/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/chipyard/conda-reqs/chipyard.yaml -f /scratch/abejgonza/chipyard/conda-reqs/riscv-tools.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/chipyard.yaml -f /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-cfg-finder/conda-reqs/riscv-tools.yaml -f /scratch/abejgonza/cy-conda-req/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy-conda-req/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -19,7 +19,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: c24ce91cc2acc7e81ada9fe14d2a5dc398fc977952ab8ab03b82a6d32de079b3 + linux-64: 4c1c6c308bfb81342c899cce8d0bf34b608f27e9896c07a7fdee8d1752c4ded2 platforms: - linux-64 sources: @@ -31,6 +31,8 @@ metadata: - /Users/joonhohwangbo/Documents/Research/coding/chipyard/conda-reqs/riscv-tools.yaml - /scratch/abejgonza/cy-cfg-finder/conda-reqs/chipyard.yaml - /scratch/abejgonza/cy-cfg-finder/conda-reqs/riscv-tools.yaml + - /scratch/abejgonza/cy-conda-req/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy-conda-req/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -189,14 +191,14 @@ package: - category: main dependencies: {} hash: - md5: 0dd193187d54e585cac7eab942a8847e - sha256: 89e8c4436dd04d8b4a0c13c508e930be56973a480a9714171969de953bdafd3a + md5: 4eb33d14d794b0f4be116443ffed3853 + sha256: bcb15db27eb6fbc0fe15d23aa60dcfa58ef451d92771441068d4a911aea7bb9f manager: conda name: python_abi optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.9-3_cp39.conda - version: '3.9' + url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.10-3_cp310.conda + version: '3.10' - category: main dependencies: {} hash: @@ -1421,16 +1423,16 @@ package: - category: main dependencies: gmp: '>=6.2.1,<7.0a0' - libgcc-ng: '>=7.5.0' + libgcc-ng: '>=12' hash: - md5: ea9ebeddb066da8fad4a815e61b139be - sha256: d2d71ac6ed3b32f06b7db2691e0a1760016ce13fb0c50a9de6ed1ccc33e35ff3 + md5: 14d87bdff2cbd3b1179a29fb316ed743 + sha256: 03097f21c75b0936471809e533dbae44af9d9ae696ecf264d1a929fc9f9e4b83 manager: conda name: mpfr optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.1.0-h9202a9a_1.tar.bz2 - version: 4.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.2.0-hb012696_0.conda + version: 4.2.0 - category: main dependencies: libffi: '>=3.4.2,<3.5.0a0' @@ -1905,14 +1907,14 @@ package: tzdata: '' xz: '>=5.2.6,<6.0a0' hash: - md5: 95c9b7c96a7fd7342e0c9d0a917b8f78 - sha256: 00bcb28a294aa78bf9d2a2ecaae8cb887188eae710f9197d823d36fb8a5d9767 + md5: 3cb3e91b3fe66baa68a12c85f39b9b40 + sha256: 073878d7cc9c7e25cf04983d02e6d44b531d47e0166258cbce964dd78bb716a9 manager: conda name: python optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.9.16-h2782a2a_0_cpython.conda - version: 3.9.16 + 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' @@ -2119,16 +2121,16 @@ package: version: 2.1.1 - category: main dependencies: - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 3613ff4128b3e565d048106196206929 - sha256: 21c425ecc4e6f4ec97aab1285b22ad629c75d2efb62f89cd6d9618ab6a2e606c + md5: 9bb8d28c0899d583a062c17b15ee3e89 + sha256: 550b1266fed8a3bbfc2e7d5cbe646668aca5b5f1c3b4ac9a17ca2d215d06785a manager: conda name: click optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/click-8.1.3-py39hf3d152e_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/click-8.1.3-py310hff52083_1.tar.bz2 version: 8.1.3 - category: main dependencies: @@ -2206,17 +2208,17 @@ package: version: 0.3.6 - category: main dependencies: - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 4f0fa7459a1f40a969aaad418b1c428c - sha256: 97110dd30d9b321b635cc1213e478f5e598ed80c7bdb674c0c7d23d6937f2dfe + md5: 9815d5a3a63926f0877313c07b7c5d90 + sha256: ccf4e2d33f1e2c376de05d0ca93e0cc3fccac9785c5a832e6fca9cc1ce3f7470 manager: conda name: docutils optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/docutils-0.16-py39hf3d152e_3.tar.bz2 - version: '0.16' + url: https://conda.anaconda.org/conda-forge/linux-64/docutils-0.15.2-py310hff52083_6.tar.bz2 + version: 0.15.2 - category: main dependencies: python: '>=3.7' @@ -2260,16 +2262,16 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: e5e0bc1285c83d925b42ad139adca58f - sha256: dbbc7345460425791271e6fc34c5ee2adcc66f18f637ff6a219880dc4375a720 + md5: 25e1626333f9a0646579a162e7b174ee + sha256: 1a213bfa274e847d08cf0d8b068dc94be002c9f17acd040b5c9f2ead80c3c7c0 manager: conda name: frozenlist optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.3-py39hb9d737c_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.3-py310h5764c6d_0.tar.bz2 version: 1.3.3 - category: main dependencies: @@ -2305,16 +2307,16 @@ package: libgcc-ng: '>=12' mpc: '>=1.2.1,<2.0a0' mpfr: '>=4.1.0,<5.0a0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: d019ebf9a328e19c211be7e916c57b80 - sha256: f5a5ab463d7d9e9c4f6a70748adf334ad28072c9befe4748d0eaa48fccc24d56 + md5: 73f6fa50c32ddd985cf5fba7b890a75c + sha256: aeb52e14f33c17e11248bfe58383b935e101d86e89b5246373c590c7b127ab47 manager: conda name: gmpy2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gmpy2-2.1.2-py39h376b7d2_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/gmpy2-2.1.2-py310h3ec546c_1.tar.bz2 version: 2.1.2 - category: main dependencies: @@ -2345,16 +2347,16 @@ package: version: 12.2.0 - category: main dependencies: - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 3844897723d78cca5f813ad6bee5fc7b - sha256: e15ee3e17a30738fb8e2adccef809a41b388bcaf3cc9fc895c15287a86e93ce1 + md5: 43bd27c73e9e3b0bc508217ae409798f + sha256: dab441ddc4592e34b490fed4235c2c0b10b54616509c7ebc176c37c8389600d6 manager: conda name: humanfriendly optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/humanfriendly-10.0-py39hf3d152e_4.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/humanfriendly-10.0-py310hff52083_4.tar.bz2 version: '10.0' - category: main dependencies: @@ -2456,30 +2458,30 @@ package: dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 41679a052a8ce841c74df1ebc802e411 - sha256: eb28254cc7029e702d0059536d986b010221de62f9c8588a5a83e95a00b4e74d + md5: ad5647e517ba68e2868ef2e6e6ff7723 + sha256: f56d1772472b90ddda6fd0963a80dcf1960f1277b9653667a9bde62ae125f972 manager: conda name: kiwisolver optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py39hf939315_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py310hbf28c38_1.tar.bz2 version: 1.4.4 - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: a0238daacd28c07735c6bc75aedf2014 - sha256: bbae929b429f39a10432e86d87bf02864e6640287245de71edeac6b3c29b0ff7 + 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-py39h72bdee0_0.conda + 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: @@ -2614,16 +2616,16 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 35514f5320206df9f4661c138c02e1c1 - sha256: da31fe95611393bb7dd3dee309a89328448570fd8a3205c2c55c03eb73688b61 + md5: a1f0db6709778b77b5903541eeac4032 + sha256: f62b2aeafe968472b20b6935fa7b2290d27ac38b65d98b2708c7cf0b689f9f19 manager: conda name: markupsafe optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.2-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.2-py310h1fa729e_0.conda version: 2.1.2 - category: main dependencies: @@ -2641,30 +2643,30 @@ package: dependencies: libgcc-ng: '>=12' libstdcxx-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 413374bab5022a5199c5dd89aef75df5 - sha256: 9b4b426b97d712c1b631bb775aaa1822b06f63a0ca93343c6eee59ab06f2b46c + md5: 5311a49aaea44b73935c84a6d9a68e5f + sha256: da5030f22f6d1293ccdefefde17fcf1a5f337f87179c54dee2a2a1fc16d6d73a manager: conda name: msgpack-python optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py39h4b4f3f3_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py310hdf3cbec_0.conda version: 1.0.5 - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 85d78bf46da38d726c8c6bec78f90fa8 - sha256: 130544eb072c154e7548c086f574c71b676139fea0184373bf06065114578510 + md5: b33287be963a70f8fb4b143b4561ba62 + sha256: 14312ac727a741224d45ab07f75253ca99235ec0534ba9603e627818666ff49a manager: conda name: multidict optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/multidict-6.0.4-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/multidict-6.0.4-py310h1fa729e_0.conda version: 6.0.4 - category: main dependencies: @@ -2709,16 +2711,16 @@ package: libgcc-ng: '>=12' liblapack: '>=3.9.0,<4.0a0' libstdcxx-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 757070dc7cc33003254888808cd34f1e - sha256: c0418aa18f4fd37d3ac786058bfa29cca0b5b8eca95a2e0ae2fdd13aefc81ad6 + md5: b7085457309e206174b8e234d90a7605 + sha256: d2c58f7f9a0c023c5fe130ef781e0d77b3717cc5f78587fe97b9a57635e2a93d manager: conda name: numpy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py39h7360e5f_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py310h8deb116_0.conda version: 1.24.2 - category: main dependencies: @@ -2798,16 +2800,16 @@ package: version: 1.3.10 - category: main dependencies: - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: d86903c57fe229d9dd8878a6dd9d149f - sha256: abf2d34464c6255d35703e3c9477475e3e6e353ca8675990596d2477cdbc5b52 + md5: 02e428ab589e3cefe070352c905cefec + sha256: 28967130059ac29a1298de5f4555c0ec6344ea56e32642c44f40c19d83f38162 manager: conda name: pluggy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pluggy-1.0.0-py39hf3d152e_4.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pluggy-1.0.0-py310hff52083_4.tar.bz2 version: 1.0.0 - category: main dependencies: @@ -2824,30 +2826,30 @@ package: version: 1.0.8 - category: main dependencies: - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: b602cc9304197c6bf35f7a130fa8e4b8 - sha256: f16ba7446081fa6e7f29c7af12d6a9b01ad21440d83ebedca9d7185a410f6758 + md5: b640492254040227cc1cb5d13ed1d830 + sha256: 159feca2894a11ac2a3f4008fea3f675d6a7ea8f22683d6d8890b19c172db239 manager: conda name: portalocker optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/portalocker-2.7.0-py39hf3d152e_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/portalocker-2.7.0-py310hff52083_0.conda version: 2.7.0 - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 12184951da572828fb986b06ffb63eed - sha256: 515cf2cfc0504eb5758fa9ddfabc1dcbd7182da7650828aac97c9eee35597c84 + md5: c3c55664e9becc48e6a652e2b641961f + sha256: efaf186bc3be5074ff44a25372ec0f21564c0a8f9cd3ed3e8378389745999be5 manager: conda name: psutil optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.4-py39hb9d737c_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.4-py310h5764c6d_0.tar.bz2 version: 5.9.4 - category: main dependencies: @@ -2888,16 +2890,16 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 00f348bb07e883ceb502b02227b0c900 - sha256: 5ab9b896c57be67ab3c6c837c93688902540cc3eb7b30f79c7fedec8d71e8ec9 + md5: 0e565d732f6660374b45d76761c09b06 + sha256: 9bf587a2a0f0f73b71740b079507ec99282b73c596ec73cc602d7ccf73350709 manager: conda name: pycosat optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pycosat-0.6.4-py39hb9d737c_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pycosat-0.6.4-py310h5764c6d_1.tar.bz2 version: 0.6.4 - category: main dependencies: @@ -2963,29 +2965,29 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 659013ef00dcd1751bfd26d894f73857 - sha256: 8b8719429dc47dd15252fe65fc77a3ad81f25aa5f4db0e6b1d7cdc54722e6ef4 + md5: f732bec05ecc2e302a868d971ae484e0 + sha256: 7c1d3f51959fd5e829a114157bb110fdd6335d1c518293b4203474c78d9b48f9 manager: conda name: pyrsistent optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.19.3-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.19.3-py310h1fa729e_0.conda version: 0.19.3 - category: main dependencies: - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: d34b97a2386932b97c7cb80916a673e7 - sha256: 42d46baeab725d3c70d22a4258549e9f0f1a72b740166cd9c3b394c4369cb306 + md5: 378f2260e871f3ea46c6fa58d9f05277 + sha256: cb6e4821234cee05acd1996cef88e40dfc2d5ab12cf12c5b1d6ed9118f7f41a7 manager: conda name: pysocks optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py39hf3d152e_5.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py310hff52083_5.tar.bz2 version: 1.7.1 - category: main dependencies: @@ -3015,77 +3017,78 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 yaml: '>=0.2.5,<0.3.0a0' hash: - md5: 36a51b5f1856dc5a8d781220a4bc54ba - sha256: da790c97de2d40421caa5e7119ab4674302603b56f23849660392ab571c52aaa + md5: 99a4d5b5df0c98e65fe625ea3ba8cc82 + sha256: 2c1b9e511cec0f90cdf524fe873d87d31cf96917a11552848d298e77e2309418 manager: conda name: pyyaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py39hb9d737c_4.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pyyaml-5.4.1-py310h5764c6d_4.tar.bz2 version: 5.4.1 - category: main dependencies: - expat: '>=2.4.8,<3.0a0' + __glibc: '>=2.17,<3.0.a0' + expat: '>=2.5.0,<3.0a0' gmp: '>=6.2.1,<7.0a0' - libzlib: '>=1.2.12,<1.3.0a0' - mpc: '>=1.2.1,<2.0a0' + libzlib: '>=1.2.13,<1.3.0a0' + mpc: '>=1.3.1,<2.0a0' mpfr: '>=4.1.0,<5.0a0' ncurses: '>=6.3,<7.0a0' - python_abi: 3.9.* *_cp39 + python_abi: 3.10.* *_cp310 hash: - md5: 8a574054a336665b34ffebca58dba813 - sha256: null + md5: 85c9a0d9dd5311aaa2c5064f2c87b496 + sha256: 8716699011df2900f8f20abcec16a0c08e821cfbe7fc2dad4fc369e483d8ed49 manager: conda name: riscv-tools optional: false platform: linux-64 - url: https://conda.anaconda.org/ucb-bar/linux-64/riscv-tools-1.0.1-0_h1234567_gdcdbcaf.tar.bz2 - version: 1.0.1 + url: https://conda.anaconda.org/ucb-bar/linux-64/riscv-tools-1.0.3-0_h1234567_ga1b1b14.conda + version: 1.0.3 - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: d9da3b1d13895666f4cc2559d37b8de4 - sha256: b75af1f9c7a7f26215f7afbaa6fb84f34c08cf1bca6d5b8b248267dea62f4742 + md5: 2f9b517412af46255cef5e53a22c264e + sha256: 4a74013e0e9dd6fa984a10edb53276cf42308d99404375b81548af019bfd068d manager: conda name: ruamel.yaml.clib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml.clib-0.2.7-py39h72bdee0_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml.clib-0.2.7-py310h1fa729e_1.conda version: 0.2.7 - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 yaml: '>=0.2.5,<0.3.0a0' hash: - md5: f862616e19cd2aaa411d24725116b486 - sha256: 762f7719759ea01a81817424cc23d45e595aeabaa6e27adc0a70dadedd4301d2 + md5: f588192bd22fb64650ccb5781cd83fb0 + sha256: 4a17acbb2fae7b567b9f7527eb50833c266df00de7fee41f18bb2006dfab8939 manager: conda name: ruamel_yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel_yaml-0.15.80-py39hb9d737c_1008.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel_yaml-0.15.80-py310h5764c6d_1008.tar.bz2 version: 0.15.80 - category: main dependencies: python: '>=3.7' hash: - md5: 5aec57dd42104f4916c397fe291f9697 - sha256: bf40dd7bde1902859517888f72802fbc97709af7675de78eec38a1cd73ab898a + md5: e18ed61c37145bb9b48d1d98801960f7 + sha256: a5c48b1fc7c89c5c937475e9434a63af7ce2e591f8e51afd56e3b2e232a9989d manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.5.1-pyhd8ed1ab_0.conda - version: 67.5.1 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda + version: 67.6.0 - category: main dependencies: python: '>=3.6' @@ -3257,16 +3260,16 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 8a7d309b08cff6386fe384aa10dd3748 - sha256: 67c3eef0531caf75a81945844288f363cd3b7b029829bd91ed0994bf6b231f34 + md5: be4a201ac582c11d89ed7d15b3157cc3 + sha256: 7ca198ff3c4e9ab0a8c19fbd8dafe4ae7ff52dc12c24fa5abba88785269dc5d9 manager: conda name: tornado optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.2-py39hb9d737c_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/tornado-6.2-py310h5764c6d_1.tar.bz2 version: '6.2' - category: main dependencies: @@ -3331,16 +3334,16 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 230d65004135bf312504a1bbcb0c7a08 - sha256: 03c2cf05d1f4f2b01fc1e3ced22d5f331f2f233e335c4a4cd11a31fea1fccc0c + md5: e972c5a1f472561cf4a91962cb01f4b4 + sha256: 332732c2b87445c3e071c86cacfbc72a99ba4ea55d0b9d65416894253782ca02 manager: conda name: unicodedata2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/unicodedata2-15.0.0-py39hb9d737c_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/unicodedata2-15.0.0-py310h5764c6d_0.tar.bz2 version: 15.0.0 - category: main dependencies: @@ -3384,16 +3387,16 @@ package: libstdcxx-ng: '>=12' ncurses: '>=6.3,<7.0a0' perl: '>=5.32.1,<5.33.0a0 *_perl5' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 8f23fe6252f0db61a467fc68235a6c6c - sha256: 1ff7b1aa32d188658e797ba09579afc9712ef00a5b10700ebc10d57155dcd299 + 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-py39pl5321h20e6244_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/vim-9.0.0814-py310pl5321hade1898_0.tar.bz2 version: 9.0.0814 - category: main dependencies: @@ -3446,16 +3449,16 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 6bafe9bada45b1188748b658b8a6c5cf - sha256: a0e68749cd65b40637a4470d777a21f1b2cd5ca6b6af858e3d8b4d91ba131aa3 + md5: cbfdcc9c243ac7f080cf60833b482f97 + sha256: a9c0b455c26f24b5ba2626440c375aa636b6d80fff3efe90d8f61cec8f7018a0 manager: conda name: wrapt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/wrapt-1.15.0-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/wrapt-1.15.0-py310h1fa729e_0.conda version: 1.15.0 - category: main dependencies: @@ -3581,16 +3584,16 @@ package: libffi: '>=3.4,<4.0a0' libgcc-ng: '>=12' pycparser: '' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 20080319ef73fbad74dcd6d62f2a3ffe - sha256: 485a8f65c58c26c7d48bfea20ed1d6f1493f3329dd2c9c0a888a1c2b7c2365c5 + md5: 800596144bb613cd7ac58b80900ce835 + sha256: f223c8782195f19dbe7cfd27e329de8b0e2205a090ee2a6891e0695d4d634854 manager: conda name: cffi optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py39he91dace_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py310h255011f_3.conda version: 1.15.1 - category: main dependencies: @@ -3663,16 +3666,16 @@ package: libgcc-ng: '>=12' libstdcxx-ng: '>=12' numpy: '>=1.16' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: c5387f3fb1f5b8b71e1c865fc55f4951 - sha256: 74a767b73686caf0bb1d1186cd62a54f01e03ad5432eaaf0a7babad7634c4067 + md5: 7bf9d8c765b6b04882c719509652c6d6 + sha256: 670b736e895ed1b37187e0cbc73fd528414076f370068975135db2420af8663d manager: conda name: contourpy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.0.7-py39h4b4f3f3_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.0.7-py310hdf3cbec_0.conda version: 1.0.7 - category: main dependencies: @@ -3758,17 +3761,17 @@ package: brotli: '' libgcc-ng: '>=12' munkres: '' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 unicodedata2: '>=14.0.0' hash: - md5: 7ed17a60087175112fbbf5882bebddc2 - sha256: cd5bce3af985c9ada2d9cc1c42f5c6f135fabbb56c2917fc7c9f5ecf27f3cff0 + md5: c8a9099d7b381fa9860d4c68bbd7e7a3 + sha256: 4a1bddf064521479280be397d422e7562673efb74868d0918ea590f9fa737ff0 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.0-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.0-py310h1fa729e_0.conda version: 4.39.0 - category: main dependencies: @@ -3948,18 +3951,18 @@ package: libgcc-ng: '>=12' mypy_extensions: '>=0.4.3' psutil: '>=4.0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: e25a18721970f7bb80a0d602ef3c72ad - sha256: 1ff6a68e7c511e2bb70b51466134706e33a322a3ef2544c7adc3524bd51624f1 + md5: 7f519094ddab6b939cf6dae229c3b17b + sha256: d58fd7f0c34995d5dd829eff8b4261e782b65a6bb50f072919f0d0002fd35a77 manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.1.1-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.1.1-py310h1fa729e_0.conda version: 1.1.1 - category: main dependencies: @@ -3998,17 +4001,17 @@ package: libxcb: '>=1.13,<1.14.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 tk: '>=8.6.12,<8.7.0a0' hash: - md5: d2f79132b9c8e416058a4cd84ef27b3d - sha256: 77348588ae7cc8034b63e8a71b6695ba22761e1c531678e724cf06a12be3d1e2 + md5: bbea829b541aa15df5c65bd40b8c1981 + sha256: 6d17af4c8bc8d8668d033725dd4691cfac86fdf0f46f655ab6f5df3e3ae0bb7c manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py39h2320bf1_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py310h023d228_1.conda version: 9.4.0 - category: main dependencies: @@ -4117,18 +4120,18 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: b64be7a2bbc2acc61c1a2161512387c2 - sha256: 1dd205a1ab9897482804b5ef3f2a1cea44f01e831d1bcff439d1e0894ab0e4a9 + md5: 97204ae92b703d74a983db0e6d07d009 + sha256: 2e390037976718f762b8db6703aadeb950fe4c409c64a7e5985157cbb2d58d52 manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.21-py39h72bdee0_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.21-py310h1fa729e_3.conda version: 0.17.21 - category: main dependencies: @@ -4202,16 +4205,16 @@ package: idna: '>=2.0' libgcc-ng: '>=12' multidict: '>=4.0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: fc75e67104cc1bdd6aa2a3b970b19f7f - sha256: 0fb71fdb26db6e49ad92a09ffd26c99145dc02eeb8e15e48fde4437b6237ea58 + md5: a88cda17074955bdb5e93b8e3be59e7d + sha256: eb7fd99bf87e0d150ee6946479172688ded1c4fb51382ad27be5da217cd8815b manager: conda name: yarl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py39hb9d737c_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py310h5764c6d_0.conda version: 1.8.2 - category: main dependencies: @@ -4231,32 +4234,32 @@ package: cffi: '>=1.1' libgcc-ng: '>=12' pip: '' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 six: '>=1.4.1' hash: - md5: 93f72f06a4b00ce36d16007c01e6d1aa - sha256: 8afe6676576da6e661ab7c0f2dfa52acc9e6f9bfc5ad2f1d57bf5131ddbdd975 + md5: b9ed1abcb93da7b8683fd071b81bab6c + sha256: cd7a5ea724a05f16ff74fdf7fcd1d13ba179e37f600bb56d137ad13a5139ec83 manager: conda name: bcrypt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/bcrypt-3.2.2-py39hb9d737c_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/bcrypt-3.2.2-py310h5764c6d_1.tar.bz2 version: 3.2.2 - category: main dependencies: cffi: '>=1.0.0' libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: a639fdd9428d8b25f8326a3838d54045 - sha256: 293229afcd31e81626e5cfe0478be402b35d29b73aa421a49470645debda5019 + md5: 87669c3468dff637bbd0363bc0f895cf + sha256: a37f9a00170f48e71b67bb4547e8bf352dcee4e4a79a55f087b512022cc64a0d manager: conda name: brotlipy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py39hb9d737c_1005.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py310h5764c6d_1005.tar.bz2 version: 0.7.0 - category: main dependencies: @@ -4293,16 +4296,16 @@ package: cffi: '>=1.12' libgcc-ng: '>=12' openssl: '>=3.0.8,<4.0a0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: c492b565817a019f025c7d17b57ef479 - sha256: 66ae341f51f6832de23f0047ea9e23fdf2f7e5fcd72faa814b17a7497a096e07 + md5: 99dc5a02a8b16cd88ca9a12354496e78 + sha256: 23d3015849c45febab3085ecf2cc193c0966c1e2348756722b776f1cedea8596 manager: conda name: cryptography optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.2-py39h079d5ae_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-39.0.2-py310h34c0648_0.conda version: 39.0.2 - category: main dependencies: @@ -4446,21 +4449,48 @@ package: version: 0.0.0.20190110_28_ga81397fc4 - category: main dependencies: + certifi: '>=2020.06.20' + contourpy: '>=1.0.1' + cycler: '>=0.10' + fonttools: '>=4.22.0' + freetype: '>=2.12.1,<3.0a0' + kiwisolver: '>=1.0.1' libgcc-ng: '>=12' libstdcxx-ng: '>=12' - numpy: '>=1.20.3,<2.0a0' - python: '>=3.9,<3.10.0a0' + numpy: '>=1.21.6,<2.0a0' + packaging: '>=20.0' + pillow: '>=6.2.0' + pyparsing: '>=2.3.1' + python: '>=3.10,<3.11.0a0' + python-dateutil: '>=2.7' + python_abi: 3.10.* *_cp310 + tk: '>=8.6.12,<8.7.0a0' + hash: + md5: 68b2dd34c69d08b05a9db5e3596fe3ee + sha256: d2be8ac0a90aa12ba808f8777d1837b5aa983fc3c7c60c600e8fe6bd9352541c + manager: conda + name: matplotlib-base + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py310he60537e_0.conda + version: 3.7.1 +- category: main + dependencies: + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + numpy: '>=1.21.6,<2.0a0' + python: '>=3.10,<3.11.0a0' python-dateutil: '>=2.8.1' - python_abi: 3.9.* *_cp39 + python_abi: 3.10.* *_cp310 pytz: '>=2020.1' hash: - md5: 3ea96adbbc2a66fa45178102a9cfbecc - sha256: a71fb9584f2b58e260fa565d5f27af763f21ed2afeede79e7d848620691bd765 + md5: 467244b0dbb7da40927ac6ee0e9491de + sha256: 289bdc902fb8c536d8fe1297fdc97bb17f01a9b19ad15d96fc8ba0dbe239a379 manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py39h2ad29b5_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py310h9b08913_0.conda version: 1.5.3 - category: main dependencies: @@ -4491,34 +4521,34 @@ package: - category: main dependencies: libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 typing-extensions: '>=4.2.0' hash: - md5: f9528d54782423f164ae187be76ead28 - sha256: b18342ce213c8f4482eeca7c34944dd904e62e063a5783089203d3fa907b9ab0 + 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.6-py39h72bdee0_0.conda + 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' libgcc-ng: '>=12' libsodium: '>=1.0.18,<1.0.19.0a0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 six: '' hash: - md5: 1022b37795420d806b7b36b4e622ee9b - sha256: 937447b9122e4fe2525aba3568bd0635123e6293564b157ccb6753300553d84e + md5: 61e89a7a37bee9dd72449733a9273ae2 + sha256: 187c844010404d7b6e21926c66301b03ed90de20d26021f7ee7965fa1e81f4d9 manager: conda name: pynacl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pynacl-1.5.0-py39hb9d737c_2.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pynacl-1.5.0-py310h5764c6d_2.tar.bz2 version: 1.5.0 - category: main dependencies: @@ -4564,16 +4594,16 @@ package: cffi: '' libgcc-ng: '>=12' libstdcxx-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 0f11bcdf9669a5ae0f39efd8c830209a - sha256: c0cfb2935d12f6300c65e8503eacdabe34d4b125ce0c3c87a0818e2d72c0c056 + md5: 703ff1ac7d1b27fb5944b8052b5d1edb + sha256: 3813d8579d5472cc182a56a6bf4c7b14085adfe0f7157af0d595efefb27b8e5c manager: conda name: ukkonen optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py39hf939315_3.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py310hbf28c38_3.tar.bz2 version: 1.0.1 - category: main dependencies: @@ -4596,17 +4626,17 @@ package: dependencies: cffi: '>=1.11' libgcc-ng: '>=12' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 6023bdb101f9c7fcf11595442cb832b0 - sha256: 7297303784e4b4964fa15eac0d0559f3598d9abf8d941b33f51315c590e16eda + md5: 2cce1a48e6687f64d371d2e7fc9c7fbf + sha256: 97f69cae6513a1c64ce2ec87380f9a177e386af398300921a869c07e826b4949 manager: conda name: zstandard optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py39h29414ee_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py310hdeb6495_1.conda version: 0.19.0 - category: main dependencies: @@ -4617,17 +4647,17 @@ package: frozenlist: '>=1.1.1' libgcc-ng: '>=12' multidict: '>=4.5,<7.0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 yarl: '>=1.0,<2.0' hash: - md5: 0e856218fc838b36e1b340f574b7885f - sha256: 7f842b7b71cd366cf82a6aa0492ede328d31dc73738d9b56cf1866e7d10a708b + md5: ad96f1f4a5a53f6e474953539d0f73ea + sha256: 0ea7c35b73cb454d1479bef3328ab3abfec6908449cef925d10a33725e53d294 manager: conda name: aiohttp optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.8.4-py39h72bdee0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.8.4-py310h1fa729e_0.conda version: 3.8.4 - category: main dependencies: @@ -4745,34 +4775,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/ucb-bar/linux-64/libdwarf-dev-0.0.0.20190110_28_ga81397fc4-h753d276_0.tar.bz2 version: 0.0.0.20190110_28_ga81397fc4 -- category: main - dependencies: - certifi: '>=2020.06.20' - contourpy: '>=1.0.1' - cycler: '>=0.10' - fonttools: '>=4.22.0' - freetype: '>=2.12.1,<3.0a0' - importlib-resources: '>=3.2.0' - kiwisolver: '>=1.0.1' - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - numpy: '>=1.20.3,<2.0a0' - packaging: '>=20.0' - pillow: '>=6.2.0' - pyparsing: '>=2.3.1' - python: '>=3.9,<3.10.0a0' - python-dateutil: '>=2.7' - python_abi: 3.9.* *_cp39 - tk: '>=8.6.12,<8.7.0a0' - hash: - md5: f2a931db797bb58bd335f4a857b4c898 - sha256: 34f8db992c68bee53fb6f0212707503ce197d13fadc231dbc37a99f31f72879a - manager: conda - name: matplotlib-base - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py39he190548_0.conda - version: 3.7.1 - category: main dependencies: attrs: '>=19.2.0' @@ -4900,16 +4902,16 @@ package: cryptography: '' dbus: '' jeepney: '>=0.6' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: cfb68a22e2d9108634a08a8a3b19d1b6 - sha256: db76e25d0c1cad3ca6339fd4d09c9cd03dcea7072b302c6eaa4123a358e98a78 + md5: e135d0e3bbb226e8d53d31b4e4f6d93c + sha256: 25d2a00bf24a3cab81eba8f77eba8f70a7b3995041fc227f535c0f174536670f manager: conda name: secretstorage optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/secretstorage-3.3.3-py39hf3d152e_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/secretstorage-3.3.3-py310hff52083_1.tar.bz2 version: 3.3.3 - category: main dependencies: @@ -4992,17 +4994,17 @@ package: importlib_metadata: '>=4.11.4' jaraco.classes: '' jeepney: '>=0.4.2' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 secretstorage: '>=3.2' hash: - md5: ae2df7a822f7671da22da24ead24cc0a - sha256: 107e6a5ba122dff162e9d34a87af1ffbb4dca1f7dd1547294646774ca9421524 + md5: 85da2982e8456156e2f38e6a3f75cd89 + sha256: c709408ded9e04b193a5f6c77f6586ab4ab93bdb5a5413eeecc9530165ccf312 manager: conda name: keyring optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.13.1-py39hf3d152e_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.13.1-py310hff52083_0.conda version: 23.13.1 - category: main dependencies: @@ -5045,18 +5047,18 @@ package: cfgv: '>=2.0.0' identify: '>=1.0.0' nodeenv: '>=0.11.1' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 pyyaml: '>=5.1' virtualenv: '>=20.0.8' hash: - md5: 17994a38cb9daeb1beecacec5885745c - sha256: ca03c667f8b60428c1bf4f155f9aa343593b1af13b33ff0e079c191c5ddc7657 + md5: 759bfcb929decd0dfa0489070c9cc992 + sha256: 6dd5a76b655cc28c6385861a480e2b1c35e20437fdd10cb9fd560fd04eaeeb38 manager: conda name: pre-commit optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.1.1-py39hf3d152e_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pre-commit-3.1.1-py310hff52083_0.conda version: 3.1.1 - category: main dependencies: @@ -5096,14 +5098,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 2b1918369bcec3f3ff8dc380c60dff99 - sha256: 15b4107b40b9c39b3ca3631acc64f9734c71a7f1ede4e3b9c28275a2f62c4777 + md5: 7aa03b260e0e7803fafc414707cac996 + sha256: 9c3f2b48b8b69e436f80c4b5bd716ba4410ea1fe5f851406916e43f3feca05df manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.87-pyhd8ed1ab_0.conda - version: 1.29.87 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.88-pyhd8ed1ab_0.conda + version: 1.29.88 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -5198,21 +5200,21 @@ package: pluggy: '>=1.0.0' pycosat: '>=0.6.3' pyopenssl: '>=16.2.0' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 requests: '>=2.20.1,<3' ruamel.yaml: '>=0.11.14,<0.18' setuptools: '>=31.0.1' toolz: '>=0.8.1' tqdm: '>=4' hash: - md5: b2482d4fe1bc47af8e699f3ffec9dbb8 - sha256: 2fcb48155d829cb344ddf83589998babd94f298323166975d625be7e8e7ac1a6 + md5: c50e15e4014d4a2fca0085a813cd6393 + sha256: f7ab7af6f2850ba7da16436b485cd007a2c6b022f9af2ecc56511aebd9f5a085 manager: conda name: conda optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/conda-22.11.1-py39hf3d152e_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/conda-22.11.1-py310hff52083_1.conda version: 22.11.1 - category: main dependencies: @@ -5347,38 +5349,38 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.87 + botocore: 1.29.88 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' - python: '>=3.9,<3.10.0a0' - python_abi: 3.9.* *_cp39 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 pyyaml: '>=3.10,<5.5' rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: e34597b1774f550f23cca3fb3ad44079 - sha256: b92577f1601b257e7fc64bef8e733a8be7ac2ce1602d53e05c4497902371ad3c + md5: 462e28bc8d49e442e5c0af990ebffdfe + sha256: 06d6dc5d6a9e66b4f9488bb2dd039017d28077a6a52342bd0570a29150d3c919 manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.87-py39hf3d152e_0.conda - version: 1.27.87 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.88-py310hff52083_0.conda + version: 1.27.88 - category: main dependencies: - botocore: '>=1.29.87,<1.30.0' + botocore: '>=1.29.88,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 81cc299ce1dec9d92f55163356553fbe - sha256: 4712065876e3303bda6b2995770f2a7c131f6184b4d372c055ba505f56c77b50 + md5: 6d9d3d9ed7d005bf4180948445cf15a7 + sha256: f073885ff0739d25e35d62aa202f44df59fa75beb95a247b0f041c4973964c4b manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.87-pyhd8ed1ab_0.conda - version: 1.26.87 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.88-pyhd8ed1ab_0.conda + version: 1.26.88 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5537,14 +5539,14 @@ package: python: '' typing_extensions: '' hash: - md5: 5a9a5263ff74eabd589aab692b8d56cf - sha256: 2f4a2d7918d6aa3256c9491ccd3786206c1329825c2b7a21c902b0cb77c82703 + md5: 0665225dcc452177ebf284917328c4c1 + sha256: b03ab85abbac40c456ae8447d8a03345f54a6c7690efc1e1cf687db0ace600b8 manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.87-pyhd8ed1ab_0.conda - version: 1.26.87 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.88-pyhd8ed1ab_0.conda + version: 1.26.88 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5725,21 +5727,21 @@ package: version: 1.21.9 - dependencies: {} hash: - sha256: ef85cf1f693c88c1fd229ccd1055570cb41cdf4875873b7728b6301f12cd05bf + sha256: 0e3463e6ac25313462e04aea3fb8a0a30fb906d5d300f58b3bc2c23da6a15398 manager: pip name: numpy platform: linux-64 source: null - url: https://files.pythonhosted.org/packages/43/55/fea3342371187dea4044521c0ba82b90fb5a42fb92446be019b316dd3320/numpy-1.24.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + url: https://files.pythonhosted.org/packages/3d/17/2cc40e1ed44f37b0bab7d62e0c6ba88362da23f48e52833ffdd1b9dfc220/numpy-1.24.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl version: 1.24.1 - dependencies: {} hash: - sha256: 40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0 + sha256: f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5 manager: pip name: pyyaml platform: linux-64 source: null - url: https://files.pythonhosted.org/packages/12/fc/a4d5a7554e0067677823f7265cb3ae22aed8a238560b5133b58cda252dad/PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl + 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 dependencies: diff --git a/conda-reqs/riscv-tools.yaml b/conda-reqs/riscv-tools.yaml index ab667b79a9..cffe32397f 100644 --- a/conda-reqs/riscv-tools.yaml +++ b/conda-reqs/riscv-tools.yaml @@ -14,4 +14,4 @@ dependencies: # https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications # documentation on package_spec syntax for constraining versions - - riscv-tools=1.0.1 # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock + - riscv-tools=1.0.3 # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock From 2a6950978ef0388722a289dfcbe2b4bb27423ccd Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 10 Mar 2023 16:51:14 -0800 Subject: [PATCH 2/5] Bump firemarshal --- software/firemarshal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/firemarshal b/software/firemarshal index 8e02b02d14..c9086adff7 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit 8e02b02d14f2d67bb8d62e0a92e097bbea45994f +Subproject commit c9086adff7b1762ecf97e7bb335bb83f39ca4400 From 8a14250bd67e134cb31762d1f228f9855036b01b Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Fri, 10 Mar 2023 22:45:25 -0800 Subject: [PATCH 3/5] Bump firemarshal --- software/firemarshal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/firemarshal b/software/firemarshal index c9086adff7..5e4a55f7b4 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit c9086adff7b1762ecf97e7bb335bb83f39ca4400 +Subproject commit 5e4a55f7b4ed12a94618180f7d2b42f215d2d66d From 8d433f65361e658b8d56fc86d36b4afe300ff903 Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Sat, 11 Mar 2023 10:33:53 -0800 Subject: [PATCH 4/5] Bump gemmini/sha3 to fix baremetal test compile --- generators/gemmini | 2 +- generators/sha3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/gemmini b/generators/gemmini index 9e478ecce9..1a8eaba512 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit 9e478ecce9e48bbc03b9bd3535d71e03a6269fba +Subproject commit 1a8eaba5129afeed39147a833e9265079c151816 diff --git a/generators/sha3 b/generators/sha3 index 98089ba372..8c5d244303 160000 --- a/generators/sha3 +++ b/generators/sha3 @@ -1 +1 @@ -Subproject commit 98089ba372a847d62024d36db62429a8bcdfd7ea +Subproject commit 8c5d244303694311c4e63e51915a492491a3f5c7 From f4124e4cb6b3b64e0f2288e517a093f43767942f Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Sat, 11 Mar 2023 22:31:36 -0800 Subject: [PATCH 5/5] Add Lean Gemmini FireChip target --- .../src/main/scala/config/RoCCAcceleratorConfigs.scala | 6 ++++++ generators/firechip/src/main/scala/TargetConfigs.scala | 6 ++++++ generators/gemmini | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/generators/chipyard/src/main/scala/config/RoCCAcceleratorConfigs.scala b/generators/chipyard/src/main/scala/config/RoCCAcceleratorConfigs.scala index 230a3c06c3..b2fa0b2ad7 100644 --- a/generators/chipyard/src/main/scala/config/RoCCAcceleratorConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RoCCAcceleratorConfigs.scala @@ -21,6 +21,12 @@ class FPGemminiRocketConfig extends Config( new chipyard.config.WithSystemBusWidth(128) ++ new chipyard.config.AbstractConfig) +class LeanGemminiRocketConfig extends Config( + new gemmini.LeanGemminiConfig ++ // use Lean Gemmini systolic array GEMM accelerator + new freechips.rocketchip.subsystem.WithNBigCores(1) ++ + new chipyard.config.WithSystemBusWidth(128) ++ + new chipyard.config.AbstractConfig) + class HwachaRocketConfig extends Config( new chipyard.config.WithHwachaTest ++ new hwacha.DefaultHwachaConfig ++ // use Hwacha vector accelerator diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index 35846c0f03..643f3171b0 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -288,3 +288,9 @@ class FireSimRocketMMIOOnlyConfig extends Config( new WithDefaultMemModel ++ new WithFireSimConfigTweaks ++ new chipyard.RocketConfig) + +class FireSimGemminiRocketMMIOOnlyConfig extends Config( + new WithDefaultMMIOOnlyFireSimBridges ++ + new WithDefaultMemModel ++ + new WithFireSimConfigTweaks ++ + new chipyard.LeanGemminiRocketConfig) diff --git a/generators/gemmini b/generators/gemmini index 1a8eaba512..a916bfb1a2 160000 --- a/generators/gemmini +++ b/generators/gemmini @@ -1 +1 @@ -Subproject commit 1a8eaba5129afeed39147a833e9265079c151816 +Subproject commit a916bfb1a2bccb4a7caef289e22c5a1068cba54a