From 0639cd0cdbab01e49926e4597958e73ffef56e20 Mon Sep 17 00:00:00 2001 From: Marco Vogt Date: Fri, 8 Nov 2024 17:53:52 +0100 Subject: [PATCH] Mandatory code style and dependency fixes --- .github/workflows/regression-tests.yml | 2 +- basil/utils/utils.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml index 82bc9896..aa5956c4 100644 --- a/.github/workflows/regression-tests.yml +++ b/.github/workflows/regression-tests.yml @@ -67,7 +67,7 @@ jobs: - name: Install Python dependencies shell: bash -l {0} run: | - pip install pyvisa pyvisa-sim pytest coveralls pytest-cov cocotb>=1.8.1 cocotb-bus + pip install pyvisa pyvisa-sim pytest coveralls pytest-cov cocotb>=1.8.1 cocotb-bus gitpython - name: Install Verilator if: matrix.sim == 'verilator' diff --git a/basil/utils/utils.py b/basil/utils/utils.py index 5e534fa7..fc7e9e28 100644 --- a/basil/utils/utils.py +++ b/basil/utils/utils.py @@ -64,7 +64,7 @@ def line_prepender(filename, line): sitcp_folder = os.path.join(os.path.os.getcwd(), rel_path, 'SiTCP/') - # Only download if the SiTCP git repository is not present + # Only download if the SiTCP git repository is not present if not os.path.isdir(os.path.join(sitcp_folder, '.git')): print('Downloading SiTCP') @@ -76,14 +76,14 @@ def line_prepender(filename, line): line_prepender(filename=sitcp_folder + 'WRAP_SiTCP_GMII_XC7K_32K.V', line=r'`default_nettype wire') for line in fileinput.input([sitcp_folder + 'WRAP_SiTCP_GMII_XC7K_32K.V'], inplace=True): print(line.replace("assign\tMY_IP_ADDR[31:0]\t= (~FORCE_DEFAULTn | (EXT_IP_ADDR[31:0]==32'd0) \t? DEFAULT_IP_ADDR[31:0]\t\t: EXT_IP_ADDR[31:0]\t\t);", - 'assign\tMY_IP_ADDR[31:0]\t= EXT_IP_ADDR[31:0];'), end='') + 'assign\tMY_IP_ADDR[31:0]\t= EXT_IP_ADDR[31:0];'), end='') else: # update if existing print('SiTCP already present. Checking for updates') g = git.cmd.Git(sitcp_folder) g.pull() sitcp_10G_folder = os.path.join(os.path.os.getcwd(), rel_path, 'SiTCP10G/') - # Only download if the SiTCP10G git repository is not present + # Only download if the SiTCP10G git repository is not present if not os.path.isdir(os.path.join(sitcp_10G_folder, '.git')): print('Downloading SiTCP10G')