Skip to content

Commit 6ee072c

Browse files
mkrnrmkrnr
committed
Remove Qt build dependency
1 parent 0b32109 commit 6ee072c

File tree

5 files changed

+16
-84
lines changed

5 files changed

+16
-84
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -477,20 +477,6 @@ jobs:
477477
- name: Checkout
478478
uses: actions/checkout@v4
479479

480-
- name: Install system dependencies
481-
run: apt_get_install libdbus-1-dev libdbus-glib-1-dev libudev-dev libusb-1.0-0-dev libegl-dev
482-
483-
# Installing Qt before Python since it installs its own Python.
484-
- name: Install Qt
485-
uses: jurplel/install-qt-action@v4
486-
with:
487-
version: '6.5.2'
488-
aqtversion: '==3.2.*'
489-
dir: '${{ github.workspace }}/gh-action-installs'
490-
491-
- name: Add Qt libexec to PATH
492-
run: echo "$QT_ROOT_DIR/libexec" >> $GITHUB_PATH
493-
494480
- name: Setup Python
495481
uses: actions/setup-python@v5
496482
with:
@@ -509,6 +495,9 @@ jobs:
509495
- name: Setup pip options
510496
run: setup_pip_options
511497

498+
- name: Install system dependencies
499+
run: apt_get_install libdbus-1-dev libdbus-glib-1-dev libudev-dev libusb-1.0-0-dev libegl-dev libxkbcommon-x11-0
500+
512501
- name: Setup Python environment
513502
run: setup_python_env -c reqs/constraints.txt -r reqs/dist.txt -r reqs/dist_extra_gui_qt.txt -r reqs/test.txt
514503

@@ -557,17 +546,6 @@ jobs:
557546
# We need the whole history for patching the version.
558547
fetch-depth: 0
559548

560-
# Installing Qt before Python since it installs its own Python.
561-
- name: Install Qt
562-
uses: jurplel/install-qt-action@v4
563-
with:
564-
version: '6.5.2'
565-
aqtversion: '==3.2.*'
566-
dir: '${{ github.workspace }}/gh-action-installs'
567-
568-
- name: Add Qt libexec to PATH
569-
run: echo "$QT_ROOT_DIR/libexec" >> $GITHUB_PATH
570-
571549
- name: Setup Python
572550
uses: actions/setup-python@v5
573551
with:
@@ -662,20 +640,6 @@ jobs:
662640
# We need the whole history for patching the version.
663641
fetch-depth: 0
664642

665-
- name: Install system dependencies
666-
run: apt_get_install libdbus-1-dev libdbus-glib-1-dev libudev-dev libusb-1.0-0-dev libegl-dev
667-
668-
# Installing Qt before Python since it installs its own Python.
669-
- name: Install Qt
670-
uses: jurplel/install-qt-action@v4
671-
with:
672-
version: '6.5.2'
673-
aqtversion: '==3.2.*'
674-
dir: '${{ github.workspace }}/gh-action-installs'
675-
676-
- name: Add Qt libexec to PATH
677-
run: echo "$QT_ROOT_DIR/libexec" >> $GITHUB_PATH
678-
679643
- name: Setup Python
680644
uses: actions/setup-python@v5
681645
with:
@@ -694,6 +658,9 @@ jobs:
694658
- name: Setup pip options
695659
run: setup_pip_options
696660

661+
- name: Install system dependencies
662+
run: apt_get_install libdbus-1-dev libdbus-glib-1-dev libudev-dev libusb-1.0-0-dev libegl-dev libxkbcommon-x11-0
663+
697664
- name: Setup Python environment
698665
run: setup_python_env -c reqs/constraints.txt -r reqs/build.txt -r reqs/setup.txt
699666

@@ -747,17 +714,6 @@ jobs:
747714
# We need the whole history for patching the version.
748715
fetch-depth: 0
749716

750-
# Installing Qt before Python since it installs its own Python.
751-
- name: Install Qt
752-
uses: jurplel/install-qt-action@v4
753-
with:
754-
version: '6.5.2'
755-
aqtversion: '==3.2.*'
756-
dir: '${{ github.workspace }}/gh-action-installs'
757-
758-
- name: Add Qt libexec to PATH
759-
run: echo "$QT_ROOT_DIR/libexec" >> $GITHUB_PATH
760-
761717
- name: Set cache name
762718
id: set_cache
763719
run: setup_cache_name '3.9' 'macos-15'
@@ -828,17 +784,6 @@ jobs:
828784
# We need the whole history for patching the version.
829785
fetch-depth: 0
830786

