From: Jacob Lifshay <programmerjake@gmail.com>
Date: Mon, 11 Sep 2023 21:39:22 +0000 (-0700)
Subject: make installing cocotb work
X-Git-Url: https://git.libre-soc.org/?p=soc.git;a=commitdiff_plain;h=348b63f256ee52b129651f38756dc13337505b9f

make installing cocotb work
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01352167..c57c2d54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,6 +56,16 @@ build:
         - . .env/bin/activate
         - pip install pytest-xdist==3.3.1 pytest==7.3.1
 
+        - git clone --depth 1 -b v0.1.1 https://github.com/cocotb/cocotb-bus.git cocotb-bus
+        - pushd cocotb-bus
+        - pip install . --no-deps
+        - popd
+
+        - git clone --depth 1 -b v1.5.2 https://github.com/cocotb/cocotb.git cocotb
+        - pushd cocotb
+        - pip install .
+        - popd
+
         - git clone --depth 1 https://git.libre-soc.org/git/pytest-output-to-files.git pytest-output-to-files
         - pushd pytest-output-to-files
         - git rev-parse HEAD
@@ -84,11 +94,6 @@ build:
         - make install
         - popd
 
-        - git clone --depth 1 -b v1.5.2 https://github.com/cocotb/cocotb.git cocotb
-        - pushd cocotb
-        - python3 setup.py install
-        - popd
-
         - git clone --depth 1 https://gitlab.com/nmigen/nmigen.git nmigen
         - pushd nmigen
         - git rev-parse HEAD
@@ -155,4 +160,4 @@ build:
         - popd
 
         - python setup.py develop
-        - SILENCELOG='!*,default' pytest -v --maxfail=10
+        - SILENCELOG='!*,default' pytest -v --maxfail=20