Merge pull request #2323 from SymbiFlow/bot-conda-lock-update

[BOT] Conda Lock Update
f4pga · Nov 29, 2021 · 8842ce7 · 8842ce7
2 parents a66e977 + b1fbd19
commit 8842ce7
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/conda_lock.yml b/conda_lock.yml
@@ -57,6 +57,7 @@ dependencies:
   - openjdk=8.0.152=h7b6447c_3
   - openocd=0.10.0_1514_ga8edbd020=20201119_154304
   - openssl=1.1.1l=h7f8727e_0
+  - packaging=21.3=pyhd3eb1b0_0
   - pcre=8.45=h295c915_0
   - perl=5.26.2=h14c3975_0
   - pip=21.2.2=py37h06a4308_0
@@ -65,26 +66,26 @@ dependencies:
   - prjxray-tools=0.1_2934_g60168e9b=20211122_104637
   - pycodestyle=2.7.0=pyhd3eb1b0_0
   - pyflakes=2.3.1=pyhd3eb1b0_0
+  - pyparsing=3.0.4=pyhd3eb1b0_0
   - python=3.7.11=h12debd9_0
   - readline=8.1=h27cfd23_0
   - rhash=1.4.1=h3c74f83_1
   - setuptools=58.0.4=py37h06a4308_0
   - sqlite=3.36.0=hc218d9a_0
-  - surelog=0.0_3772_gcbc0a3aee=20211122_104637_py37
+  - surelog=0.0_3778_gffd348877=20211122_104637_py37
   - swig=4.0.2=h295c915_4
-  - symbiflow-yosys-plugins=1.0.0_7_505_g82afdb5=20211122_104637
+  - symbiflow-yosys-plugins=1.0.0_7_511_g6c4141c=20211122_104637
   - tbb=2020.3=hfd86e86_0
   - tk=8.6.11=h1ccaba5_0
   - typing_extensions=3.10.0.2=pyh06a4308_0
-  - vtr-optimized=8.0.0_4980_gd735a4694=20211122_104637
+  - vtr-optimized=8.0.0_4986_gf92cfebaf=20211122_104637
   - wheel=0.37.0=pyhd3eb1b0_1
   - xz=5.2.5=h7b6447c_0
   - yosys=0.11_48_g113c94384=20211122_104637_py37
   - zachjs-sv2v=0.0.5_0025_ge9f9696=20201120_205532
   - zipp=3.6.0=pyhd3eb1b0_0
   - zlib=1.2.11=h7b6447c_3
   - zstd=1.4.9=haebb681_0
-  - packaging=21.3
   - pip:
     - Arpeggio==1.10.2
     - attrs==21.2.0
@@ -93,7 +94,7 @@ dependencies:
     - certifi==2021.10.8
     - cffi==1.15.0
     - chardet==4.0.0
-    - charset-normalizer==2.0.7
+    - charset-normalizer==2.0.8
     - colorama==0.4.4
     - cryptography==36.0.0
     - cssselect2==0.4.1
@@ -123,7 +124,6 @@ dependencies:
     - mccabe==0.6.1
     - numpy==1.21.4
     - okonomiyaki==1.3.2
-    - packaging==21.3
     - parameterized==0.8.1
     - pdfminer.six==20211012
     - Pillow==8.4.0
@@ -135,21 +135,20 @@ dependencies:
     - pycparser==2.21
     - pyjson==1.3.0
     - pyjson5==1.6.0
-    - pyparsing==3.0.6
     - pyrsistent==0.18.0
     - pyserial==3.5
     - pytest==6.2.5
     - python-constraint==1.4.0
     - python-dateutil==2.8.2
     - python-fpga-interchange @ git+https://github.com/SymbiFlow/python-fpga-interchange.git@b13ee55ebce358a488fe9087f3b4f1bf087a0f24
-    - python-sat==0.1.7.dev12
+    - python-sat==0.1.7.dev14
     - python-utils==2.5.6
     - pyusb==1.2.1
     - PyYAML==6.0
     - quicklogic-fasm @ git+https://github.com/QuickLogic-Corp/quicklogic-fasm.git@57b6e60574a9d483dc94710d0d3ff42a62b4ec41
     - requests==2.26.0
     - rr-graph @ git+https://github.com/SymbiFlow/symbiflow-rr-graph.git@f0c41b77ad25b3afc438f4a7bff4c2297f6587d5
-    - scipy==1.7.2
+    - scipy==1.7.3
     - setuptools-scm==6.3.2
     - simplejson==3.17.6
     - simplesat==0.8.2