Merge branch 'dev' into bigfix/mvu4bit

Xilinx · Jun 11, 2024 · 10704f7 · 10704f7
2 parents aacdaee + 3d597ac
commit 10704f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docker/Dockerfile.finn b/docker/Dockerfile.finn
@@ -132,6 +132,9 @@ RUN pip install tokenize-rt==4.2.1
 # pyverilator
 RUN pip install tclwrapper==0.0.1
 
+# assure that we have the right setuptools version
+RUN pip install setuptools==68.2.2
+
 # extra environment variables for FINN compiler
 ENV VIVADO_IP_CACHE "/tmp/vivado_ip_cache"
 

diff --git a/requirements.txt b/requirements.txt
@@ -14,7 +14,6 @@ psutil==5.9.4
 pyscaffold==4.4
 scipy==1.10.1
 setupext-janitor>=1.1.2
-setuptools==68.2.2
 sigtools==4.0.1
 toposort==1.7.0
 vcdvcd==1.0.5