Skip to content

Commit a1e46aa

Browse files
authored
Remove SSL Simulation Protocol, Fix Replay on master and Remove Ubuntu 18 support (UBC-Thunderbots#2830)
* remove ssl simulation protocol * fixing replay * remove ubuntu 18 support + add load_blue and load_yellow flags for thunderscope * remove 18 support wsl * remove ubuntu 18 from workflows * fix bad merge
1 parent 8f4b5cb commit a1e46aa

File tree

9 files changed

+10
-63
lines changed

9 files changed

+10
-63
lines changed

.github/workflows/main.yml

-17
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,3 @@ jobs:
123123
//software:unix_full_system \
124124
//software/simulated_tests/... \
125125
//software/ai/hl/...
126-
127-
ubuntu-18-software-tests:
128-
name: Ubuntu 18 Software Tests
129-
runs-on: ubuntu-18.04
130-
steps:
131-
# checks-out the repository under $GITHUB_WORKSPACE
132-
- uses: actions/checkout@v2
133-
134-
- name: Environment Setup
135-
run: |
136-
"${GITHUB_WORKSPACE}"/environment_setup/setup_software.sh
137-
138-
- name: Software Geom Test
139-
run: |
140-
cd src
141-
bazel test --show_timestamps \
142-
//software/geom/...

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "src/software/simulation/ssl_simulation_protocol"]
2-
path = src/software/simulation/ssl_simulation_protocol
3-
url = [email protected]:UBC-Thunderbots/SSL-Simulation-Protocol-Support.git

docs/getting-started-wsl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ If you are not using Windows 11 and would prefer not to upgrade, you can follow
3939
3. Now, let's install Ubuntu.
4040
- Download the WSL2 kernel from [here](https://docs.microsoft.com/en-us/windows/wsl/wsl2-kernel).
4141
- Open a PowerShell window and run command `wsl --set-default-version 2` to use WSL2 by default.
42-
- Install Ubuntu 18.04 LTS from the Microsoft Store.
42+
- Install Ubuntu 20.04 LTS from the Microsoft Store.
4343
- Open the Ubuntu app in the Start menu. It will open a command prompt and ask you to create a new UNIX username and password for your WSL2 Ubuntu installation.
4444
4545
### X Server Setup

environment_setup/setup_software.sh

-16
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,6 @@ if [[ $(lsb_release -rs) == "20.04" ]]; then
8888
ldconfig
8989
fi
9090

91-
if [[ $(lsb_release -rs) == "18.04" ]]; then
92-
# This is required for bazel, we've seen some issues where
93-
# the bazel install hasn't installed it properly
94-
host_software_packages+=(python-minimal)
95-
host_software_packages+=(libclang-dev)
96-
host_software_packages+=(python2.7-dev)
97-
host_software_packages+=(python3.8)
98-
host_software_packages+=(python3.8-dev)
99-
host_software_packages+=(python3.8-venv)
100-
host_software_packages+=(python3-setuptools)
101-
fi
102-
10391
if ! sudo apt-get install "${host_software_packages[@]}" -y ; then
10492
print_status_msg "Error: Installing utilities and dependencies failed"
10593
exit 1
@@ -121,10 +109,6 @@ if ! sudo /opt/tbotspython/bin/python3 -m pip install --upgrade pip ; then
121109
exit 1
122110
fi
123111

124-
if [[ $(lsb_release -rs) == "18.04" ]]; then
125-
sudo /opt/tbotspython/bin/pip3 install -r ubuntu18_requirements.txt
126-
fi
127-
128112
if [[ $(lsb_release -rs) == "20.04" ]]; then
129113
sudo /opt/tbotspython/bin/pip3 install -r ubuntu20_requirements.txt
130114
fi

environment_setup/ubuntu18_requirements.txt

-13
This file was deleted.

src/software/simulated_tests/simulated_test_fixture.py

+2
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,8 @@ def simulated_test_runner():
398398
yellow_full_system_proto_unix_io,
399399
layout_path=args.layout,
400400
visualization_buffer_size=args.visualization_buffer_size,
401+
load_blue=True,
402+
load_yellow=True,
401403
)
402404

403405
time.sleep(LAUNCH_DELAY_S)
This file was deleted.

src/software/thunderscope/thunderscope.py

+2-12
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,10 @@
33
import textwrap
44
import shelve
55
import signal
6-
import platform
76
import logging
87

9-
# PyQt5 doesn't play nicely with i3 and Ubuntu 18, PyQt6 is much more stable
10-
# Unfortunately, PyQt6 doesn't install on Ubuntu 18. Thankfully both
11-
# libraries are interchangeable, and we just need to swap them in this
12-
# one spot, and pyqtgraph will pick up on it and store the library under
13-
# pyqtgraph.Qt. So from PyQt5 import x becomes from pyqtgraph.Qt import x
14-
if "18.04" in platform.version():
15-
import PyQt5
16-
from PyQt5.QtWebEngineWidgets import QWebEngineView
17-
else:
18-
import PyQt6
19-
from PyQt6.QtWebEngineWidgets import QWebEngineView
8+
import PyQt6
9+
from PyQt6.QtWebEngineWidgets import QWebEngineView
2010

2111
from qt_material import apply_stylesheet, list_themes
2212

src/software/thunderscope/thunderscope_main.py

+5
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@
185185
tscope = Thunderscope(
186186
layout_path=args.layout,
187187
visualization_buffer_size=args.visualization_buffer_size,
188+
load_blue=True,
189+
load_yellow=True,
188190
cost_visualization=args.cost_visualization,
189191
)
190192
proto_unix_io = tscope.blue_full_system_proto_unix_io
@@ -296,8 +298,11 @@
296298
tscope = Thunderscope(
297299
layout_path=args.layout,
298300
visualization_buffer_size=args.visualization_buffer_size,
301+
load_blue=(args.blue_log is not None),
299302
blue_replay_log=args.blue_log,
303+
load_yellow=(args.yellow_log is not None),
300304
yellow_replay_log=args.yellow_log,
305+
load_gamecontroller=False,
301306
cost_visualization=args.cost_visualization,
302307
)
303308
tscope.show()

0 commit comments

Comments
 (0)