831-
# Installing Qt before Python since it installs its own Python.
832-
- name: Install Qt
833-
uses: jurplel/install-qt-action@v4
834-
with:
835-
version: '6.5.2'
836-
aqtversion: '==3.2.*'
837-
dir: '${{ github.workspace }}/gh-action-installs'
838-
839-
- name: Add Qt libexec to PATH
840-
run: echo "$QT_ROOT_DIR/libexec" >> $GITHUB_PATH
841-
842787
- name: Setup Python
843788
uses: actions/setup-python@v5
844789
with:

‎.github/workflows/ci/helpers.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ setup_python_env()
114114
run_eval "echo PYTHONUSERBASE='$PYTHONUSERBASE' >>\$GITHUB_ENV"
115115
if [ ! -e "$python_userbase" ]
116116
then
117-
get_base_devel --no-warn-script-location --user || die
118-
install_wheels --no-warn-script-location --user "$@" || die
117+
get_base_devel --no-warn-script-location || die
118+
install_wheels --no-warn-script-location "$@" || die
119119
if [ "$RUNNER_OS" = 'Windows' ]
120120
then
121121
run rm -rf "$python_userbase"/Python*/Scripts

‎.github/workflows/ci/workflow_template.yml‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,24 +98,6 @@ jobs:
9898
fetch-depth: 0
9999
<% endif %>
100100

101-
<% if j.type in ['build', 'test_gui_qt'] and j.os == 'Linux' %>
102-
- name: Install system dependencies
103-
run: apt_get_install libdbus-1-dev libdbus-glib-1-dev libudev-dev libusb-1.0-0-dev libegl-dev
104-
105-
<% endif %>
106-
<% if j.type in ['build', 'test_gui_qt', 'test_packaging'] %>
107-
# Installing Qt before Python since it installs its own Python.
108-
- name: Install Qt
109-
uses: jurplel/install-qt-action@v4
110-
with:
111-
version: '6.5.2'
112-
aqtversion: '==3.2.*'
113-
dir: '${{ github.workspace }}/gh-action-installs'
114-
115-
- name: Add Qt libexec to PATH
116-
run: echo "$QT_ROOT_DIR/libexec" >> $GITHUB_PATH
117-
118-
<% endif %>
119101
<% if j.os != 'macOS' %>
120102
- name: Setup Python
121103
uses: <@ action_setup_python @>
@@ -148,6 +130,11 @@ jobs:
148130
- name: Setup Python
149131
run: setup_osx_python '<@ j.python @>'
150132

133+
<% endif %>
134+
<% if j.type in ['build', 'test_gui_qt'] and j.os == 'Linux' %>
135+
- name: Install system dependencies
136+
run: apt_get_install libdbus-1-dev libdbus-glib-1-dev libudev-dev libusb-1.0-0-dev libegl-dev libxkbcommon-x11-0
137+
151138
<% endif %>
152139
- name: Setup Python environment
153140
run: setup_python_env -c reqs/constraints.txt<% for r in j.reqs %> -r <@ r @><% endfor %>

‎plover_build_utils/setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def _build_ui(self, src):
107107
if self.verbose:
108108
print('generating', dst)
109109

110-
subprocess.check_call(['uic', '-g', 'python', '--from-imports', src, '-o', dst])
110+
subprocess.check_call(['pyside6-uic', '--from-imports', src, '-o', dst])
111111

112112
for hook in self.hooks:
113113
mod_name, attr_name = hook.split(':')
@@ -156,7 +156,7 @@ def run(self):
156156
output_file = os.path.splitext(resource_file)[0] + '_rc.py'
157157
if self.verbose:
158158
print(f'compiling {resource_file} to {output_file}')
159-
subprocess.check_call(['rcc', '-g', 'python', '-o', output_file, resource_file])
159+
subprocess.check_call(['pyside6-rcc', '-o', output_file, resource_file])
160160

161161
# }}}
162162

‎reqs/constraints.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ python-xlib==0.31
5050
pytz==2021.3
5151
PyYAML==5.3.1
5252
readme-renderer==37.3
53-
requests==2.26.0
53+
requests==2.31.0
5454
requests-cache==0.9.1
5555
requests-futures==1.0.0
5656
requests-toolbelt==0.9.1

0 commit comments

Comments
 (0)