diff --git a/.github/actions/create-conda-env/action.yml b/.github/actions/create-conda-env/action.yml index f033ed93..1c302764 100644 --- a/.github/actions/create-conda-env/action.yml +++ b/.github/actions/create-conda-env/action.yml @@ -10,8 +10,8 @@ runs: else echo "Creating a conda environment for each toolchain with the toolchain installed" conda activate base - conda-lock install -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools ./conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml - conda-lock install -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools ./conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml + conda-lock install --conda $(which conda) -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools ./conda-reqs/conda-lock-reqs/conda-requirements-riscv-tools-linux-64.conda-lock.yml + conda-lock install --conda $(which conda) -n ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools ./conda-reqs/conda-lock-reqs/conda-requirements-esp-tools-linux-64.conda-lock.yml conda deactivate echo "Add extra toolchain collateral to RISC-V install area" diff --git a/.github/scripts/install-conda.sh b/.github/scripts/install-conda.sh index 54e7159f..b6fcce18 100755 --- a/.github/scripts/install-conda.sh +++ b/.github/scripts/install-conda.sh @@ -145,15 +145,16 @@ else $SUDO bash ./install_conda.sh -b -p "$CONDA_INSTALL_PREFIX" $conda_install_extra rm ./install_conda.sh + # get most up-to-date conda version + "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" update $DRY_RUN_OPTION -y -n base -c conda-forge conda + # see https://conda-forge.org/docs/user/tipsandtricks.html#multiple-channels # for more information on flexible channel_priority "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set channel_priority flexible # By default, don't mess with people's PS1, I personally find it annoying "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set changeps1 false - # don't automatically activate the 'base' environment when intializing shells + # don't automatically activate the 'base' environment when initializing shells "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set auto_activate_base false - # don't automatically update conda to avoid https://github.com/conda-forge/conda-libmamba-solver-feedstock/issues/2 - "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --set auto_update_conda false # automatically use the ucb-bar channel for specific packages https://anaconda.org/ucb-bar/repo "${DRY_RUN_ECHO[@]}" $SUDO "$CONDA_EXE" config --system --add channels ucb-bar diff --git a/.github/scripts/remote-run-firesim-scala-tests.sh b/.github/scripts/remote-run-firesim-scala-tests.sh index 70a41e27..080f6d8c 100755 --- a/.github/scripts/remote-run-firesim-scala-tests.sh +++ b/.github/scripts/remote-run-firesim-scala-tests.sh @@ -14,8 +14,9 @@ cd $REMOTE_CHIPYARD_DIR ./scripts/init-submodules-no-riscv-tools.sh --force # Run Firesim Scala Tests -export FIRESIM_ENV_SOURCED=1; +export FIRESIM_ENV_SOURCED=1 export COURSIER_CACHE=$REMOTE_COURSIER_CACHE export JVM_MEMORY=10G export JAVA_TMP_DIR=$REMOTE_JAVA_TMP_DIR +export TEST_DISABLE_VIVADO=1 make -C $REMOTE_FIRESIM_DIR TARGET_SBT_PROJECT="{file:$REMOTE_CHIPYARD_DIR}firechip" testOnly ${mapping[$1]} diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml index 68306097..3b614852 100644 --- a/.github/workflows/chipyard-full-flow.yml +++ b/.github/workflows/chipyard-full-flow.yml @@ -65,7 +65,7 @@ jobs: name: setup-repo needs: [change-filters, cancel-prior-workflows] if: needs.change-filters.outputs.needs-rtl == 'true' - runs-on: ferry + runs-on: jktqos steps: - name: Delete old checkout run: | @@ -88,7 +88,7 @@ jobs: run-cfg-finder: name: run-cfg-finder needs: [setup-repo] - runs-on: ferry + runs-on: jktqos steps: - name: Run config finder run: | @@ -101,7 +101,7 @@ jobs: run-tutorial: name: run-tutorial needs: [setup-repo] - runs-on: ferry + runs-on: jktqos steps: - name: Run smoke test run: | @@ -169,9 +169,10 @@ jobs: cleanup: name: cleanup needs: [run-tutorial] - runs-on: ferry + runs-on: jktqos if: ${{ always() }} steps: - name: Delete repo copy and conda env run: | rm -rf ${{ env.REMOTE_WORK_DIR }} + rm -rf ${{ env.JAVA_TMP_DIR }} diff --git a/.github/workflows/chipyard-run-tests.yml b/.github/workflows/chipyard-run-tests.yml index bbba960f..07383e92 100644 --- a/.github/workflows/chipyard-run-tests.yml +++ b/.github/workflows/chipyard-run-tests.yml @@ -166,7 +166,7 @@ jobs: - name: Generate keys id: genkey run: | - echo "::set-output name=extra-tests-cache-key::extra-tests-${{ github.sha }}" + echo "extra-tests-cache-key=extra-tests-${{ github.sha }}" >> $GITHUB_OUTPUT - uses: actions/cache@v3 id: build-extra-tools-cache with: @@ -178,11 +178,11 @@ jobs: conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools .github/scripts/build-extra-tests.sh - create-conda-env-knight: - name: create-conda-env-knight + create-conda-env-jktgz: + name: create-conda-env-jktgz needs: [change-filters, cancel-prior-workflows] if: needs.change-filters.outputs.needs-rtl == 'true' - runs-on: knight + runs-on: jktgz steps: - name: Delete old checkout run: | @@ -199,11 +199,11 @@ jobs: - name: Create conda env uses: ./.github/actions/create-conda-env - create-conda-env-ferry: - name: create-conda-env-ferry + create-conda-env-jktqos: + name: create-conda-env-jktqos needs: [change-filters, cancel-prior-workflows] if: needs.change-filters.outputs.needs-rtl == 'true' - runs-on: ferry + runs-on: jktqos steps: - name: Delete old checkout run: | @@ -225,7 +225,7 @@ jobs: # When adding new prep jobs, please add them to `needs` below setup-complete: name: setup-complete - needs: [create-conda-env-knight, create-conda-env-ferry, build-extra-tests] + needs: [create-conda-env-jktgz, create-conda-env-jktqos, build-extra-tests] runs-on: ubuntu-latest steps: - name: Set up complete @@ -393,7 +393,7 @@ jobs: chipyard-spike-gemmini-run-tests: name: chipyard-spike-gemmini-run-tests needs: prepare-chipyard-accels # technically doesn't depend on RTL but should be after the build.sh for Gemmini - runs-on: ferry + runs-on: jktqos steps: - name: Delete old checkout run: | diff --git a/.gitignore b/.gitignore index ac8e84d0..5dd75bec 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ project/project/ .ivy2 .sbt .classpath_cache/ +.vscode/ diff --git a/conda-reqs/chipyard.yaml b/conda-reqs/chipyard.yaml index 88e0cb9a..8b39591b 100644 --- a/conda-reqs/chipyard.yaml +++ b/conda-reqs/chipyard.yaml @@ -23,8 +23,8 @@ dependencies: # bundle FireSim driver with deps into installer shell-script - constructor - - gcc - - gxx + - gcc<13 + - gxx<13 - sysroot_linux-64=2.17 # needed to match pre-built CI XRT glibc version - conda-gcc-specs - binutils 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 8a419af9..71caef3f 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 @@ -7,9 +7,9 @@ # Install this environment as "YOURENV" with: # conda-lock install -n YOURENV --file conda-requirements-esp-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-esp-tools-linux-64.conda-lock.yml --update PACKAGE +# conda-lock lock --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml --update PACKAGE # To re-solve the entire environment, e.g. after changing a version constraint in the source file: -# conda-lock -f /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/chipyard.yaml -f /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml --lockfile conda-requirements-esp-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,12 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: 66d7d5f9966a6bbb597f5605f5fef62397a0e266677606fbadf2c717251cf783 + linux-64: 967545a3d2b81a4de0339614d0f20b58c49406462f629da7d0dcc2451fb276aa platforms: - linux-64 sources: - - /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/chipyard.yaml - - /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/esp-tools.yaml + - /scratch/abejgonza/cy/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy/conda-reqs/esp-tools.yaml package: - category: main dependencies: {} @@ -141,14 +141,14 @@ package: - category: main dependencies: {} hash: - md5: 5ec50dcd74ba7461709c4ac9c4cc4190 - sha256: 749dabbfe7b571affa19ef3ddb23e22e2eed12d5a699a9830a0f7fba2f296e02 + md5: b9ae31bc2e565684ebaf82d4bd954d55 + sha256: 257495088b78d4344c7ea21145581ed6da1c5bf8320f49b659ce2ed2d6265f76 manager: conda name: libgcc-devel_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-devel_linux-64-13.1.0-he3cc6c4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-devel_linux-64-12.3.0-h8bca6fd_0.conda + version: 12.3.0 - category: main dependencies: {} hash: @@ -163,14 +163,14 @@ package: - category: main dependencies: {} hash: - md5: e703914ad2288ab24cf5ac94d812fc11 - sha256: 21b95f21a80462c832caa348ece5413e10ba69d922dca01826706fe7b6f3a764 + md5: 7c80158949230e6d837186b20b2fcf13 + sha256: b311dad92ffafd29668fca6330dc707f4d7f154a4fa4c3859832897416de39ec manager: conda name: libstdcxx-devel_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-devel_linux-64-13.1.0-he3cc6c4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-devel_linux-64-12.3.0-h8bca6fd_0.conda + version: 12.3.0 - category: main dependencies: {} hash: @@ -185,14 +185,14 @@ package: - category: main dependencies: {} hash: - md5: 0fb0643c375ed8a5e8f57d1b7bb32686 - sha256: 416f534d81aae816b75b261bf4d72196e8d33d80503ae4bf73e7b24345e9308d + md5: 212e31461947b52bde67eab980d73435 + sha256: 7a2701c0d40d0f09c7192148df609e958c2e5a3fea367f4fee3e0b5f427d8375 manager: conda name: open_pdks.sky130a optional: false platform: linux-64 - url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.419_0_g3df14f8-20230606_125334.tar.bz2 - version: 1.0.419_0_g3df14f8 + url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.424_0_g78b7bc3-20230709_210322.tar.bz2 + version: 1.0.424_0_g78b7bc3 - category: main dependencies: {} hash: @@ -420,6 +420,7 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 + sha256: null manager: conda name: dromajo optional: false @@ -556,25 +557,25 @@ package: libgcc-ng: '>=12' libstdcxx-ng: '>=12' hash: - md5: f67106643beadfc737b94ca0bfd6d8e3 - sha256: 1778dc86603df24aaf6865f7f3e1ffc5c793a0f1fc4570add2a6ccb4c0a62785 + md5: d1db1b8be7c3a8983dcbbbfe4f0765de + sha256: 3c6fab31ed4dc8428605588454596b307b1bd59d33b0c7073c407ab51408b011 manager: conda name: libabseil optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.2-cxx17_h59595ed_2.conda - version: '20230125.2' + url: https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.3-cxx17_h59595ed_0.conda + version: '20230125.3' - category: main dependencies: libgcc-ng: '>=12' hash: - md5: 9194c9bf9428035a05352d031462eae4 - sha256: ddc961a36d498aaafd5b71078836ad5dd247cc6ba7924157f3801a2f09b77b14 + md5: 61641e239f96eae2b8492dc7e755828c + sha256: fc57c0876695c5b4ab7173438580c1d7eaa7dccaf14cb6467ca9e0e97abe0cf0 manager: conda name: libbrotlicommon optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: @@ -688,16 +689,16 @@ package: version: 0.3.23 - category: main dependencies: - libgcc-ng: '>=13.1.0' + libgcc-ng: '>=12.3.0' hash: - md5: 7594fd17fb4d1b8b0e47a6b306fe01ae - sha256: 49214f61c270400e4da89f00b6b24565dc59d1d8b869fa003a22aeacaeca3851 + md5: bbc8fef17925480272a671b1d83431fa + sha256: 2fa38e53f7d58789283af351f014748a485ec8f4e7db3f150ed6274f50983663 manager: conda name: libsanitizer optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsanitizer-13.1.0-hfd8a6a1_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libsanitizer-12.3.0-h0f45ef3_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -774,14 +775,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: 0d4a7508d8c6c65314f2b9c1f56ad408 - sha256: ac3e073ea77803da71eb77e7fcef07defb345bda95eee3327c73ddf85b5714da + md5: 82bf6f63eb15ef719b556b63feec3a77 + sha256: 66658d5cdcf89169e284488d280b6ce693c98c0319d7eabebcedac0929140a73 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.3.1-hd590300_0.conda + version: 1.3.1 - category: main dependencies: libgcc-ng: '>=12' @@ -1204,21 +1205,21 @@ package: - category: main dependencies: binutils_impl_linux-64: '>=2.39' - libgcc-devel_linux-64: 13.1.0 he3cc6c4_0 - libgcc-ng: '>=13.1.0' - libgomp: '>=13.1.0' - libsanitizer: 13.1.0 hfd8a6a1_0 - libstdcxx-ng: '>=13.1.0' + libgcc-devel_linux-64: 12.3.0 h8bca6fd_0 + libgcc-ng: '>=12.3.0' + libgomp: '>=12.3.0' + libsanitizer: 12.3.0 h0f45ef3_0 + libstdcxx-ng: '>=12.3.0' sysroot_linux-64: '' hash: - md5: 99d1a8a8ee1665ee9435f8d160df69fe - sha256: d728da49acc79f2a46f9abe1f603fd4ccc9fc96f533b1647e3c836985caa5924 + md5: 1e41f51d89695fd3f810e2245517460b + sha256: ccbbb82de1ca95b02477e4340c5791e49424b379c6caa27e89bae3c40b7ad296 manager: conda name: gcc_impl_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-13.1.0-hc4be1a9_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-12.3.0-he2b93b0_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -1246,29 +1247,29 @@ package: version: 3.9.0 - category: main dependencies: - libbrotlicommon: 1.0.9 h166bdaf_8 + libbrotlicommon: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: 4ae4d7795d33e02bd20f6b23d91caf82 - sha256: d88ba07c3be27c89cb4975cc7edf63ee7b1c62d01f70d5c3f7efeb987c82b052 + md5: 081aa22f4581c08e4372b0b6c2f8478e + sha256: 564f301430c3c61bc5e149e74157ec181ed2a758befc89f7c38466d515a0f614 manager: conda name: libbrotlidec optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: - libbrotlicommon: 1.0.9 h166bdaf_8 + libbrotlicommon: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: 04bac51ba35ea023dc48af73c1c88c25 - sha256: a0468858b2f647f51509a32040e93512818a8f9980f20b3554cccac747bcc4be + md5: 1f0a03af852a9659ed2bf08f2f1704fd + sha256: d27bc2562ea3f3b2bfd777f074f1cac6bfa4a737233dad288cd87c4634a9bb3a manager: conda name: libbrotlienc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: @@ -1347,14 +1348,14 @@ package: libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 40e9b664b20732e651178d0ea29ae2a5 - sha256: 5f5b16e2e535e6116d0f51f9a15587d76fbe6504e69351ac117a74d666965c01 + md5: c8da7f04073ed0fabcb60885a4c1a722 + sha256: b0255d3c46c71e184d0513566a770356abf2cede5e795c4944521c4f7b6a26d4 manager: conda name: libprotobuf optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.2-hd1fb520_5.conda - version: 4.23.2 + url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.3-hd1fb520_0.conda + version: 4.23.3 - category: main dependencies: libgcc-ng: '>=12' @@ -1469,16 +1470,16 @@ package: version: '10.40' - category: main dependencies: - libgcc-ng: '>=9.4.0' + libgcc-ng: '>=12' libnsl: '>=2.0.0,<2.1.0a0' hash: - md5: 09ba115862623f00962e9809ea248f1a - sha256: a116c1d3c64a072280b441c43d893d341a1d37d16ec18afc76eee40299deabfa + md5: 53dc30c420516340641b00ec1571dd53 + sha256: 7e282c6b4106ccb00b3e5be9fc7f863b003d732ba51f76696ab23544a047a4fb manager: conda name: perl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/perl-5.32.1-2_h7f98852_perl5.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/perl-5.32.1-3_hd590300_perl5.conda version: 5.32.1 - category: main dependencies: @@ -1591,13 +1592,13 @@ package: libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 6b63daed8feeca47be78f323e793d555 - sha256: fbe49a8c8df83c2eccb37c5863ad98baeb29796ec96f2c503783d7b89bf80c98 + md5: 32ae18eb2a687912fc9e92a501c0a11b + sha256: a7f7e765dfb7af5265a38080e46f18cb07cfeecf81fe28fad23c4538e7d521c3 manager: conda name: zstd optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-h3eb15da_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-hfc55251_7.conda version: 1.5.2 - category: main dependencies: @@ -1642,30 +1643,30 @@ package: version: 3.8.2 - category: main dependencies: - libbrotlidec: 1.0.9 h166bdaf_8 - libbrotlienc: 1.0.9 h166bdaf_8 + libbrotlidec: 1.0.9 h166bdaf_9 + libbrotlienc: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: e5613f2bc717e9945840ff474419b8e4 - sha256: ab1994e03bdd88e4b27f9f802ac18e45ed29b92cce25e1fd86da43b89734950f + md5: d47dee1856d9cb955b8076eeff304a5b + sha256: 1c128f136a59ee2fa47d7fbd9b6fc8afa8460d340e4ae0e6f5419ebbd7539a10 manager: conda name: brotli-bin optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: - gcc_impl_linux-64: '>=13.1.0,<13.1.1.0a0' + gcc_impl_linux-64: '>=12.3.0,<12.3.1.0a0' hash: - md5: bf50acee3dbe6198ad304538eedd9413 - sha256: a89b1750b88e5b2d3f3326a1755267dcd20ee1998cef9e961dde1d67890c584c + md5: 203fbb799caffdf242ccef5f9879d3a1 + sha256: b9db23cd4fd2df43c06734b3cdb7491e03472679282a058bca7148455704b6a4 manager: conda name: conda-gcc-specs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/conda-gcc-specs-13.1.0-h0612280_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/conda-gcc-specs-12.3.0-h83fac38_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -1709,16 +1710,16 @@ package: version: 2.12.1 - category: main dependencies: - gcc_impl_linux-64: 13.1.0.* + gcc_impl_linux-64: 12.3.0.* hash: - md5: 847c6849a2a4ca12e907c17872694d23 - sha256: b6ee942b1d9b30c2d6eda2a2c36ba05f26a4a8a625d8aa27d5fbaa13045399ab + md5: 8da41232e71a99e3ff1cc43350d0f0fb + sha256: 1cd58fecd56680f8e8eda18fa3d557231b7016cd3de50c73a0ce8b79303d37b9 manager: conda name: gcc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc-13.1.0-h8e92de4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.3.0-h8d2909c_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=12' @@ -1738,18 +1739,18 @@ package: version: 3.7.8 - category: main dependencies: - gcc_impl_linux-64: 13.1.0 hc4be1a9_0 - libstdcxx-devel_linux-64: 13.1.0 he3cc6c4_0 + gcc_impl_linux-64: 12.3.0 he2b93b0_0 + libstdcxx-devel_linux-64: 12.3.0 h8bca6fd_0 sysroot_linux-64: '' hash: - md5: e6591b3c81fc5fb83e342b20a2506e80 - sha256: a2e154839f057a4fc540c038de13db3c562bccf361a06ed5072e1c74691c4062 + md5: 3f00aa0a8f8d3924890fecae937cc6bd + sha256: 87c7ec85f76aa065c2c991acd7bbf86d25b4724bc283f793400c14f5d5e39aa0 manager: conda name: gxx_impl_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx_impl_linux-64-13.1.0-hc4be1a9_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gxx_impl_linux-64-12.3.0-he2b93b0_0.conda + version: 12.3.0 - category: main dependencies: keyutils: '>=1.6.1,<2.0a0' @@ -1808,14 +1809,14 @@ package: libzlib: '>=1.2.13,<1.3.0a0' pcre2: '>=10.40,<10.41.0a0' hash: - md5: a64f11b244b2c112cd3fa1cbe9493999 - sha256: 6a34c6b123f06fcee7e28e981ec0daad09bce35616ad8e9e61ef84be7fad4d92 + md5: c6f951789c888f7bbd2dd6858eab69de + sha256: e909b5e648d1ace172aac2ddf9d755f72429b134155a9b07156acb58a77ceee1 manager: conda name: libglib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.3-hebfc3b9_0.conda - version: 2.76.3 + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.4-hebfc3b9_0.conda + version: 2.76.4 - category: main dependencies: libblas: 3.9.0 17_linux64_openblas @@ -1867,20 +1868,20 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libprotobuf: '>=4.23.2,<4.23.3.0a0' + libprotobuf: '>=4.23.3,<4.23.4.0a0' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' - openssl: '>=3.1.0,<4.0a0' + ncurses: '>=6.4,<7.0a0' + openssl: '>=3.1.1,<4.0a0' perl: '>=5.32.1,<5.33.0a0 *_perl5' hash: - md5: 2cf0c4f7a0a46c75e27735d16fab1501 - sha256: 412157ab852270658e1b96e6f66e00f8ca7039ea8d4ae24090b1d3f726fadfac + md5: 434a2df8dbd192cb511290763a4f93d8 + sha256: b0424b21c5d1790c04e96a7d62e10326fa3c8b0c263ad8cb4eda707b94317f98 manager: conda name: mosh optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321h4605741_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321hc529e37_2.conda version: 1.4.0 - category: main dependencies: @@ -1980,14 +1981,14 @@ package: xorg-xextproto: '>=7.3.0,<8.0a0' xorg-xproto: '' hash: - md5: 742d9cd4a7da3ac6345f986e5da3b18d - sha256: e154c384ec43a4b456f27a27e3a5657103c44b16f19c07239e0accd07600c500 + md5: 7590b76c3d11d21caa44f3fc38ac584a + sha256: 3360f81f7687179959a6bf1c762938240172e8bb3aef957e0a14fb12a0b7c105 manager: conda name: xorg-libx11 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.5-h8ee46fc_0.conda - version: 1.8.5 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.6-h8ee46fc_0.conda + version: 1.8.6 - category: main dependencies: python: '>=3.6' @@ -2064,18 +2065,18 @@ package: version: 1.6.2 - category: main dependencies: - brotli-bin: 1.0.9 h166bdaf_8 - libbrotlidec: 1.0.9 h166bdaf_8 - libbrotlienc: 1.0.9 h166bdaf_8 + brotli-bin: 1.0.9 h166bdaf_9 + libbrotlidec: 1.0.9 h166bdaf_9 + libbrotlienc: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: 2ff08978892a3e8b954397c461f18418 - sha256: 74c0fa22ea7c62d2c8f7a7aea03a3bd4919f7f3940ef5b027ce0dfb5feb38c06 + md5: 4601544b4982ba1861fa9b9c607b2c06 + sha256: 2357d205931912def55df0dc53573361156b27856f9bf359d464da162812ec1f manager: conda name: brotli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: @@ -2117,27 +2118,27 @@ package: dependencies: python: '>=3.7' hash: - md5: 7fcff9f6f123696e940bda77bd4d6551 - sha256: 06cd371fc98f076797d6450f6f337cb679b1060c99680fb7e044591493333194 + md5: 313516e9a4b08b12dfb1e1cd390a96e3 + sha256: 0666a95fbbd2299008162e2126c009191e5953d1cad1878bf9f4d8d634af1dd4 manager: conda name: charset-normalizer optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.1.0-pyhd8ed1ab_0.conda - version: 3.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.2.0-pyhd8ed1ab_0.conda + version: 3.2.0 - category: main dependencies: __unix: '' python: '>=3.8' hash: - md5: 20e4087407c7cb04a40817114b333dbf - sha256: 23676470b591b100393bb0f6c46fe10624dcbefc696a6a9f42932ed8816ef0ea + md5: fcae73fbdce7981fd500c626bb1ba6ab + sha256: 63f2b103488ba80b274f25bade66394fdd02344024fce45ab44e45861931c61d manager: conda name: click optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2 - version: 8.1.3 + url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.4-unix_pyh707e725_0.conda + version: 8.1.4 - category: main dependencies: python: '>=3.6' @@ -2236,6 +2237,7 @@ package: python_abi: 3.9.* *_cp39 hash: md5: ae197de48b202c65efd7a61135ac0ae5 + sha256: null manager: conda name: esp-tools optional: false @@ -2246,14 +2248,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 7312299d7a0ea4993159229b7d2dceb2 - sha256: f073c3ba993912f1c0027bc34a54975642885f0a4cd5f9dc42a17ca945df2c18 + md5: de4cb3384374e1411f0454edcf546cdb + sha256: 7b23ea0169fa6e7c3a0867d96d9eacd312759f83e5d83ad0fcc93e85379c16ae manager: conda name: exceptiongroup optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda - version: 1.1.1 + url: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.2-pyhd8ed1ab_0.conda + version: 1.1.2 - category: main dependencies: python: '>=3.7' @@ -2358,17 +2360,17 @@ package: version: 0.7.6 - category: main dependencies: - gcc: 13.1.0.* - gxx_impl_linux-64: 13.1.0.* + gcc: 12.3.0.* + gxx_impl_linux-64: 12.3.0.* hash: - md5: 5592c3280d50f5dc8dc548ba98c6e9ba - sha256: 3c99a6df3f0cac1b8730fea9cc32fab07475b1b8a9b1e7a10d3951bdf29a415f + md5: c6f5830abf6e0849e32eeaa8feb6af2e + sha256: e6734338ae19b90956532cbab5792e57ec0885fd1e36ab95fe0d1f6e5b5959e4 manager: conda name: gxx optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx-13.1.0-h8e92de4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.3.0-h8d2909c_0.conda + version: 12.3.0 - category: main dependencies: python: '>=3.9,<3.10.0a0' @@ -2599,17 +2601,17 @@ package: 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' + libtiff: '>=4.5.1,<4.6.0a0' + libwebp-base: '>=1.3.1,<2.0a0' hash: - md5: 9cfd7ad6e1539ca1ad172083586b3301 - sha256: 461fe2c0279309c21f206f114f3bd6592e906ef6f8cc181b2e28482941b8b925 + md5: 4963f3f12db45a576f2b8fbe9a0b8569 + sha256: b0428f43bb3bc4544b997fcd9dfeb5593ee10701e8895cef22212105a8d8aa8d 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.3.1-hbf2b3c1_0.conda + version: 1.3.1 - category: main dependencies: python: '' @@ -2723,14 +2725,14 @@ package: python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: 8626d6d5169950ce4b99b082667773f7 - sha256: c8fac78b5292c279449e4ccba03661dd75f9d39b0f5d40b8bf55c3fcd89f64ce + md5: d3e2ec4b400a6ad93057a29b7e3cb701 + sha256: 282da8ac8a70cf6fbc7a28fd5dcd12a09957bcb14ab3b9956ee67c7ed011d583 manager: conda name: numpy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.3-py39h6183b62_0.conda - version: 1.24.3 + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.25.1-py39h6183b62_0.conda + version: 1.25.1 - category: main dependencies: libgcc-ng: '>=12' @@ -2787,14 +2789,14 @@ package: dependencies: python: '>=3.8' hash: - md5: 7d301a0d25f424d96175f810935f0da9 - sha256: c25e1757e4e90638bb1e778aba3ee5f3c01fae9752e3c3929f9be7d367f6c7f3 + md5: 7263924c642d22e311d9e59b839f1b33 + sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 manager: conda name: pluggy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2 - version: 1.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + version: 1.2.0 - category: main dependencies: python: '>=3.9,<3.10.0a0' @@ -2900,14 +2902,14 @@ package: dependencies: python: '>=3.6' hash: - md5: e8fbc1b54b25f4b08281467bc13b70cc - sha256: 4acc7151cef5920d130f2e0a7615559cce8bfb037aeecb14d4d359ae3d9bc51b + md5: d3ed087d1f7f8f5590e8e87b57a8ce64 + sha256: 18e3bd52c64f23bbc7c200fd2fc4152dd29423936dc43e8f129cb43f1af0136c manager: conda name: pyparsing optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2 - version: 3.0.9 + url: https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.1.0-pyhd8ed1ab_0.conda + version: 3.1.0 - category: main dependencies: libgcc-ng: '>=12' @@ -2924,16 +2926,16 @@ package: version: 0.19.3 - category: main dependencies: - __unix: '' - python: '>=3.8' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 hash: - md5: 2a7de29fb590ca14b5243c4c812c8025 - sha256: a42f826e958a8d22e65b3394f437af7332610e43ee313393d1cf143f0a2d274b + md5: d34b97a2386932b97c7cb80916a673e7 + sha256: 42d46baeab725d3c70d22a4258549e9f0f1a72b740166cd9c3b394c4369cb306 manager: conda name: pysocks optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py39hf3d152e_5.tar.bz2 version: 1.7.1 - category: main dependencies: @@ -3020,14 +3022,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 3b68bc43ec6baa48f7354a446267eefe - sha256: 3ac44771fce01f19218bcdf3992e24984748048db69889a9df65abcc6a10e29b + md5: 5a7739d0f57ee64133c9d32e6507c46d + sha256: 083a0913f5b56644051f31ac40b4eeea762a88c00aa12437817191b85a753cec manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.7.2-pyhd8ed1ab_0.conda - version: 67.7.2 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-68.0.0-pyhd8ed1ab_0.conda + version: 68.0.0 - category: main dependencies: python: '' @@ -3238,14 +3240,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 4a3014a4d107d15475d106b751c4e352 - sha256: 90a8d56c8015af1575d504d5f77d95a806cd999fc178a06ab51a349f1f744672 + md5: c39d6a09fe819de4951c2642629d9115 + sha256: 6edd6d5be690be492712cb747b6d62707f0d0c34ef56eefc796d91e5a03187d1 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.6.3-pyha770c72_0.conda - version: 4.6.3 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.7.1-pyha770c72_0.conda + version: 4.7.1 - category: main dependencies: libgcc-ng: '>=12' @@ -3295,14 +3297,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 9beb712a1de20fea4e339a2d62851564 - sha256: 5176f7157b3152535e11c360b089d45d7eaf4c6c0e2116952138ab2ae195419f + md5: c34d9325a609381a0b0e8a5b4f325147 + sha256: c71cb65ac49692adb33735f3114b99a96c0c5140db1d56cf4ccef4fe92ea9a4c manager: conda name: websocket-client optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.3-pyhd8ed1ab_0.conda - version: 1.5.3 + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.1-pyhd8ed1ab_0.conda + version: 1.6.1 - category: main dependencies: python: '>=3.7' @@ -3371,18 +3373,18 @@ package: version: 5.0.3 - category: main dependencies: - libgcc-ng: '>=9.3.0' - xorg-libx11: '>=1.7.0,<2.0a0' + libgcc-ng: '>=12' + xorg-libx11: '>=1.8.6,<2.0a0' xorg-renderproto: '' hash: - md5: f59c1242cc1dd93e72c2ee2b360979eb - sha256: 7d907ed9e2ec5af5d7498fb3ab744accc298914ae31497ab6dcc6ef8bd134d00 + md5: ed67c36f215b310412b2af935bf3e530 + sha256: 26da4d1911473c965c32ce2b4ff7572349719eaacb88a066db8d968a4132c3f7 manager: conda name: xorg-libxrender optional: false 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 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.11-hd590300_0.conda + version: 0.9.11 - category: main dependencies: libgcc-ng: '>=12' @@ -3402,16 +3404,16 @@ package: version: 1.3.0 - category: main dependencies: - python: '>=3.7' + python: '>=3.8' hash: - md5: 13018819ca8f5b7cc675a8faf1f5fedf - sha256: 241de30545299be9bcea3addf8a2c22a3b3d4ba6730890e150ab690ac937a3d2 + md5: 0ea0b5003b96e53769a5f70175ff5264 + sha256: 14b78fc742efdf46e3ecff0a4b89cbdf780b8cf22c822024cc642e4284339ea4 manager: conda name: zipp optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda - version: 3.15.0 + url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.16.0-pyhd8ed1ab_1.conda + version: 3.16.0 - category: main dependencies: frozenlist: '>=1.1.0' @@ -3625,14 +3627,14 @@ package: python_abi: 3.9.* *_cp39 unicodedata2: '>=14.0.0' hash: - md5: 5f7c468bf9d9551a80187db7e809ef1f - sha256: 9d4a61bf76070a197ec565943a1811b53260ec3a468a14671bbf8b9c36a1232f + md5: 2de1f1007cb53e2d8e062cabea02f883 + sha256: d291856787dc9cc46e668014cfbf02eb1e987b3b73e6aa09338726f9663dcbe1 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.40.0-py39hd1e30aa_0.conda - version: 4.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.41.0-py39hd1e30aa_0.conda + version: 4.41.0 - category: main dependencies: python: '>=3.4' @@ -3678,40 +3680,40 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: f91a5d5175fb7ff2a91952ec7da59cb9 - sha256: 33d49065756a73fbb92277c756fa00a41891408528eb90ae05ff3367a401ae6e + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.6.0-pyha770c72_0.conda - version: 6.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + version: 6.8.0 - category: main dependencies: - python: '>=3.7' + python: '>=3.8' zipp: '>=3.1.0' hash: - md5: e5fd2260a231ee63b6969f4801082f2b - sha256: 091cca3e010f7a7353152f0abda2d68cfd83ddde80a15e974d9e18b2047e7be2 + md5: a08b6be5bf18b9d2a927d3457750f82e + sha256: 94c1b2831c0f908ae56212d9aeb9c9173051d307682b4fedfd88fef774b0b8f7 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_resources-6.0.0-pyhd8ed1ab_1.conda + version: 6.0.0 - category: main dependencies: more-itertools: '' python: '>=3.7' hash: - md5: 31e4a1506968d017229bdb64695013a1 - sha256: 6a81b67a1de8f761f66a4540bbd07cc27f9fbf2c7d67aa3732ebef379cf62874 + md5: e9f79248d30e942f7c358ff21a1790f5 + sha256: 14f5240c3834e1b784dd41a5a14392d9150dff62a74ae851f73e65d2e2bbd891 manager: conda name: jaraco.classes optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jaraco.classes-3.2.3-pyhd8ed1ab_0.tar.bz2 - version: 3.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/jaraco.classes-3.3.0-pyhd8ed1ab_0.conda + version: 3.3.0 - category: main dependencies: markupsafe: '>=2.0' @@ -3800,14 +3802,14 @@ package: tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: 752593aa8094de1c8606411d13d003fb - sha256: 973ade2e49e9bc73b2364322506c5cc39320037ac416f45b133801bc2706446a + md5: 51533b4b6e7faadfffe35dd60bb47767 + sha256: 6139824c025225888eed5cf7032081c87bd720c32ae8e9e80680179a1bd5a74c manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.3.0-py39hd1e30aa_0.conda - version: 1.3.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.4.1-py39hd1e30aa_0.conda + version: 1.4.1 - category: main dependencies: python: 2.7|>=3.7 @@ -3827,8 +3829,8 @@ package: 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.3.0,<2.0a0' + libtiff: '>=4.5.1,<4.6.0a0' + libwebp-base: '>=1.3.1,<2.0a0' libxcb: '>=1.15,<1.16.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' @@ -3836,14 +3838,14 @@ package: python_abi: 3.9.* *_cp39 tk: '>=8.6.12,<8.7.0a0' hash: - md5: d7aa9b99ed6ade75fbab1e4cedcb3ce2 - sha256: 3cb87b24c89cd4fdb0c448982e6d37d6974332160f7576c1a99d0eb59f537444 + md5: f97a95fab7c69678ebf6b57396b1323e + sha256: 8182e1782baaef35efdbb80468db7df160af7bd4ec46127d5c284768eca2980b manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py39haaeba84_1.conda - version: 9.5.0 + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-10.0.0-py39haaeba84_0.conda + version: 10.0.0 - category: main dependencies: python: '>=3.7' @@ -3865,17 +3867,17 @@ package: iniconfig: '' packaging: '' pluggy: '>=0.12,<2.0' - python: '>=3.8' + python: '>=3.7' tomli: '>=1.0.0' hash: - md5: 8907018dd1302aada2632ca679e25ccd - sha256: 18c4493e7739d8f5b7674f8149821dc9fd861d2b1fbd24829afdcba692792b47 + md5: 3cfe9b9e958e7238a386933c75d190db + sha256: 52b2eb4e8d0380d92d45643d0c9706725e691ce8404dab4c2db4aaf58e48a23c manager: conda name: pytest optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.3.2-pyhd8ed1ab_0.conda - version: 7.3.2 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.4.0-pyhd8ed1ab_0.conda + version: 7.4.0 - category: main dependencies: python: '>=3.6' @@ -3929,14 +3931,14 @@ package: ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: bb9509b491be59807c5c935516b223f2 - sha256: bc9f26d477c5f3748a7f3060096ffe3fefda330dc7d249843130fd3c17431073 + md5: 9195e245f63b036613cca28dd499efdf + sha256: 3bf4ce9639e4acc647ad878a331714c0982df00702440c0f4993fbd6ce2bde99 manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.31-py39hd1e30aa_0.conda - version: 0.17.31 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.32-py39hd1e30aa_0.conda + version: 0.17.32 - category: main dependencies: colorama: '' @@ -3965,16 +3967,16 @@ package: version: 2.31.0.1 - category: main dependencies: - typing_extensions: 4.6.3 pyha770c72_0 + typing_extensions: 4.7.1 pyha770c72_0 hash: - md5: 3876f650ed7d0f95d70fa4b647621909 - sha256: d2334dab270e13182403cc3a394e3da8e7acb409e94059a6d9223d2ac053f90a + md5: f96688577f1faa58096d06a45136afa2 + sha256: d5d19b8f5b275240c19616a46d67ec57250b3720ba88200da8c732c3fcbfc21d manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.6.3-hd8ed1ab_0.conda - version: 4.6.3 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.7.1-hd8ed1ab_0.conda + version: 4.7.1 - category: main dependencies: gettext: '>=0.21.1,<1.0a0' @@ -4040,6 +4042,19 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.2-py39hd1e30aa_0.conda version: 1.9.2 +- category: main + dependencies: + python: '>=3.7' + typing-extensions: '>=4.0.0' + hash: + md5: 578ae086f225bc2380c79f3b551ff2f7 + sha256: bbabfd4400b03ba6c50d0a55e777e0c3ba900af8dabedb9b8aded774484b5d53 + manager: conda + name: annotated-types + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.5.0-pyhd8ed1ab_0.conda + version: 0.5.0 - category: main dependencies: python: '>=3.6' @@ -4175,14 +4190,14 @@ package: python: '>=3.7' typing_extensions: '>=3.7.4.3' hash: - md5: f6e6b482110246a81c3f03e81c68752d - sha256: 77c531def610089bc190508fcf304cf96c085c5fe977ab8f7d7c1641769592ac + md5: 5809a12901d57388444c3293c975d0bb + sha256: 07008a94189e570fcabe003b99bd50b8263f60c824f36f81a8819bb7cf7eab1b manager: conda name: gitpython optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda - version: 3.1.31 + url: https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.32-pyhd8ed1ab_0.conda + version: 3.1.32 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4203,29 +4218,29 @@ package: version: 7.3.0 - category: main dependencies: - importlib_resources: '>=5.12.0,<5.12.1.0a0' + importlib_resources: '>=6.0.0,<6.0.1.0a0' python: '>=3.7' hash: - md5: 3544c818f0720c89eb16ae6940ab440b - sha256: 0675df2bf18e52d0ea2bc5e1009faac273f059361a0caf36c0e0edc7831098a9 + md5: d69f29916f934f30adb1dd5fff4d9a8b + sha256: c0247e1a001393e9415c8814a0820cbc84c28a42625dbc3fd389ad1e5a87b796 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-resources-6.0.0-pyhd8ed1ab_1.conda + version: 6.0.0 - category: main dependencies: - importlib-metadata: '>=6.6.0,<6.6.1.0a0' + importlib-metadata: '>=6.8.0,<6.8.1.0a0' hash: - md5: 3cbc9615f10a3d471532b83e4250b971 - sha256: 5de35d3c019d8a36e0a0deeb04a62689837bd68234a0a73a3355b860b442eca4 + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.6.0-hd8ed1ab_0.conda - version: 6.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + version: 6.8.0 - category: main dependencies: attrs: '>=17.4.0' @@ -4250,6 +4265,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 + sha256: null manager: conda name: libdwarf optional: false @@ -4267,14 +4283,14 @@ package: python_abi: 3.9.* *_cp39 pytz: '>=2020.1' hash: - md5: de99b3f807c0b295a7df94623df0fb4c - sha256: 234e0474b55edc7159ddbdf03c99a9d9f53a0b32d9c505dc4be85698bab9bd6b + md5: cfe677f02e507f76d6767379e4ff09a9 + sha256: b9a9de37da5f6c73979f317a47176c5954dc7fe84ef4ab107f11976bbf1a8f75 manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.2-py39h40cae4c_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.3-py39h40cae4c_1.conda + version: 2.0.3 - category: main dependencies: pip: '' @@ -4293,29 +4309,29 @@ package: python: '>=3.7' typing-extensions: '>=4.6.3' hash: - md5: c085a16ba3d0c9ee282c438308b57724 - sha256: 528dcba75c81505e911b23d9795e35c564f7be1f74c7fdf5d8ad4e231b569c2a + md5: e76070baecfaca6ecdb5fbd5af7c9309 + sha256: b5012d6fd30f2462b6ca595539cfdae9aaf61b3b7a56e51ab94aef0fd9efcd3d manager: conda name: platformdirs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.3-pyhd8ed1ab_0.conda - version: 3.5.3 + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.8.1-pyhd8ed1ab_0.conda + version: 3.8.1 - category: main dependencies: libgcc-ng: '>=12' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 - typing-extensions: '>=4.2.0' + typing-extensions: '>=4.6.0' hash: - md5: 86b64954a7735da9fed884c6c7d06711 - sha256: dbf26d41a56963f8cc910436493efd712d8820a6b598e21f4829a30b1c2ae655 + md5: e52f02654a9613d84002a492b6f54a39 + sha256: d8c6ba4a823b4a3e964b6155394206c598569393e5625f3b75fb3cf79a0b442c manager: conda - name: pydantic + name: pydantic-core optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.9-py39hd1e30aa_0.conda - version: 1.10.9 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.1.2-py39h9fdd4d6_0.conda + version: 2.1.2 - category: main dependencies: cffi: '>=1.4.1' @@ -4351,27 +4367,27 @@ package: pytest: '>=5.0' python: '>=3.7' hash: - md5: db93caa9fe182f0cd20291aeb22f57ac - sha256: 87bb8edc9976403237a0e6c3bd7b2224c346c95e4c7345971f411aef21593450 + md5: fcd2531bc3e492657aeb042349aeaf8a + sha256: d2f6a46fe31dea91b427bcc57302edc345eb763caf3c6b6dcd09b2aee002324b 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/pytest-mock-3.11.1-pyhd8ed1ab_0.conda + version: 3.11.1 - category: main dependencies: pip: '' python: '>=3.7,<4.0' hash: - md5: 7a02fed21d1bf45cb41eaeaefc7eea25 - sha256: 6ba480465154a4ac2ba1c08d10e4824dc10db30d8087b83b2b041df0ebba18e8 + md5: ffabccdca64c44c1f23a8df134708897 + sha256: dbc0641f63dbf6d2d2e9b17a21ae8e0b3cb8e24ffa675e06cf5ce6f76d6a58d8 manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.19-pyhd8ed1ab_0.conda - version: 0.16.19 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.23-pyhd8ed1ab_0.conda + version: 0.16.23 - category: main dependencies: cffi: '' @@ -4413,13 +4429,13 @@ package: python_abi: 3.9.* *_cp39 zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 6023bdb101f9c7fcf11595442cb832b0 - sha256: 7297303784e4b4964fa15eac0d0559f3598d9abf8d941b33f51315c590e16eda + md5: 84ba0f78de14c9ac4418facd5f9c68ef + sha256: a8ad86ef09638293fd3f77a0f8298d4920dad19781dc697fc7d6662058e96a8e 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-py39h6e5214e_2.conda version: 0.19.0 - category: main dependencies: @@ -4448,14 +4464,14 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 1641a445c924901462945e7797207d0e - sha256: ae638d5d6ca1f65f5466c7988f5a07164f63be9489cd6607f11d3dca95395e89 + md5: 63ed81138f359d75fb3f8c1e8deadfe0 + sha256: e181ec7110dc831c91b4660de20e0023b0adc898bcde34cc2048d7fc286b2fb3 manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.153-pyhd8ed1ab_0.conda - version: 1.29.153 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.165-pyhd8ed1ab_0.conda + version: 1.29.165 - category: main dependencies: clang-format: 16.0.3 default_h1cdf331_2 @@ -4534,6 +4550,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 + sha256: null manager: conda name: libdwarf-dev optional: false @@ -4646,6 +4663,23 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/paramiko-3.2.0-pyhd8ed1ab_0.conda version: 3.2.0 +- category: main + dependencies: + annotated-types: '>=0.4.0' + libgcc-ng: '>=12' + pydantic-core: 2.1.2 + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 + typing-extensions: '>=4.6.1' + hash: + md5: f7d96146fbf4ab45ffc81107159a2683 + sha256: e3b46f24441e27116feb02e5737efeab3f549684ec3c50eb7115104ffc652fd7 + manager: conda + name: pydantic + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-2.0.2-py39hd1e30aa_1.conda + version: 2.0.2 - category: main dependencies: cryptography: '>=38.0.0,<42,!=40.0.0,!=40.0.1' @@ -4722,18 +4756,18 @@ package: - category: main dependencies: distlib: <1,>=0.3.6 - filelock: <4,>=3.11 - platformdirs: <4,>=3.2 + filelock: <4,>=3.12 + platformdirs: <4,>=3.5.1 python: '>=3.8' hash: - md5: a920e114c4c2ced2280e266da65ab5e6 - sha256: 13d667887ea08b6d1fe2eb09d2d737f9af7343735d3bfa5ffaa3f67eec8eaff7 + md5: 838b85f656b078bdd882ef97978e7f40 + sha256: 92dd17aef10e5c35289da3a588cbed3e593c22ee53478a00ccb1fdf92fe0e84e manager: conda name: virtualenv optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.23.0-pyhd8ed1ab_0.conda - version: 20.23.0 + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.23.1-pyhd8ed1ab_0.conda + version: 20.23.1 - category: main dependencies: conda-package-streaming: '>=0.7.0' @@ -4789,14 +4823,14 @@ package: python_abi: 3.9.* *_cp39 secretstorage: '>=3.2' hash: - md5: ae2df7a822f7671da22da24ead24cc0a - sha256: 107e6a5ba122dff162e9d34a87af1ffbb4dca1f7dd1547294646774ca9421524 + md5: bca055aa9d1d8730c1a93a9ad138456a + sha256: d431310c2195bb77a6fc5184b3914b9018b7ed31b27d0faa2296dd681fe229e3 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 - version: 23.13.1 + url: https://conda.anaconda.org/conda-forge/linux-64/keyring-24.2.0-py39hf3d152e_0.conda + version: 24.2.0 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4853,14 +4887,14 @@ package: __unix: '' openjdk: '>=8' hash: - md5: c83e34b1cf3399f1ea6a0b9515dcb7b0 - sha256: f890d8cf7c7c2b8cabe3cb51c505b19f934f41e51a9ff4cf3d067be38eff16f8 + md5: 67177beb0a5d0968d7b2935b7901d955 + sha256: f0582f7f4f90231754f6532de13d9737ed422a5bb086962dcf0380c0ea2513df manager: conda name: sbt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sbt-1.9.0-hd8ed1ab_0.conda - version: 1.9.0 + url: https://conda.anaconda.org/conda-forge/noarch/sbt-1.9.2-h707e725_0.conda + version: 1.9.2 - category: main dependencies: brotlipy: '>=0.6.0' @@ -4886,14 +4920,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 125145419a317cbaa069e4ae71eb0890 - sha256: 35edb690ba6636d2d8bca4a5834b9911ba11a86bcb736983c755cd08a7934f6e + md5: 191ea267121cccd3531e98ea5b869b87 + sha256: 3172c3714a3c6abc729af5335dfbf2ac02acc01ec64ad1d30413bd49f1bd0497 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.153-pyhd8ed1ab_0.conda - version: 1.29.153 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.31.2-pyhd8ed1ab_0.conda + version: 1.31.2 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4961,14 +4995,14 @@ package: six: '>=1.11.0' typing-extensions: '>=4.0.1' hash: - md5: 5576496c2743cafa05111ac76267db29 - sha256: 51951b49a43b7de818ad055d113348f7e438e225fc7a5f8f4c635998239c4c89 + md5: 3f61696f5c09ca1e7001d042c9968c1d + sha256: da22c5d95a9ed937509b696568cd51580f3becec90febf0e5b1aca1096bf4c24 manager: conda name: azure-core optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.27.1-pyhd8ed1ab_0.conda - version: 1.27.1 + url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.28.0-pyhd8ed1ab_0.conda + version: 1.28.0 - category: main dependencies: msgpack-python: '>=0.5.2' @@ -5015,14 +5049,14 @@ package: urllib3: '>=1.26.0' websocket-client: '>=0.32.0' hash: - md5: 543336c6aa9516cfb29c51d5c162b177 - sha256: 5e01e15e20ee573c99b530633a0d5c71fd515e4ac6d2f5f5f57baece8b915cc3 + md5: c95d23d8bae7e21491868cc7772d7c73 + sha256: 7c3031602e92fd7682302ef98a45bdf7374d48a849cdd3900b7c68a32d162177 manager: conda name: docker-py optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.1.0-pyhd8ed1ab_0.conda - version: 6.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.1.3-pyhd8ed1ab_0.conda + version: 6.1.3 - category: main dependencies: appdirs: '' @@ -5128,7 +5162,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.153 + botocore: 1.31.2 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.9,<3.10.0a0' @@ -5137,29 +5171,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: d36fd3d4c44b95f49b4f7ee764c82a64 - sha256: eae3408f419136e8682b9f5cb153781c18838bde77d2b2407c8bb5a6dd8943ec + md5: 7d905f150353c988f96214e8938f6f97 + sha256: b5d6ee42625204b702eaa07d612d9b19aad1f5f9f90caac7f6bac1f1a401953e manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.153-py39hf3d152e_0.conda - version: 1.27.153 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.29.2-py39hf3d152e_0.conda + version: 1.29.2 - category: main dependencies: - botocore: '>=1.29.153,<1.30.0' + botocore: '>=1.31.2,<1.32.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 3f834dbcec493d9f111b3408c7fa053f - sha256: db9ff9bb60827c5fbc66e34017e022d95acd1a45800b028e74d81542a2eff3a8 + md5: 1ebffec127102119aff7a572243464da + sha256: 454975a1def5ec1043925403547f9cf938c91a534c62cba509eb108b253bbf89 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.28.2-pyhd8ed1ab_0.conda + version: 1.28.2 - category: main dependencies: cachecontrol: 0.13.0 pyhd8ed1ab_0 @@ -5285,14 +5319,14 @@ package: python: '' typing_extensions: '' hash: - md5: 67fd9a7140e5e654b1fffa4fd199e470 - sha256: 3b4d4ca4aa7ac8de7b9c075db04384b21fdc2a529b7545e2b8c145204a1c19fb + md5: 31349469d53ac0877f3a90842023571d + sha256: feb48351ca5a328d200a7307d041b05f5d1e476151929951e1a11a1ecede8d4e manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.28.2-pyhd8ed1ab_0.conda + version: 1.28.2 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5333,28 +5367,28 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: b7bdd9d69d4b50005046441541f8e595 - sha256: b2420d8cd3889092c1747303a087b5a00b3c288cd802b8e3d680910244967d21 + md5: 1c53cbf18ef82bac6c4957398f107d61 + sha256: 5bd251a81e5ee934e0945530d00f46944c4dc5e8fad001ce761ef89310f9c9cc manager: conda name: mypy-boto3-s3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.28.0-pyhd8ed1ab_0.conda + version: 1.28.0 - category: main dependencies: boto3: '' python: '>=3.6' typing-extensions: '' hash: - md5: 15f76f6fc266130daeb779067f0befff - sha256: bb714e9179aae14f28587d9009bf598b4c72b5f62769e28b7e451e73b2061580 + md5: 7af6a634a654ee7aac1941e05cf1568c + sha256: 4fee92b4e5580dfd13fe942ae307100666064121197b94de5c824c3dd98eb327 manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.28.0-pyhd8ed1ab_0.conda + version: 1.28.0 - category: main dependencies: boto3: '' @@ -5433,30 +5467,32 @@ package: werkzeug: '>=0.5,!=2.2.0,!=2.2.1' xmltodict: '' hash: - md5: 5ea9fddda04eebeee16236d0f3240df1 - sha256: b351e5ed49f03a8aefb6a6c9c54fa34cc9792e4c7ef06b77803001ae195c12f3 + md5: 2ad89e262b7d71adc0820e207329d659 + sha256: 4a348f91127ca5456c224114329705b68c18812d67060f3cc93bb0310e5ebeba manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.11-pyhd8ed1ab_0.conda - version: 4.1.11 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.12-pyhd8ed1ab_0.conda + version: 4.1.12 - category: main dependencies: {} hash: - sha256: 0e0bc5ba78b8db3667ad636d964eb963dc97a59f04c6f6214c5f0e4a8f726c56 + sha256: 18c694e5ae8a208cdb3d2c20a993ca1a7b0efa258c247a1e565150f477f83744 manager: pip name: mock optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/27/6f/fbb16f260a7107ee98871d83f6793d88c4311b7189b10ef239da0b2181db/mock-5.0.2-py3-none-any.whl - version: 5.0.2 + source: null + url: https://files.pythonhosted.org/packages/6b/20/471f41173930550f279ccb65596a5ac19b9ac974a8d93679bcd3e0c31498/mock-5.1.0-py3-none-any.whl + version: 5.1.0 - dependencies: {} hash: sha256: 40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0 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 version: '6.0' - category: main @@ -5468,6 +5504,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 @@ -5479,6 +5516,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 @@ -5491,19 +5529,31 @@ 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: + typing-extensions: '>=4.2.0' + hash: + sha256: abade85268cc92dff86d6effcd917893130f0ff516f3d637f50dadc22ae93999 + manager: pip + name: pydantic + platform: linux-64 + source: null + url: https://files.pythonhosted.org/packages/65/d3/8ea06a592f4c218d3079ddb6d267015e6635c11ea4b282c2f5a9b62ca60b/pydantic-1.10.11-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + version: 1.10.11 - category: main dependencies: ruamel.yaml.clib: '>=0.2.7' hash: - sha256: 3cf153f0047ced526e723097ac615d3009371779432e304dbd5596b6f3a4c777 + sha256: 23cd2ed620231677564646b0c6a89d138b6822a0d78656df7abda5879ec4f447 manager: pip name: ruamel.yaml optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/9c/9c/e69fc06169ac6e757c66004885e0dfcc6c2b5c1a331a5dc70b890b6b4bf8/ruamel.yaml-0.17.31-py3-none-any.whl - version: 0.17.31 + source: null + url: https://files.pythonhosted.org/packages/d9/0e/2a05efa11ea33513fbdf4a2e2576fe94fd8fa5ad226dbb9c660886390974/ruamel.yaml-0.17.32-py3-none-any.whl + version: 0.17.32 - category: main dependencies: mock: '*' @@ -5514,6 +5564,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 @@ -5526,6 +5577,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 @@ -5536,13 +5588,14 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: 47f1fc5904756b01d46a8d23a4f3950382086b716138e21a027cd44dc5101f27 + sha256: f4fb4dd5f7fac1f2206a25d0949024046fe8f855198e8edbd5206fa9d58ab05f manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/30/e4/37b77c7921b80d58d8b2a325c031e75d656319b676e7fd4555e02b651a9d/hammer_vlsi-1.1.2-py3-none-any.whl - version: 1.1.2 + source: null + url: https://files.pythonhosted.org/packages/0a/da/1897421311c6332655e2f73d02d8c914ecb724198a1988aacd8f4c61ae6e/hammer_vlsi-1.1.1-py3-none-any.whl + version: 1.1.1 - category: main dependencies: asttokens: '>=2,<3' @@ -5553,6 +5606,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 @@ -5565,6 +5619,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 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 da09a600..92f4cd26 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/nayiri/chipyard-klayout/conda-reqs/chipyard.yaml -f /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml +# conda-lock -f /scratch/abejgonza/cy/conda-reqs/chipyard.yaml -f /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml --lockfile conda-requirements-riscv-tools-linux-64.conda-lock.yml metadata: channels: - url: ucb-bar @@ -21,12 +21,12 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: db3153c7461ca4a567f1ce617f9dfbf800afebd7924bf0062e98e2376610c28e + linux-64: c21b046554fff6a17a993f763664cc9d9994650e380510f7391ababd82f27219 platforms: - linux-64 sources: - - /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/chipyard.yaml - - /bwrcq/C/nayiri/chipyard-klayout/conda-reqs/riscv-tools.yaml + - /scratch/abejgonza/cy/conda-reqs/chipyard.yaml + - /scratch/abejgonza/cy/conda-reqs/riscv-tools.yaml package: - category: main dependencies: {} @@ -141,14 +141,14 @@ package: - category: main dependencies: {} hash: - md5: 5ec50dcd74ba7461709c4ac9c4cc4190 - sha256: 749dabbfe7b571affa19ef3ddb23e22e2eed12d5a699a9830a0f7fba2f296e02 + md5: b9ae31bc2e565684ebaf82d4bd954d55 + sha256: 257495088b78d4344c7ea21145581ed6da1c5bf8320f49b659ce2ed2d6265f76 manager: conda name: libgcc-devel_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-devel_linux-64-13.1.0-he3cc6c4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-devel_linux-64-12.3.0-h8bca6fd_0.conda + version: 12.3.0 - category: main dependencies: {} hash: @@ -163,14 +163,14 @@ package: - category: main dependencies: {} hash: - md5: e703914ad2288ab24cf5ac94d812fc11 - sha256: 21b95f21a80462c832caa348ece5413e10ba69d922dca01826706fe7b6f3a764 + md5: 7c80158949230e6d837186b20b2fcf13 + sha256: b311dad92ffafd29668fca6330dc707f4d7f154a4fa4c3859832897416de39ec manager: conda name: libstdcxx-devel_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-devel_linux-64-13.1.0-he3cc6c4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-devel_linux-64-12.3.0-h8bca6fd_0.conda + version: 12.3.0 - category: main dependencies: {} hash: @@ -185,14 +185,14 @@ package: - category: main dependencies: {} hash: - md5: 0fb0643c375ed8a5e8f57d1b7bb32686 - sha256: 416f534d81aae816b75b261bf4d72196e8d33d80503ae4bf73e7b24345e9308d + md5: 212e31461947b52bde67eab980d73435 + sha256: 7a2701c0d40d0f09c7192148df609e958c2e5a3fea367f4fee3e0b5f427d8375 manager: conda name: open_pdks.sky130a optional: false platform: linux-64 - url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.419_0_g3df14f8-20230606_125334.tar.bz2 - version: 1.0.419_0_g3df14f8 + url: https://conda.anaconda.org/litex-hub/noarch/open_pdks.sky130a-1.0.424_0_g78b7bc3-20230709_210322.tar.bz2 + version: 1.0.424_0_g78b7bc3 - category: main dependencies: {} hash: @@ -420,6 +420,7 @@ package: libstdcxx-ng: '>=12' hash: md5: 6bfb79319763a11c7423c9d0e0ee00b7 + sha256: null manager: conda name: dromajo optional: false @@ -556,25 +557,25 @@ package: libgcc-ng: '>=12' libstdcxx-ng: '>=12' hash: - md5: f67106643beadfc737b94ca0bfd6d8e3 - sha256: 1778dc86603df24aaf6865f7f3e1ffc5c793a0f1fc4570add2a6ccb4c0a62785 + md5: d1db1b8be7c3a8983dcbbbfe4f0765de + sha256: 3c6fab31ed4dc8428605588454596b307b1bd59d33b0c7073c407ab51408b011 manager: conda name: libabseil optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.2-cxx17_h59595ed_2.conda - version: '20230125.2' + url: https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.3-cxx17_h59595ed_0.conda + version: '20230125.3' - category: main dependencies: libgcc-ng: '>=12' hash: - md5: 9194c9bf9428035a05352d031462eae4 - sha256: ddc961a36d498aaafd5b71078836ad5dd247cc6ba7924157f3801a2f09b77b14 + md5: 61641e239f96eae2b8492dc7e755828c + sha256: fc57c0876695c5b4ab7173438580c1d7eaa7dccaf14cb6467ca9e0e97abe0cf0 manager: conda name: libbrotlicommon optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: @@ -688,16 +689,16 @@ package: version: 0.3.23 - category: main dependencies: - libgcc-ng: '>=13.1.0' + libgcc-ng: '>=12.3.0' hash: - md5: 7594fd17fb4d1b8b0e47a6b306fe01ae - sha256: 49214f61c270400e4da89f00b6b24565dc59d1d8b869fa003a22aeacaeca3851 + md5: bbc8fef17925480272a671b1d83431fa + sha256: 2fa38e53f7d58789283af351f014748a485ec8f4e7db3f150ed6274f50983663 manager: conda name: libsanitizer optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libsanitizer-13.1.0-hfd8a6a1_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/libsanitizer-12.3.0-h0f45ef3_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -774,14 +775,14 @@ package: dependencies: libgcc-ng: '>=12' hash: - md5: 0d4a7508d8c6c65314f2b9c1f56ad408 - sha256: ac3e073ea77803da71eb77e7fcef07defb345bda95eee3327c73ddf85b5714da + md5: 82bf6f63eb15ef719b556b63feec3a77 + sha256: 66658d5cdcf89169e284488d280b6ce693c98c0319d7eabebcedac0929140a73 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.3.1-hd590300_0.conda + version: 1.3.1 - category: main dependencies: libgcc-ng: '>=12' @@ -1204,21 +1205,21 @@ package: - category: main dependencies: binutils_impl_linux-64: '>=2.39' - libgcc-devel_linux-64: 13.1.0 he3cc6c4_0 - libgcc-ng: '>=13.1.0' - libgomp: '>=13.1.0' - libsanitizer: 13.1.0 hfd8a6a1_0 - libstdcxx-ng: '>=13.1.0' + libgcc-devel_linux-64: 12.3.0 h8bca6fd_0 + libgcc-ng: '>=12.3.0' + libgomp: '>=12.3.0' + libsanitizer: 12.3.0 h0f45ef3_0 + libstdcxx-ng: '>=12.3.0' sysroot_linux-64: '' hash: - md5: 99d1a8a8ee1665ee9435f8d160df69fe - sha256: d728da49acc79f2a46f9abe1f603fd4ccc9fc96f533b1647e3c836985caa5924 + md5: 1e41f51d89695fd3f810e2245517460b + sha256: ccbbb82de1ca95b02477e4340c5791e49424b379c6caa27e89bae3c40b7ad296 manager: conda name: gcc_impl_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-13.1.0-hc4be1a9_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-12.3.0-he2b93b0_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -1246,29 +1247,29 @@ package: version: 3.9.0 - category: main dependencies: - libbrotlicommon: 1.0.9 h166bdaf_8 + libbrotlicommon: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: 4ae4d7795d33e02bd20f6b23d91caf82 - sha256: d88ba07c3be27c89cb4975cc7edf63ee7b1c62d01f70d5c3f7efeb987c82b052 + md5: 081aa22f4581c08e4372b0b6c2f8478e + sha256: 564f301430c3c61bc5e149e74157ec181ed2a758befc89f7c38466d515a0f614 manager: conda name: libbrotlidec optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: - libbrotlicommon: 1.0.9 h166bdaf_8 + libbrotlicommon: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: 04bac51ba35ea023dc48af73c1c88c25 - sha256: a0468858b2f647f51509a32040e93512818a8f9980f20b3554cccac747bcc4be + md5: 1f0a03af852a9659ed2bf08f2f1704fd + sha256: d27bc2562ea3f3b2bfd777f074f1cac6bfa4a737233dad288cd87c4634a9bb3a manager: conda name: libbrotlienc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: @@ -1347,14 +1348,14 @@ package: libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 40e9b664b20732e651178d0ea29ae2a5 - sha256: 5f5b16e2e535e6116d0f51f9a15587d76fbe6504e69351ac117a74d666965c01 + md5: c8da7f04073ed0fabcb60885a4c1a722 + sha256: b0255d3c46c71e184d0513566a770356abf2cede5e795c4944521c4f7b6a26d4 manager: conda name: libprotobuf optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.2-hd1fb520_5.conda - version: 4.23.2 + url: https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.3-hd1fb520_0.conda + version: 4.23.3 - category: main dependencies: libgcc-ng: '>=12' @@ -1469,16 +1470,16 @@ package: version: '10.40' - category: main dependencies: - libgcc-ng: '>=9.4.0' + libgcc-ng: '>=12' libnsl: '>=2.0.0,<2.1.0a0' hash: - md5: 09ba115862623f00962e9809ea248f1a - sha256: a116c1d3c64a072280b441c43d893d341a1d37d16ec18afc76eee40299deabfa + md5: 53dc30c420516340641b00ec1571dd53 + sha256: 7e282c6b4106ccb00b3e5be9fc7f863b003d732ba51f76696ab23544a047a4fb manager: conda name: perl optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/perl-5.32.1-2_h7f98852_perl5.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/perl-5.32.1-3_hd590300_perl5.conda version: 5.32.1 - category: main dependencies: @@ -1591,13 +1592,13 @@ package: libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' hash: - md5: 6b63daed8feeca47be78f323e793d555 - sha256: fbe49a8c8df83c2eccb37c5863ad98baeb29796ec96f2c503783d7b89bf80c98 + md5: 32ae18eb2a687912fc9e92a501c0a11b + sha256: a7f7e765dfb7af5265a38080e46f18cb07cfeecf81fe28fad23c4538e7d521c3 manager: conda name: zstd optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-h3eb15da_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-hfc55251_7.conda version: 1.5.2 - category: main dependencies: @@ -1642,30 +1643,30 @@ package: version: 3.8.2 - category: main dependencies: - libbrotlidec: 1.0.9 h166bdaf_8 - libbrotlienc: 1.0.9 h166bdaf_8 + libbrotlidec: 1.0.9 h166bdaf_9 + libbrotlienc: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: e5613f2bc717e9945840ff474419b8e4 - sha256: ab1994e03bdd88e4b27f9f802ac18e45ed29b92cce25e1fd86da43b89734950f + md5: d47dee1856d9cb955b8076eeff304a5b + sha256: 1c128f136a59ee2fa47d7fbd9b6fc8afa8460d340e4ae0e6f5419ebbd7539a10 manager: conda name: brotli-bin optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: - gcc_impl_linux-64: '>=13.1.0,<13.1.1.0a0' + gcc_impl_linux-64: '>=12.3.0,<12.3.1.0a0' hash: - md5: bf50acee3dbe6198ad304538eedd9413 - sha256: a89b1750b88e5b2d3f3326a1755267dcd20ee1998cef9e961dde1d67890c584c + md5: 203fbb799caffdf242ccef5f9879d3a1 + sha256: b9db23cd4fd2df43c06734b3cdb7491e03472679282a058bca7148455704b6a4 manager: conda name: conda-gcc-specs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/conda-gcc-specs-13.1.0-h0612280_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/conda-gcc-specs-12.3.0-h83fac38_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=7.5.0' @@ -1709,16 +1710,16 @@ package: version: 2.12.1 - category: main dependencies: - gcc_impl_linux-64: 13.1.0.* + gcc_impl_linux-64: 12.3.0.* hash: - md5: 847c6849a2a4ca12e907c17872694d23 - sha256: b6ee942b1d9b30c2d6eda2a2c36ba05f26a4a8a625d8aa27d5fbaa13045399ab + md5: 8da41232e71a99e3ff1cc43350d0f0fb + sha256: 1cd58fecd56680f8e8eda18fa3d557231b7016cd3de50c73a0ce8b79303d37b9 manager: conda name: gcc optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gcc-13.1.0-h8e92de4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gcc-12.3.0-h8d2909c_0.conda + version: 12.3.0 - category: main dependencies: libgcc-ng: '>=12' @@ -1738,18 +1739,18 @@ package: version: 3.7.8 - category: main dependencies: - gcc_impl_linux-64: 13.1.0 hc4be1a9_0 - libstdcxx-devel_linux-64: 13.1.0 he3cc6c4_0 + gcc_impl_linux-64: 12.3.0 he2b93b0_0 + libstdcxx-devel_linux-64: 12.3.0 h8bca6fd_0 sysroot_linux-64: '' hash: - md5: e6591b3c81fc5fb83e342b20a2506e80 - sha256: a2e154839f057a4fc540c038de13db3c562bccf361a06ed5072e1c74691c4062 + md5: 3f00aa0a8f8d3924890fecae937cc6bd + sha256: 87c7ec85f76aa065c2c991acd7bbf86d25b4724bc283f793400c14f5d5e39aa0 manager: conda name: gxx_impl_linux-64 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx_impl_linux-64-13.1.0-hc4be1a9_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gxx_impl_linux-64-12.3.0-he2b93b0_0.conda + version: 12.3.0 - category: main dependencies: keyutils: '>=1.6.1,<2.0a0' @@ -1808,14 +1809,14 @@ package: libzlib: '>=1.2.13,<1.3.0a0' pcre2: '>=10.40,<10.41.0a0' hash: - md5: a64f11b244b2c112cd3fa1cbe9493999 - sha256: 6a34c6b123f06fcee7e28e981ec0daad09bce35616ad8e9e61ef84be7fad4d92 + md5: c6f951789c888f7bbd2dd6858eab69de + sha256: e909b5e648d1ace172aac2ddf9d755f72429b134155a9b07156acb58a77ceee1 manager: conda name: libglib optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.3-hebfc3b9_0.conda - version: 2.76.3 + url: https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.4-hebfc3b9_0.conda + version: 2.76.4 - category: main dependencies: libblas: 3.9.0 17_linux64_openblas @@ -1867,20 +1868,20 @@ package: - category: main dependencies: libgcc-ng: '>=12' - libprotobuf: '>=4.23.2,<4.23.3.0a0' + libprotobuf: '>=4.23.3,<4.23.4.0a0' libstdcxx-ng: '>=12' libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' - openssl: '>=3.1.0,<4.0a0' + ncurses: '>=6.4,<7.0a0' + openssl: '>=3.1.1,<4.0a0' perl: '>=5.32.1,<5.33.0a0 *_perl5' hash: - md5: 2cf0c4f7a0a46c75e27735d16fab1501 - sha256: 412157ab852270658e1b96e6f66e00f8ca7039ea8d4ae24090b1d3f726fadfac + md5: 434a2df8dbd192cb511290763a4f93d8 + sha256: b0424b21c5d1790c04e96a7d62e10326fa3c8b0c263ad8cb4eda707b94317f98 manager: conda name: mosh optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321h4605741_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/mosh-1.4.0-pl5321hc529e37_2.conda version: 1.4.0 - category: main dependencies: @@ -1903,24 +1904,24 @@ package: libffi: '>=3.4,<4.0a0' libgcc-ng: '>=12' libnsl: '>=2.0.0,<2.1.0a0' - libsqlite: '>=3.41.2,<4.0a0' + libsqlite: '>=3.42.0,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libzlib: '>=1.2.13,<1.3.0a0' - ncurses: '>=6.3,<7.0a0' - openssl: '>=3.1.0,<4.0a0' + ncurses: '>=6.4,<7.0a0' + openssl: '>=3.1.1,<4.0a0' readline: '>=8.2,<9.0a0' tk: '>=8.6.12,<8.7.0a0' tzdata: '' xz: '>=5.2.6,<6.0a0' hash: - md5: 7439c9d24378a82b73a7a53868dacdf1 - sha256: 6682c75caf3456796fb76313a25475738d85729b43f8c0e904407c0ed8362ede + md5: eb6f1df105f37daedd6dca78523baa75 + sha256: 05e2a7ce916d259f11979634f770f31027d0a5d18463b094e64a30500f900699 manager: conda name: python optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.11-he550d4f_0_cpython.conda - version: 3.10.11 + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.12-hd12c33a_0_cpython.conda + version: 3.10.12 - category: main dependencies: libgcc-ng: '>=12' @@ -1980,14 +1981,14 @@ package: xorg-xextproto: '>=7.3.0,<8.0a0' xorg-xproto: '' hash: - md5: 742d9cd4a7da3ac6345f986e5da3b18d - sha256: e154c384ec43a4b456f27a27e3a5657103c44b16f19c07239e0accd07600c500 + md5: 7590b76c3d11d21caa44f3fc38ac584a + sha256: 3360f81f7687179959a6bf1c762938240172e8bb3aef957e0a14fb12a0b7c105 manager: conda name: xorg-libx11 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.5-h8ee46fc_0.conda - version: 1.8.5 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.6-h8ee46fc_0.conda + version: 1.8.6 - category: main dependencies: python: '>=3.6' @@ -2064,18 +2065,18 @@ package: version: 1.6.2 - category: main dependencies: - brotli-bin: 1.0.9 h166bdaf_8 - libbrotlidec: 1.0.9 h166bdaf_8 - libbrotlienc: 1.0.9 h166bdaf_8 + brotli-bin: 1.0.9 h166bdaf_9 + libbrotlidec: 1.0.9 h166bdaf_9 + libbrotlienc: 1.0.9 h166bdaf_9 libgcc-ng: '>=12' hash: - md5: 2ff08978892a3e8b954397c461f18418 - sha256: 74c0fa22ea7c62d2c8f7a7aea03a3bd4919f7f3940ef5b027ce0dfb5feb38c06 + md5: 4601544b4982ba1861fa9b9c607b2c06 + sha256: 2357d205931912def55df0dc53573361156b27856f9bf359d464da162812ec1f manager: conda name: brotli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_8.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_9.conda version: 1.0.9 - category: main dependencies: @@ -2117,27 +2118,27 @@ package: dependencies: python: '>=3.7' hash: - md5: 7fcff9f6f123696e940bda77bd4d6551 - sha256: 06cd371fc98f076797d6450f6f337cb679b1060c99680fb7e044591493333194 + md5: 313516e9a4b08b12dfb1e1cd390a96e3 + sha256: 0666a95fbbd2299008162e2126c009191e5953d1cad1878bf9f4d8d634af1dd4 manager: conda name: charset-normalizer optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.1.0-pyhd8ed1ab_0.conda - version: 3.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.2.0-pyhd8ed1ab_0.conda + version: 3.2.0 - category: main dependencies: __unix: '' python: '>=3.8' hash: - md5: 20e4087407c7cb04a40817114b333dbf - sha256: 23676470b591b100393bb0f6c46fe10624dcbefc696a6a9f42932ed8816ef0ea + md5: fcae73fbdce7981fd500c626bb1ba6ab + sha256: 63f2b103488ba80b274f25bade66394fdd02344024fce45ab44e45861931c61d manager: conda name: click optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2 - version: 8.1.3 + url: https://conda.anaconda.org/conda-forge/noarch/click-8.1.4-unix_pyh707e725_0.conda + version: 8.1.4 - category: main dependencies: python: '>=3.6' @@ -2229,14 +2230,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 7312299d7a0ea4993159229b7d2dceb2 - sha256: f073c3ba993912f1c0027bc34a54975642885f0a4cd5f9dc42a17ca945df2c18 + md5: de4cb3384374e1411f0454edcf546cdb + sha256: 7b23ea0169fa6e7c3a0867d96d9eacd312759f83e5d83ad0fcc93e85379c16ae manager: conda name: exceptiongroup optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda - version: 1.1.1 + url: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.2-pyhd8ed1ab_0.conda + version: 1.1.2 - category: main dependencies: python: '>=3.7' @@ -2341,17 +2342,17 @@ package: version: 0.7.6 - category: main dependencies: - gcc: 13.1.0.* - gxx_impl_linux-64: 13.1.0.* + gcc: 12.3.0.* + gxx_impl_linux-64: 12.3.0.* hash: - md5: 5592c3280d50f5dc8dc548ba98c6e9ba - sha256: 3c99a6df3f0cac1b8730fea9cc32fab07475b1b8a9b1e7a10d3951bdf29a415f + md5: c6f5830abf6e0849e32eeaa8feb6af2e + sha256: e6734338ae19b90956532cbab5792e57ec0885fd1e36ab95fe0d1f6e5b5959e4 manager: conda name: gxx optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/gxx-13.1.0-h8e92de4_0.conda - version: 13.1.0 + url: https://conda.anaconda.org/conda-forge/linux-64/gxx-12.3.0-h8d2909c_0.conda + version: 12.3.0 - category: main dependencies: python: '>=3.10,<3.11.0a0' @@ -2582,17 +2583,17 @@ package: 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' + libtiff: '>=4.5.1,<4.6.0a0' + libwebp-base: '>=1.3.1,<2.0a0' hash: - md5: 9cfd7ad6e1539ca1ad172083586b3301 - sha256: 461fe2c0279309c21f206f114f3bd6592e906ef6f8cc181b2e28482941b8b925 + md5: 4963f3f12db45a576f2b8fbe9a0b8569 + sha256: b0428f43bb3bc4544b997fcd9dfeb5593ee10701e8895cef22212105a8d8aa8d 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.3.1-hbf2b3c1_0.conda + version: 1.3.1 - category: main dependencies: python: '' @@ -2706,14 +2707,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: 844b150744d30f256d7937f3f60fcd2f - sha256: d531c8dcbecb2d47d26fcafce00dd244bfb4fdc787eddea40e61b5b57b0e5da2 + md5: 3810cbf2635cb1d0edb97715d4ad74e7 + sha256: 38ec15fe0afe9fb90bd50314ccd506f0e7d1642db0c7eb2b77627d448aa9ee6c manager: conda name: numpy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.3-py310ha4c1d20_0.conda - version: 1.24.3 + url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.25.1-py310ha4c1d20_0.conda + version: 1.25.1 - category: main dependencies: libgcc-ng: '>=12' @@ -2770,14 +2771,14 @@ package: dependencies: python: '>=3.8' hash: - md5: 7d301a0d25f424d96175f810935f0da9 - sha256: c25e1757e4e90638bb1e778aba3ee5f3c01fae9752e3c3929f9be7d367f6c7f3 + md5: 7263924c642d22e311d9e59b839f1b33 + sha256: ff1f70e0bd50693be7e2bad0efb2539f5dcc5ec4d638e787e703f28098e72de4 manager: conda name: pluggy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2 - version: 1.0.0 + url: https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda + version: 1.2.0 - category: main dependencies: python: '>=3.10,<3.11.0a0' @@ -2907,16 +2908,16 @@ package: version: 0.19.3 - category: main dependencies: - __unix: '' - python: '>=3.8' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 hash: - md5: 2a7de29fb590ca14b5243c4c812c8025 - sha256: a42f826e958a8d22e65b3394f437af7332610e43ee313393d1cf143f0a2d274b + md5: 378f2260e871f3ea46c6fa58d9f05277 + sha256: cb6e4821234cee05acd1996cef88e40dfc2d5ab12cf12c5b1d6ed9118f7f41a7 manager: conda name: pysocks optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/pysocks-1.7.1-py310hff52083_5.tar.bz2 version: 1.7.1 - category: main dependencies: @@ -3022,14 +3023,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 3b68bc43ec6baa48f7354a446267eefe - sha256: 3ac44771fce01f19218bcdf3992e24984748048db69889a9df65abcc6a10e29b + md5: 5a7739d0f57ee64133c9d32e6507c46d + sha256: 083a0913f5b56644051f31ac40b4eeea762a88c00aa12437817191b85a753cec manager: conda name: setuptools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-67.7.2-pyhd8ed1ab_0.conda - version: 67.7.2 + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-68.0.0-pyhd8ed1ab_0.conda + version: 68.0.0 - category: main dependencies: python: '' @@ -3240,14 +3241,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 4a3014a4d107d15475d106b751c4e352 - sha256: 90a8d56c8015af1575d504d5f77d95a806cd999fc178a06ab51a349f1f744672 + md5: c39d6a09fe819de4951c2642629d9115 + sha256: 6edd6d5be690be492712cb747b6d62707f0d0c34ef56eefc796d91e5a03187d1 manager: conda name: typing_extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.6.3-pyha770c72_0.conda - version: 4.6.3 + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.7.1-pyha770c72_0.conda + version: 4.7.1 - category: main dependencies: libgcc-ng: '>=12' @@ -3297,14 +3298,14 @@ package: dependencies: python: '>=3.7' hash: - md5: 9beb712a1de20fea4e339a2d62851564 - sha256: 5176f7157b3152535e11c360b089d45d7eaf4c6c0e2116952138ab2ae195419f + md5: c34d9325a609381a0b0e8a5b4f325147 + sha256: c71cb65ac49692adb33735f3114b99a96c0c5140db1d56cf4ccef4fe92ea9a4c manager: conda name: websocket-client optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.3-pyhd8ed1ab_0.conda - version: 1.5.3 + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.1-pyhd8ed1ab_0.conda + version: 1.6.1 - category: main dependencies: python: '>=3.7' @@ -3373,18 +3374,18 @@ package: version: 5.0.3 - category: main dependencies: - libgcc-ng: '>=9.3.0' - xorg-libx11: '>=1.7.0,<2.0a0' + libgcc-ng: '>=12' + xorg-libx11: '>=1.8.6,<2.0a0' xorg-renderproto: '' hash: - md5: f59c1242cc1dd93e72c2ee2b360979eb - sha256: 7d907ed9e2ec5af5d7498fb3ab744accc298914ae31497ab6dcc6ef8bd134d00 + md5: ed67c36f215b310412b2af935bf3e530 + sha256: 26da4d1911473c965c32ce2b4ff7572349719eaacb88a066db8d968a4132c3f7 manager: conda name: xorg-libxrender optional: false 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 + url: https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.11-hd590300_0.conda + version: 0.9.11 - category: main dependencies: libgcc-ng: '>=12' @@ -3404,16 +3405,16 @@ package: version: 1.3.0 - category: main dependencies: - python: '>=3.7' + python: '>=3.8' hash: - md5: 13018819ca8f5b7cc675a8faf1f5fedf - sha256: 241de30545299be9bcea3addf8a2c22a3b3d4ba6730890e150ab690ac937a3d2 + md5: 0ea0b5003b96e53769a5f70175ff5264 + sha256: 14b78fc742efdf46e3ecff0a4b89cbdf780b8cf22c822024cc642e4284339ea4 manager: conda name: zipp optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda - version: 3.15.0 + url: https://conda.anaconda.org/conda-forge/noarch/zipp-3.16.0-pyhd8ed1ab_1.conda + version: 3.16.0 - category: main dependencies: frozenlist: '>=1.1.0' @@ -3627,14 +3628,14 @@ package: python_abi: 3.10.* *_cp310 unicodedata2: '>=14.0.0' hash: - md5: d3d83b419c81ac718a9221442707882b - sha256: e5d22bcf75a4414d84000a3d905c70d4d2a1db96c0dfbf5a89169817351b2bb7 + md5: 606aea800172f81896b21cabc5575206 + sha256: b9e1a3b84c670fab1c491b29c6b36f630aa520f45f08a44440851f46750d85c1 manager: conda name: fonttools optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.40.0-py310h2372a71_0.conda - version: 4.40.0 + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.41.0-py310h2372a71_0.conda + version: 4.41.0 - category: main dependencies: python: '>=3.4' @@ -3680,27 +3681,27 @@ package: python: '>=3.8' zipp: '>=0.5' hash: - md5: f91a5d5175fb7ff2a91952ec7da59cb9 - sha256: 33d49065756a73fbb92277c756fa00a41891408528eb90ae05ff3367a401ae6e + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf manager: conda name: importlib-metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.6.0-pyha770c72_0.conda - version: 6.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + version: 6.8.0 - category: main dependencies: more-itertools: '' python: '>=3.7' hash: - md5: 31e4a1506968d017229bdb64695013a1 - sha256: 6a81b67a1de8f761f66a4540bbd07cc27f9fbf2c7d67aa3732ebef379cf62874 + md5: e9f79248d30e942f7c358ff21a1790f5 + sha256: 14f5240c3834e1b784dd41a5a14392d9150dff62a74ae851f73e65d2e2bbd891 manager: conda name: jaraco.classes optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/jaraco.classes-3.2.3-pyhd8ed1ab_0.tar.bz2 - version: 3.2.3 + url: https://conda.anaconda.org/conda-forge/noarch/jaraco.classes-3.3.0-pyhd8ed1ab_0.conda + version: 3.3.0 - category: main dependencies: markupsafe: '>=2.0' @@ -3789,14 +3790,14 @@ package: tomli: '>=1.1.0' typing_extensions: '>=3.10' hash: - md5: e090e0c360bf9b1f846c2608c70422da - sha256: 95047c6684009b08c6b9e45eb9693585fc6ed40758bb93ebc5e76376c643939f + md5: b5750d448bc0ce0d0a10da0bb7bd9d96 + sha256: 5322d2c5cb45a1abfb7807ac1190cc949654c9fd91e0ae5a2b70f4279be995db manager: conda name: mypy optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.3.0-py310h2372a71_0.conda - version: 1.3.0 + url: https://conda.anaconda.org/conda-forge/linux-64/mypy-1.4.1-py310h2372a71_0.conda + version: 1.4.1 - category: main dependencies: python: 2.7|>=3.7 @@ -3816,8 +3817,8 @@ package: 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.3.0,<2.0a0' + libtiff: '>=4.5.1,<4.6.0a0' + libwebp-base: '>=1.3.1,<2.0a0' libxcb: '>=1.15,<1.16.0a0' libzlib: '>=1.2.13,<1.3.0a0' openjpeg: '>=2.5.0,<3.0a0' @@ -3825,14 +3826,14 @@ package: python_abi: 3.10.* *_cp310 tk: '>=8.6.12,<8.7.0a0' hash: - md5: cf62f6cff3536eafaaa0c740b0bf7465 - sha256: 1fd549c5f9e229890fd2b31e54c0718994120d850f5abbf1d2b7614791b4bd60 + md5: adcc7ea52e4d39d0a93f6a2ef36c7fd4 + sha256: 26d41f3e6278f42cc61499576e6f39a0bb84b5f21673250d89f8f958e9f6f4b0 manager: conda name: pillow optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pillow-9.5.0-py310h582fbeb_1.conda - version: 9.5.0 + url: https://conda.anaconda.org/conda-forge/linux-64/pillow-10.0.0-py310h582fbeb_0.conda + version: 10.0.0 - category: main dependencies: python: '>=3.7' @@ -3854,17 +3855,17 @@ package: iniconfig: '' packaging: '' pluggy: '>=0.12,<2.0' - python: '>=3.8' + python: '>=3.7' tomli: '>=1.0.0' hash: - md5: 8907018dd1302aada2632ca679e25ccd - sha256: 18c4493e7739d8f5b7674f8149821dc9fd861d2b1fbd24829afdcba692792b47 + md5: 3cfe9b9e958e7238a386933c75d190db + sha256: 52b2eb4e8d0380d92d45643d0c9706725e691ce8404dab4c2db4aaf58e48a23c manager: conda name: pytest optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.3.2-pyhd8ed1ab_0.conda - version: 7.3.2 + url: https://conda.anaconda.org/conda-forge/noarch/pytest-7.4.0-pyhd8ed1ab_0.conda + version: 7.4.0 - category: main dependencies: python: '>=3.6' @@ -3918,14 +3919,14 @@ package: ruamel.yaml.clib: '>=0.1.2' setuptools: '' hash: - md5: 41e89112e1ec653fb3e62240d06a0e61 - sha256: 390860e10ad461c1ea45f18e20526978bb785ec6c7ba91a2e1d8d8832d3bbb93 + md5: 9a03abf74d5069bda767c1bce7a41e0b + sha256: bdbd5b73bc92f3bd4eea8b8475d912a9d42562ed494163fd3987404f514beb70 manager: conda name: ruamel.yaml optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.31-py310h2372a71_0.conda - version: 0.17.31 + url: https://conda.anaconda.org/conda-forge/linux-64/ruamel.yaml-0.17.32-py310h2372a71_0.conda + version: 0.17.32 - category: main dependencies: colorama: '' @@ -3954,16 +3955,16 @@ package: version: 2.31.0.1 - category: main dependencies: - typing_extensions: 4.6.3 pyha770c72_0 + typing_extensions: 4.7.1 pyha770c72_0 hash: - md5: 3876f650ed7d0f95d70fa4b647621909 - sha256: d2334dab270e13182403cc3a394e3da8e7acb409e94059a6d9223d2ac053f90a + md5: f96688577f1faa58096d06a45136afa2 + sha256: d5d19b8f5b275240c19616a46d67ec57250b3720ba88200da8c732c3fcbfc21d manager: conda name: typing-extensions optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.6.3-hd8ed1ab_0.conda - version: 4.6.3 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.7.1-hd8ed1ab_0.conda + version: 4.7.1 - category: main dependencies: gettext: '>=0.21.1,<1.0a0' @@ -4029,6 +4030,19 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.2-py310h2372a71_0.conda version: 1.9.2 +- category: main + dependencies: + python: '>=3.7' + typing-extensions: '>=4.0.0' + hash: + md5: 578ae086f225bc2380c79f3b551ff2f7 + sha256: bbabfd4400b03ba6c50d0a55e777e0c3ba900af8dabedb9b8aded774484b5d53 + manager: conda + name: annotated-types + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/annotated-types-0.5.0-pyhd8ed1ab_0.conda + version: 0.5.0 - category: main dependencies: python: '>=3.6' @@ -4164,14 +4178,14 @@ package: python: '>=3.7' typing_extensions: '>=3.7.4.3' hash: - md5: f6e6b482110246a81c3f03e81c68752d - sha256: 77c531def610089bc190508fcf304cf96c085c5fe977ab8f7d7c1641769592ac + md5: 5809a12901d57388444c3293c975d0bb + sha256: 07008a94189e570fcabe003b99bd50b8263f60c824f36f81a8819bb7cf7eab1b manager: conda name: gitpython optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda - version: 3.1.31 + url: https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.32-pyhd8ed1ab_0.conda + version: 3.1.32 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4192,16 +4206,16 @@ package: version: 7.3.0 - category: main dependencies: - importlib-metadata: '>=6.6.0,<6.6.1.0a0' + importlib-metadata: '>=6.8.0,<6.8.1.0a0' hash: - md5: 3cbc9615f10a3d471532b83e4250b971 - sha256: 5de35d3c019d8a36e0a0deeb04a62689837bd68234a0a73a3355b860b442eca4 + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f manager: conda name: importlib_metadata optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.6.0-hd8ed1ab_0.conda - version: 6.6.0 + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + version: 6.8.0 - category: main dependencies: attrs: '>=17.4.0' @@ -4226,6 +4240,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 5b3ed39ee3809d63d347b649de0a45f8 + sha256: null manager: conda name: libdwarf optional: false @@ -4245,20 +4260,20 @@ package: numpy: '>=1.21.6,<2.0a0' packaging: '>=20.0' pillow: '>=6.2.0' - pyparsing: '>=2.3.1' + pyparsing: '>=2.3.1,<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 + md5: 9b55c9041c5a7f80f184a2cb05ec9663 + sha256: 28ff078d33e18b52a455d58d24ab7b959b4db98411470afd5869f30fbb54250b 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 + url: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.2-py310hf38f957_0.conda + version: 3.7.2 - category: main dependencies: libgcc-ng: '>=12' @@ -4270,14 +4285,14 @@ package: python_abi: 3.10.* *_cp310 pytz: '>=2020.1' hash: - md5: e0b845c6b29a1ed2e409bef6c0f5d96b - sha256: 38b0937c9b099cc5bf7cd4b19dfb03f8b2a8454e1895d65dfa888d189e3a3ab5 + md5: 11e0099d4571b4974c04386e4ce679ed + sha256: e8937c160b6eb469c5d80971046b25ed305fd97a8b1d6880de7c4a660cd245c3 manager: conda name: pandas optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.2-py310h7cbd5c2_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.3-py310h7cbd5c2_1.conda + version: 2.0.3 - category: main dependencies: pip: '' @@ -4296,29 +4311,29 @@ package: python: '>=3.7' typing-extensions: '>=4.6.3' hash: - md5: c085a16ba3d0c9ee282c438308b57724 - sha256: 528dcba75c81505e911b23d9795e35c564f7be1f74c7fdf5d8ad4e231b569c2a + md5: e76070baecfaca6ecdb5fbd5af7c9309 + sha256: b5012d6fd30f2462b6ca595539cfdae9aaf61b3b7a56e51ab94aef0fd9efcd3d manager: conda name: platformdirs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.5.3-pyhd8ed1ab_0.conda - version: 3.5.3 + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.8.1-pyhd8ed1ab_0.conda + version: 3.8.1 - category: main dependencies: libgcc-ng: '>=12' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 - typing-extensions: '>=4.2.0' + typing-extensions: '>=4.6.0' hash: - md5: 846ea8d4bc17e1f095da4758c5134fcb - sha256: 5674166edd2980264da66764ea740d928be12ae3bfecbbaaa2f5fbde5310de3a + md5: cebe5d122c8b1902f6c0ca7e3c63344f + sha256: b6b097058ae9f378b9db07b2396d7baba8ccaf9c7f0666795caccdb69c36274a manager: conda - name: pydantic + name: pydantic-core optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-1.10.9-py310h2372a71_0.conda - version: 1.10.9 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.1.2-py310hcb5633a_0.conda + version: 2.1.2 - category: main dependencies: cffi: '>=1.4.1' @@ -4354,27 +4369,27 @@ package: pytest: '>=5.0' python: '>=3.7' hash: - md5: db93caa9fe182f0cd20291aeb22f57ac - sha256: 87bb8edc9976403237a0e6c3bd7b2224c346c95e4c7345971f411aef21593450 + md5: fcd2531bc3e492657aeb042349aeaf8a + sha256: d2f6a46fe31dea91b427bcc57302edc345eb763caf3c6b6dcd09b2aee002324b 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/pytest-mock-3.11.1-pyhd8ed1ab_0.conda + version: 3.11.1 - category: main dependencies: pip: '' python: '>=3.7,<4.0' hash: - md5: 7a02fed21d1bf45cb41eaeaefc7eea25 - sha256: 6ba480465154a4ac2ba1c08d10e4824dc10db30d8087b83b2b041df0ebba18e8 + md5: ffabccdca64c44c1f23a8df134708897 + sha256: dbc0641f63dbf6d2d2e9b17a21ae8e0b3cb8e24ffa675e06cf5ce6f76d6a58d8 manager: conda name: types-awscrt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.19-pyhd8ed1ab_0.conda - version: 0.16.19 + url: https://conda.anaconda.org/conda-forge/noarch/types-awscrt-0.16.23-pyhd8ed1ab_0.conda + version: 0.16.23 - category: main dependencies: cffi: '' @@ -4416,13 +4431,13 @@ package: python_abi: 3.10.* *_cp310 zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 2cce1a48e6687f64d371d2e7fc9c7fbf - sha256: 97f69cae6513a1c64ce2ec87380f9a177e386af398300921a869c07e826b4949 + md5: a2b48edcd52593cdf007158ce10e1520 + sha256: 76a443ffcda1c290dbcc8c0bbe15a0f0ee0b57009cf842940f3382672780ddd8 manager: conda name: zstandard optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py310hdeb6495_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py310h1275a96_2.conda version: 0.19.0 - category: main dependencies: @@ -4451,14 +4466,14 @@ package: types-awscrt: '' typing_extensions: '' hash: - md5: 1641a445c924901462945e7797207d0e - sha256: ae638d5d6ca1f65f5466c7988f5a07164f63be9489cd6607f11d3dca95395e89 + md5: 63ed81138f359d75fb3f8c1e8deadfe0 + sha256: e181ec7110dc831c91b4660de20e0023b0adc898bcde34cc2048d7fc286b2fb3 manager: conda name: botocore-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.153-pyhd8ed1ab_0.conda - version: 1.29.153 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-stubs-1.29.165-pyhd8ed1ab_0.conda + version: 1.29.165 - category: main dependencies: clang-format: 16.0.3 default_h1cdf331_2 @@ -4537,6 +4552,7 @@ package: libzlib: '>=1.2.12,<1.3.0a0' hash: md5: 899c511688e6c41cb51c2921a8d25e63 + sha256: null manager: conda name: libdwarf-dev optional: false @@ -4621,6 +4637,23 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/paramiko-3.2.0-pyhd8ed1ab_0.conda version: 3.2.0 +- category: main + dependencies: + annotated-types: '>=0.4.0' + libgcc-ng: '>=12' + pydantic-core: 2.1.2 + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 + typing-extensions: '>=4.6.1' + hash: + md5: 4f6be3167ecdaa7a0da00a9774be695a + sha256: a056749c12c9e287d60aeb8a6796086138dea348b04da1e100ddc19949f1dc7d + manager: conda + name: pydantic + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-2.0.2-py310h2372a71_1.conda + version: 2.0.2 - category: main dependencies: cryptography: '>=38.0.0,<42,!=40.0.0,!=40.0.1' @@ -4697,18 +4730,18 @@ package: - category: main dependencies: distlib: <1,>=0.3.6 - filelock: <4,>=3.11 - platformdirs: <4,>=3.2 + filelock: <4,>=3.12 + platformdirs: <4,>=3.5.1 python: '>=3.8' hash: - md5: a920e114c4c2ced2280e266da65ab5e6 - sha256: 13d667887ea08b6d1fe2eb09d2d737f9af7343735d3bfa5ffaa3f67eec8eaff7 + md5: 838b85f656b078bdd882ef97978e7f40 + sha256: 92dd17aef10e5c35289da3a588cbed3e593c22ee53478a00ccb1fdf92fe0e84e manager: conda name: virtualenv optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.23.0-pyhd8ed1ab_0.conda - version: 20.23.0 + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.23.1-pyhd8ed1ab_0.conda + version: 20.23.1 - category: main dependencies: conda-package-streaming: '>=0.7.0' @@ -4764,14 +4797,14 @@ package: python_abi: 3.10.* *_cp310 secretstorage: '>=3.2' hash: - md5: 85da2982e8456156e2f38e6a3f75cd89 - sha256: c709408ded9e04b193a5f6c77f6586ab4ab93bdb5a5413eeecc9530165ccf312 + md5: c6138432d67b31a98a55af46b3f693c1 + sha256: d01df199b2db95622e6b0b87128239e60c4a170f46e9b58fdfde15f948515dfd manager: conda name: keyring optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/keyring-23.13.1-py310hff52083_0.conda - version: 23.13.1 + url: https://conda.anaconda.org/conda-forge/linux-64/keyring-24.2.0-py310hff52083_0.conda + version: 24.2.0 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4828,14 +4861,14 @@ package: __unix: '' openjdk: '>=8' hash: - md5: c83e34b1cf3399f1ea6a0b9515dcb7b0 - sha256: f890d8cf7c7c2b8cabe3cb51c505b19f934f41e51a9ff4cf3d067be38eff16f8 + md5: 67177beb0a5d0968d7b2935b7901d955 + sha256: f0582f7f4f90231754f6532de13d9737ed422a5bb086962dcf0380c0ea2513df manager: conda name: sbt optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/sbt-1.9.0-hd8ed1ab_0.conda - version: 1.9.0 + url: https://conda.anaconda.org/conda-forge/noarch/sbt-1.9.2-h707e725_0.conda + version: 1.9.2 - category: main dependencies: brotlipy: '>=0.6.0' @@ -4861,14 +4894,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: 125145419a317cbaa069e4ae71eb0890 - sha256: 35edb690ba6636d2d8bca4a5834b9911ba11a86bcb736983c755cd08a7934f6e + md5: 191ea267121cccd3531e98ea5b869b87 + sha256: 3172c3714a3c6abc729af5335dfbf2ac02acc01ec64ad1d30413bd49f1bd0497 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.153-pyhd8ed1ab_0.conda - version: 1.29.153 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.31.2-pyhd8ed1ab_0.conda + version: 1.31.2 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4936,14 +4969,14 @@ package: six: '>=1.11.0' typing-extensions: '>=4.0.1' hash: - md5: 5576496c2743cafa05111ac76267db29 - sha256: 51951b49a43b7de818ad055d113348f7e438e225fc7a5f8f4c635998239c4c89 + md5: 3f61696f5c09ca1e7001d042c9968c1d + sha256: da22c5d95a9ed937509b696568cd51580f3becec90febf0e5b1aca1096bf4c24 manager: conda name: azure-core optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.27.1-pyhd8ed1ab_0.conda - version: 1.27.1 + url: https://conda.anaconda.org/conda-forge/noarch/azure-core-1.28.0-pyhd8ed1ab_0.conda + version: 1.28.0 - category: main dependencies: msgpack-python: '>=0.5.2' @@ -4990,14 +5023,14 @@ package: urllib3: '>=1.26.0' websocket-client: '>=0.32.0' hash: - md5: 543336c6aa9516cfb29c51d5c162b177 - sha256: 5e01e15e20ee573c99b530633a0d5c71fd515e4ac6d2f5f5f57baece8b915cc3 + md5: c95d23d8bae7e21491868cc7772d7c73 + sha256: 7c3031602e92fd7682302ef98a45bdf7374d48a849cdd3900b7c68a32d162177 manager: conda name: docker-py optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.1.0-pyhd8ed1ab_0.conda - version: 6.1.0 + url: https://conda.anaconda.org/conda-forge/noarch/docker-py-6.1.3-pyhd8ed1ab_0.conda + version: 6.1.3 - category: main dependencies: appdirs: '' @@ -5103,7 +5136,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.153 + botocore: 1.31.2 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5112,29 +5145,29 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 8a08a6cde2e3d73157be051c49238f5d - sha256: 18b1553f1fd52835f874095114661c554d3ba4fa3db3aaa0f7ddecc066b605a3 + md5: 090abd0e0146575f4a7b5c6cbb71e866 + sha256: 2b66dc496eae7517bcf85b8ef54bf5512bc4ca7b710fd710b30d22b68ec4477d manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.153-py310hff52083_0.conda - version: 1.27.153 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.29.2-py310hff52083_0.conda + version: 1.29.2 - category: main dependencies: - botocore: '>=1.29.153,<1.30.0' + botocore: '>=1.31.2,<1.32.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: 3f834dbcec493d9f111b3408c7fa053f - sha256: db9ff9bb60827c5fbc66e34017e022d95acd1a45800b028e74d81542a2eff3a8 + md5: 1ebffec127102119aff7a572243464da + sha256: 454975a1def5ec1043925403547f9cf938c91a534c62cba509eb108b253bbf89 manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.28.2-pyhd8ed1ab_0.conda + version: 1.28.2 - category: main dependencies: cachecontrol: 0.13.0 pyhd8ed1ab_0 @@ -5260,14 +5293,14 @@ package: python: '' typing_extensions: '' hash: - md5: 67fd9a7140e5e654b1fffa4fd199e470 - sha256: 3b4d4ca4aa7ac8de7b9c075db04384b21fdc2a529b7545e2b8c145204a1c19fb + md5: 31349469d53ac0877f3a90842023571d + sha256: feb48351ca5a328d200a7307d041b05f5d1e476151929951e1a11a1ecede8d4e manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.28.2-pyhd8ed1ab_0.conda + version: 1.28.2 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5308,28 +5341,28 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: b7bdd9d69d4b50005046441541f8e595 - sha256: b2420d8cd3889092c1747303a087b5a00b3c288cd802b8e3d680910244967d21 + md5: 1c53cbf18ef82bac6c4957398f107d61 + sha256: 5bd251a81e5ee934e0945530d00f46944c4dc5e8fad001ce761ef89310f9c9cc manager: conda name: mypy-boto3-s3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/mypy-boto3-s3-1.28.0-pyhd8ed1ab_0.conda + version: 1.28.0 - category: main dependencies: boto3: '' python: '>=3.6' typing-extensions: '' hash: - md5: 15f76f6fc266130daeb779067f0befff - sha256: bb714e9179aae14f28587d9009bf598b4c72b5f62769e28b7e451e73b2061580 + md5: 7af6a634a654ee7aac1941e05cf1568c + sha256: 4fee92b4e5580dfd13fe942ae307100666064121197b94de5c824c3dd98eb327 manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.153-pyhd8ed1ab_0.conda - version: 1.26.153 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.28.0-pyhd8ed1ab_0.conda + version: 1.28.0 - category: main dependencies: boto3: '' @@ -5408,30 +5441,32 @@ package: werkzeug: '>=0.5,!=2.2.0,!=2.2.1' xmltodict: '' hash: - md5: 5ea9fddda04eebeee16236d0f3240df1 - sha256: b351e5ed49f03a8aefb6a6c9c54fa34cc9792e4c7ef06b77803001ae195c12f3 + md5: 2ad89e262b7d71adc0820e207329d659 + sha256: 4a348f91127ca5456c224114329705b68c18812d67060f3cc93bb0310e5ebeba manager: conda name: moto optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.11-pyhd8ed1ab_0.conda - version: 4.1.11 + url: https://conda.anaconda.org/conda-forge/noarch/moto-4.1.12-pyhd8ed1ab_0.conda + version: 4.1.12 - category: main dependencies: {} hash: - sha256: 0e0bc5ba78b8db3667ad636d964eb963dc97a59f04c6f6214c5f0e4a8f726c56 + sha256: 18c694e5ae8a208cdb3d2c20a993ca1a7b0efa258c247a1e565150f477f83744 manager: pip name: mock optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/27/6f/fbb16f260a7107ee98871d83f6793d88c4311b7189b10ef239da0b2181db/mock-5.0.2-py3-none-any.whl - version: 5.0.2 + source: null + url: https://files.pythonhosted.org/packages/6b/20/471f41173930550f279ccb65596a5ac19b9ac974a8d93679bcd3e0c31498/mock-5.1.0-py3-none-any.whl + version: 5.1.0 - dependencies: {} hash: sha256: f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5 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 @@ -5443,6 +5478,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 @@ -5454,6 +5490,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 @@ -5466,19 +5503,31 @@ 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: + typing-extensions: '>=4.2.0' + hash: + sha256: 16928fdc9cb273c6af00d9d5045434c39afba5f42325fb990add2c241402d151 + manager: pip + name: pydantic + platform: linux-64 + source: null + url: https://files.pythonhosted.org/packages/b6/8e/7dd215f91528487535e7aa048e4092c20ecd0168df958e58809e2235cece/pydantic-1.10.11-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + version: 1.10.11 - category: main dependencies: ruamel.yaml.clib: '>=0.2.7' hash: - sha256: 3cf153f0047ced526e723097ac615d3009371779432e304dbd5596b6f3a4c777 + sha256: 23cd2ed620231677564646b0c6a89d138b6822a0d78656df7abda5879ec4f447 manager: pip name: ruamel.yaml optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/9c/9c/e69fc06169ac6e757c66004885e0dfcc6c2b5c1a331a5dc70b890b6b4bf8/ruamel.yaml-0.17.31-py3-none-any.whl - version: 0.17.31 + source: null + url: https://files.pythonhosted.org/packages/d9/0e/2a05efa11ea33513fbdf4a2e2576fe94fd8fa5ad226dbb9c660886390974/ruamel.yaml-0.17.32-py3-none-any.whl + version: 0.17.32 - category: main dependencies: mock: '*' @@ -5489,6 +5538,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 @@ -5501,6 +5551,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 @@ -5511,13 +5562,14 @@ package: pyyaml: '>=6.0,<7.0' ruamel.yaml: '>=0.17.21,<0.18.0' hash: - sha256: 47f1fc5904756b01d46a8d23a4f3950382086b716138e21a027cd44dc5101f27 + sha256: f4fb4dd5f7fac1f2206a25d0949024046fe8f855198e8edbd5206fa9d58ab05f manager: pip name: hammer-vlsi optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/30/e4/37b77c7921b80d58d8b2a325c031e75d656319b676e7fd4555e02b651a9d/hammer_vlsi-1.1.2-py3-none-any.whl - version: 1.1.2 + source: null + url: https://files.pythonhosted.org/packages/0a/da/1897421311c6332655e2f73d02d8c914ecb724198a1988aacd8f4c61ae6e/hammer_vlsi-1.1.1-py3-none-any.whl + version: 1.1.1 - category: main dependencies: asttokens: '>=2,<3' @@ -5528,6 +5580,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 @@ -5540,6 +5593,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 diff --git a/docs/Chipyard-Basics/Initial-Repo-Setup.rst b/docs/Chipyard-Basics/Initial-Repo-Setup.rst index af57d6da..cee859d0 100644 --- a/docs/Chipyard-Basics/Initial-Repo-Setup.rst +++ b/docs/Chipyard-Basics/Initial-Repo-Setup.rst @@ -34,6 +34,13 @@ After Conda is installed and is on your ``PATH``, we need to install a version o For this you can use the system package manager like ``yum`` or ``apt`` to install ``git``. This ``git`` is only used to first checkout the repository, we will later install a newer version of ``git`` with Conda. +Next, we install `libmamba `__ for much faster dependency solving when initially setting up the repository. + +.. code-block:: shell + + conda install -n base conda-libmamba-solver + conda config --set solver libmamba + Finally we need to install ``conda-lock`` into the ``base`` conda environment. This is done by the following: @@ -42,7 +49,6 @@ This is done by the following: conda install -n base conda-lock=1.4 conda activate base -.. Note:: We also recommended switching to `libmamba `__ for much faster dependency solving. Setting up the Chipyard Repo ------------------------------------------- diff --git a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala index 85606494..840185de 100644 --- a/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala +++ b/generators/chipyard/src/main/scala/config/fragments/PeripheralFragments.scala @@ -6,7 +6,8 @@ import chisel3.util.{log2Up} import org.chipsalliance.cde.config.{Config} import freechips.rocketchip.devices.tilelink.{BootROMLocated, PLICKey, CLINTKey} -import freechips.rocketchip.devices.debug.{Debug, ExportDebug, DebugModuleKey, DMI} +import freechips.rocketchip.devices.debug.{Debug, ExportDebug, DebugModuleKey, DMI, JtagDTMKey, JtagDTMConfig} +import freechips.rocketchip.diplomacy.{AsynchronousCrossing} import freechips.rocketchip.stage.phases.TargetDirKey import freechips.rocketchip.subsystem._ import freechips.rocketchip.tile.{XLen} @@ -14,49 +15,125 @@ import freechips.rocketchip.tile.{XLen} import sifive.blocks.devices.gpio._ import sifive.blocks.devices.uart._ import sifive.blocks.devices.spi._ +import sifive.blocks.devices.i2c._ import testchipip._ import chipyard.{ExtTLMem} -// Set the bootrom to the Chipyard bootrom -class WithBootROM extends Config((site, here, up) => { +/** + * Config fragment for adding a BootROM to the SoC + * + * @param address the address of the BootROM device + * @param size the size of the BootROM + * @param hang the power-on reset vector, i.e. the program counter will be set to this value on reset + * @param contentFileName the path to the BootROM image + */ +class WithBootROM(address: BigInt = 0x10000, size: Int = 0x10000, hang: BigInt = 0x10040) extends Config((site, here, up) => { case BootROMLocated(x) => up(BootROMLocated(x), site) - .map(_.copy(contentFileName = s"${site(TargetDirKey)}/bootrom.rv${site(XLen)}.img")) + .map(_.copy( + address = address, + size = size, + hang = hang, + contentFileName = s"${site(TargetDirKey)}/bootrom.rv${site(XLen)}.img" + )) }) // DOC include start: gpio config fragment -class WithGPIO extends Config((site, here, up) => { - case PeripheryGPIOKey => Seq( - GPIOParams(address = 0x10012000, width = 4, includeIOF = false)) +/** + * Config fragment for adding a GPIO peripheral device to the SoC + * + * @param address the address of the GPIO device + * @param width the number of pins of the GPIO device + */ +class WithGPIO(address: BigInt = 0x10010000, width: Int = 4) extends Config ((site, here, up) => { + case PeripheryGPIOKey => up(PeripheryGPIOKey) ++ Seq( + GPIOParams(address = address, width = width, includeIOF = false)) }) // DOC include end: gpio config fragment -class WithUART(baudrate: BigInt = 115200) extends Config((site, here, up) => { - case PeripheryUARTKey => Seq( - UARTParams(address = 0x54000000L, nTxEntries = 256, nRxEntries = 256, initBaudRate = baudrate)) -}) - +/** + * Config fragment for removing all UART peripheral devices from the SoC + */ class WithNoUART extends Config((site, here, up) => { case PeripheryUARTKey => Nil }) +/** + * Config fragment for adding a UART peripheral device to the SoC + * + * @param address the address of the UART device + * @param baudrate the baudrate of the UART device + */ +class WithUART(baudrate: BigInt = 115200, address: BigInt = 0x10020000) extends Config ((site, here, up) => { + case PeripheryUARTKey => up(PeripheryUARTKey) ++ Seq( + UARTParams(address = address, nTxEntries = 256, nRxEntries = 256, initBaudRate = baudrate)) +}) + class WithUARTFIFOEntries(txEntries: Int, rxEntries: Int) extends Config((site, here, up) => { case PeripheryUARTKey => up(PeripheryUARTKey).map(_.copy(nTxEntries = txEntries, nRxEntries = rxEntries)) }) -class WithSPIFlash(size: BigInt = 0x10000000) extends Config((site, here, up) => { +class WithUARTInitBaudRate(baudrate: BigInt = 115200) extends Config ((site, here, up) => { + case PeripheryUARTKey => up(PeripheryUARTKey).map(_.copy(initBaudRate=baudrate)) +}) + +/** + * Config fragment for adding a SPI peripheral device with Execute-in-Place capability to the SoC + * + * @param address the address of the SPI controller + * @param fAddress the address of the Execute-in-Place (XIP) region of the SPI flash memory + * @param size the size of the Execute-in-Place (XIP) region of the SPI flash memory + */ +class WithSPIFlash(size: BigInt = 0x10000000, address: BigInt = 0x10030000, fAddress: BigInt = 0x20000000) extends Config((site, here, up) => { // Note: the default size matches freedom with the addresses below - case PeripherySPIFlashKey => Seq( - SPIFlashParams(rAddress = 0x10040000, fAddress = 0x20000000, fSize = size)) + case PeripherySPIFlashKey => up(PeripherySPIFlashKey) ++ Seq( + SPIFlashParams(rAddress = address, fAddress = fAddress, fSize = size)) +}) + +/** + * Config fragment for adding a SPI peripheral device to the SoC + * + * @param address the address of the SPI controller + */ +class WithSPI(address: BigInt = 0x10031000) extends Config((site, here, up) => { + case PeripherySPIKey => up(PeripherySPIKey) ++ Seq( + SPIParams(rAddress = address)) +}) + +/** + * Config fragment for adding a I2C peripheral device to the SoC + * + * @param address the address of the I2C controller + */ +class WithI2C(address: BigInt = 0x10040000) extends Config((site, here, up) => { + case PeripheryI2CKey => up(PeripheryI2CKey) ++ Seq( + I2CParams(address = address, controlXType = AsynchronousCrossing(), intXType = AsynchronousCrossing()) + ) +}) + +class WithNoDebug extends Config((site, here, up) => { + case DebugModuleKey => None }) class WithDMIDTM extends Config((site, here, up) => { case ExportDebug => up(ExportDebug, site).copy(protocols = Set(DMI)) }) -class WithNoDebug extends Config((site, here, up) => { - case DebugModuleKey => None +/** + * Config fragment for adding a JTAG Debug Module to the SoC + * + * @param idcodeVersion the version of the JTAG protocol the Debug Module supports + * @param partNum the part number of the Debug Module + * @param manufId the 11-bit JEDEC Designer ID of the chip manufacturer + * @param debugIdleCycles the number of cycles the Debug Module waits before responding to a request + */ +class WithJTAGDTMKey(idcodeVersion: Int = 2, partNum: Int = 0x000, manufId: Int = 0x489, debugIdleCycles: Int = 5) extends Config((site, here, up) => { + case JtagDTMKey => new JtagDTMConfig ( + idcodeVersion = idcodeVersion, + idcodePartNum = partNum, + idcodeManufId = manufId, + debugIdleCycles = debugIdleCycles) }) class WithTLBackingMemory extends Config((site, here, up) => { diff --git a/generators/firechip/src/main/scala/TargetConfigs.scala b/generators/firechip/src/main/scala/TargetConfigs.scala index 1c821294..dd8cd338 100644 --- a/generators/firechip/src/main/scala/TargetConfigs.scala +++ b/generators/firechip/src/main/scala/TargetConfigs.scala @@ -92,7 +92,7 @@ class WithFireSimDesignTweaks extends Config( // Optional: reduce the width of the Serial TL interface new testchipip.WithSerialTLWidth(4) ++ // Required*: Scale default baud rate with periphery bus frequency - new chipyard.config.WithUART(BigInt(3686400L)) ++ + new chipyard.config.WithUARTInitBaudRate(BigInt(3686400L)) ++ // Optional: Adds IO to attach tracerV bridges new chipyard.config.WithTraceIO ++ // Optional: Request 16 GiB of target-DRAM by default (can safely request up to 32 GiB on F1) @@ -241,7 +241,7 @@ class FireSimSmallSystemConfig extends Config( new freechips.rocketchip.subsystem.WithExtMemSize(1 << 28) ++ new testchipip.WithDefaultSerialTL ++ new testchipip.WithBlockDevice ++ - new chipyard.config.WithUART ++ + new chipyard.config.WithUARTInitBaudRate(BigInt(3686400L)) ++ new freechips.rocketchip.subsystem.WithInclusiveCache(nWays = 2, capacityKB = 64) ++ new chipyard.RocketConfig) diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index 443ffabd..c95056db 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -123,7 +123,7 @@ if run_step "1"; then fi # use conda-lock to create env - conda-lock install -p $CYDIR/.conda-env $LOCKFILE + conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE source $CYDIR/.conda-env/etc/profile.d/conda.sh conda activate $CYDIR/.conda-env diff --git a/scripts/generate-conda-lockfiles.sh b/scripts/generate-conda-lockfiles.sh index f2e81106..d8f1c493 100755 --- a/scripts/generate-conda-lockfiles.sh +++ b/scripts/generate-conda-lockfiles.sh @@ -14,5 +14,5 @@ for TOOLCHAIN_TYPE in riscv-tools esp-tools; do # note: lock file must end in .conda-lock.yml - see https://github.com/conda-incubator/conda-lock/issues/154 LOCKFILE=$REQS_DIR/conda-lock-reqs/conda-requirements-$TOOLCHAIN_TYPE-linux-64.conda-lock.yml - conda-lock -f "$REQS_DIR/chipyard.yaml" -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" -p linux-64 --lockfile $LOCKFILE + conda-lock --conda $(which conda) -f "$REQS_DIR/chipyard.yaml" -f "$REQS_DIR/$TOOLCHAIN_TYPE.yaml" -p linux-64 --lockfile $LOCKFILE done diff --git a/software/firemarshal b/software/firemarshal index f553a22b..8b8eea35 160000 --- a/software/firemarshal +++ b/software/firemarshal @@ -1 +1 @@ -Subproject commit f553a22b2831a37868e921afa98cf30a6c633a61 +Subproject commit 8b8eea35f618b9418c850df7ed809a2285ee5d1c diff --git a/tests/spiflash.h b/tests/spiflash.h index 94b27e36..830302c7 100644 --- a/tests/spiflash.h +++ b/tests/spiflash.h @@ -5,7 +5,7 @@ #define SPIFLASH_BASE_MEM 0x20000000 #define SPIFLASH_BASE_MEM_SIZE 0x10000000 -#define SPIFLASH_BASE_CTRL 0x10040000 +#define SPIFLASH_BASE_CTRL 0x10030000 // Only defining the registers we use; there are more // Software control #define SPIFLASH_OFFS_CSMODE 0x18