Skip to content

Commit

Permalink
Mandatory code style and dependency fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Vogt committed Nov 8, 2024
1 parent f71aeac commit 0639cd0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/regression-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions basil/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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')

Expand Down

0 comments on commit 0639cd0

Please sign in to comment.