Merge pull request #1391 from ucb-bar/unpin

Match CY/FireSim deps | Unpin deps | Update lockfiles

conda-reqs/chipyard.yaml

@@ -31,22 +31,19 @@ dependencies:
     - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
     - firtool==1.30.0 # from ucb-bar channel - https://github.com/ucb-bar/firtool-feedstock
 
+    # misc
+    - autoconf
+    - pre-commit
+    - readline
+    - coreutils
+    - jq
+    - pip
+
     # firemarshal deps
-    - python>=3.9
+    - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
-    - bc
-    - patch
-    - which
-    - diffutils
-    - bash
-    - gzip
-    - bzip2
-    - perl
-    - tar
-    - file
-    - findutils
     - rsync
     - psutil
-    - doit=0.35.0
+    - doit>=0.34.0
     - gitpython
     - humanfriendly
     - e2fsprogs
@@ -54,15 +51,24 @@ dependencies:
     - bison
     - flex
     - expat
-    - make
+    - python>=3.9
-    - pyyaml
+    - bc
     - unzip
-    - readline
+    - patch
-    - coreutils
+    - which
+    - sed
+    - diffutils
+    - bash
+    - gzip
+    - bzip2
+    - perl
+    - tar
+    - file
+    - wget
+    - findutils
     - lzop
-    - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
 
-    - jq
+    - make
     - bash-completion
     - sbt
     - ca-certificates
@@ -88,47 +94,14 @@ dependencies:
     - elfutils
     - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock
     - conda-lock>=1
-    - wget
-    - sed
-    - autoconf
-    - pre-commit
 
     # clang-format for driver coding style enforcement.
     - clang-format
     - clang-tools
 
-    # python packages
+    # hammer packages
-    # While it is possible to install using pip after creating the
+    - sty
-    # conda environment, pip's dependency resolution can conflict with
-    # conda and create broken environments.  It's best to use the conda
-    # packages so that the environment is consistent
-    - boto3==1.20.21
-    - colorama==0.4.3
-    - argcomplete==1.12.3
-    - python-graphviz==0.19
-    - pyparsing==3.0.6
-    - numpy==1.19.5
-    - kiwisolver==1.3.1
-    - matplotlib-base==3.3.4
-    - pandas==1.1.5
-    - awscli==1.22.21
-    - pytest==6.2.5
-    - pytest-dependency==0.5.1
-    - pytest-mock==3.7.0
-    - moto==3.1.0
-    - pyyaml==5.4.1
-    - mypy==0.931
-    - types-pyyaml==6.0.4
-    - boto3-stubs==1.21.6
-    - botocore-stubs==1.24.7
-    - mypy-boto3-s3==1.21.0
-    - sty==1.0.0
-    - pip
     - pip:
-        - fab-classic==1.19.1
-        - mypy-boto3-ec2==1.21.9
-        - sure==2.0.0
-        - pylddwrap==1.2.1
         - hammer-vlsi[asap7]==1.0.1
 
     # doc requirements
@@ -137,3 +110,45 @@ dependencies:
     - sphinx-autobuild
     - sphinx_rtd_theme
     - docutils
+
+    # firesim python packages
+    # While it is possible to install using pip after creating the
+    # conda environment, pip's dependency resolution can conflict with
+    # conda and create broken environments.  It's best to use the conda
+    # packages so that the environment is consistent
+    - colorama
+    - argcomplete
+    - python-graphviz
+    - pyparsing
+    - numpy
+    - kiwisolver
+    - matplotlib-base
+    - pandas
+    - awscli
+    - pytest
+    - pytest-dependency
+    - pytest-mock
+    - moto
+    - mypy
+    - s3fs
+    - aiohttp
+    - pip:
+        - sure
+        - pylddwrap
+
+    # firesim ci shared packages
+    - boto3
+    - boto3-stubs
+    - mypy-boto3-s3
+    - mypy_boto3_ec2
+    - botocore-stubs
+    - pytz
+    - types-pytz
+    - pyyaml
+    - types-pyyaml
+    - requests
+    - types-requests
+    - azure-identity
+    - fsspec
+    - pip:
+        - fab-classic>=1.19.2