Skip to content

Commit 66ea20d

Browse files
Merge remote-tracking branch 'origin/main' into arrows
2 parents 65a6665 + 900952a commit 66ea20d

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
check-style:
1111
name: Find Trailing Whitespace
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Find Trailing Whitespace
@@ -26,7 +26,7 @@ jobs:
2626
2727
build:
2828
name: Generate python files from ui
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030
steps:
3131
- uses: actions/checkout@v4
3232
- name: Remove broken apt repos [Ubuntu]
@@ -47,7 +47,7 @@ jobs:
4747
path: robot_log_visualizer/ui/autogenerated
4848

4949
deploy:
50-
runs-on: ubuntu-20.04
50+
runs-on: ubuntu-22.04
5151
needs: [build]
5252
if: github.ref == 'refs/heads/main'
5353
steps:

.github/workflows/pypi-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
python-version:
2020
- 3.8
2121
os:
22-
- ubuntu-20.04
22+
- ubuntu-22.04
2323
# - macos-latest
2424
# - windows-latest
2525

@@ -48,7 +48,7 @@ jobs:
4848

4949
deploy_test_PyPI:
5050
name: 📦 Deploy to TestPyPI
51-
runs-on: ubuntu-20.04
51+
runs-on: ubuntu-22.04
5252
needs: [build_wheels]
5353
if: github.ref == 'refs/heads/main'
5454
steps:
@@ -68,7 +68,7 @@ jobs:
6868

6969
deploy_PyPI:
7070
name: 📦 Deploy to PyPI
71-
runs-on: ubuntu-20.04
71+
runs-on: ubuntu-22.04
7272
needs: [build_wheels]
7373
if: startsWith(github.ref, 'refs/tags')
7474
steps:

robot_log_visualizer/ui/autogenerated/about.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
# Form implementation generated from reading ui file 'robot_log_visualizer/ui/misc/about.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.14.1
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
7-
# WARNING! All changes made in this file will be lost!
7+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8+
# run again. Do not edit this file unless you know what you are doing.
89

910

1011
from PyQt5 import QtCore, QtGui, QtWidgets

robot_log_visualizer/ui/autogenerated/plot_tab.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
# Form implementation generated from reading ui file 'robot_log_visualizer/ui/misc/plot_tab.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.14.1
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
7-
# WARNING! All changes made in this file will be lost!
7+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8+
# run again. Do not edit this file unless you know what you are doing.
89

910

1011
from PyQt5 import QtCore, QtGui, QtWidgets

robot_log_visualizer/ui/autogenerated/set_robot_model.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
# Form implementation generated from reading ui file 'robot_log_visualizer/ui/misc/set_robot_model.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.14.1
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
7-
# WARNING! All changes made in this file will be lost!
7+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8+
# run again. Do not edit this file unless you know what you are doing.
89

910

1011
from PyQt5 import QtCore, QtGui, QtWidgets
@@ -74,8 +75,8 @@ def setupUi(self, setRobotModelDialog):
7475
self.formLayout.setItem(3, QtWidgets.QFormLayout.FieldRole, spacerItem)
7576

7677
self.retranslateUi(setRobotModelDialog)
77-
self.buttonBox.accepted.connect(setRobotModelDialog.accept)
78-
self.buttonBox.rejected.connect(setRobotModelDialog.reject)
78+
self.buttonBox.accepted.connect(setRobotModelDialog.accept) # type: ignore
79+
self.buttonBox.rejected.connect(setRobotModelDialog.reject) # type: ignore
7980
QtCore.QMetaObject.connectSlotsByName(setRobotModelDialog)
8081

8182
def retranslateUi(self, setRobotModelDialog):

robot_log_visualizer/ui/autogenerated/video_tab.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
# Form implementation generated from reading ui file 'robot_log_visualizer/ui/misc/video_tab.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.14.1
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
7-
# WARNING! All changes made in this file will be lost!
7+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8+
# run again. Do not edit this file unless you know what you are doing.
89

910

1011
from PyQt5 import QtCore, QtGui, QtWidgets

robot_log_visualizer/ui/autogenerated/visualizer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
# Form implementation generated from reading ui file 'robot_log_visualizer/ui/misc/visualizer.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.14.1
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
7-
# WARNING! All changes made in this file will be lost!
7+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
8+
# run again. Do not edit this file unless you know what you are doing.
89

910

1011
from PyQt5 import QtCore, QtGui, QtWidgets

0 commit comments

Comments
 (0)