Build: Fix CI - pin pyinstaller and update imports

stephendade · Jun 12, 2024 · 822d87f · 822d87f
1 parent e426099
commit 822d87f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -26,7 +26,7 @@ jobs:
           python -m pip install -U wheel setuptools pip
           python -m pip install -U pywin32 lxml pymavlink numpy matplotlib pyserial opencv-python PyYAML Pygame Pillow wxpython prompt-toolkit scipy
           python -m pip install -U openai wave pyaudio
-          python -m pip install -U pyinstaller packaging 
+          python -m pip install -U pyinstaller==6.7.0 packaging 
       - name: Download Inno Setup installer
         run: curl -L -o installer.exe http://files.jrsoftware.org/is/6/innosetup-6.2.0.exe
       - name: Install Inno Setup

diff --git a/windows/MAVProxyWinBuild.bat b/windows/MAVProxyWinBuild.bat
@@ -30,6 +30,12 @@ if exist "..\..\pymavlink" (
  )
 )
 
+rem -----Install additional Python packages-----
+python.exe -m pip install -U wheel setuptools pip
+python.exe -m pip install pywin32 lxml pymavlink numpy matplotlib pyserial opencv-python PyYAML Pygame Pillow wxpython prompt-toolkit scipy
+python.exe -m pip install -U openai wave pyaudio
+python.exe -m pip install -U pyinstaller==6.7.0 packaging 
+
 rem -----Build MAVProxy-----
 cd ..\
 python.exe -m pip install . --user

diff --git a/windows/mavproxy.spec b/windows/mavproxy.spec
@@ -8,12 +8,12 @@ MAVProxyAny = Analysis(['mavproxy.py'],
              # all the needed pieces, so we also import them in mavproxy.py
              hiddenimports=['cv2', 'wx', 'pylab', 
                             'numpy', 'dateutil', 'matplotlib',
-                            'HTMLParser', 'wx.grid', 'wx._grid', 'prompt-toolkit',
+                            'HTMLParser', 'wx.grid', 'wx._grid', 'prompt_toolkit',
                             'wx.lib.agw.genericmessagedialog', 'wx.lib.wordwrap', 'wx.lib.buttons',
                             'wx.lib.embeddedimage', 'wx.lib.imageutils', 'wx.lib.agw.aquabutton', 
-                            'wx.lib.agw.gradientbutton', 'wxversion', 'UserList', 'UserString',
+                            'wx.lib.agw.gradientbutton',
                             'six','packaging', 'packaging.version', 'packaging.specifiers',
-                            'pkg_resources.py2_warn'] + collect_submodules('MAVProxy.modules') + 
+                            ] + collect_submodules('MAVProxy.modules') + 
                             collect_submodules('pymavlink') + collect_submodules('yaml') + collect_submodules('pygame'),
              datas= [ ('modules\\mavproxy_map\\data\\*.*', 'MAVProxy\\modules\\mavproxy_map\\data' ),
                       ('modules\\mavproxy_joystick\\joysticks\\*.*', 'MAVProxy\\modules\\mavproxy_joystick\\joysticks' )],
@@ -26,11 +26,11 @@ MAVExpAny = Analysis(['.\\tools\\MAVExplorer.py'],
              # all the needed pieces, so we also import them in mavproxy.py
              hiddenimports=['cv2', 'wx', 'pylab', 
                             'numpy', 'dateutil', 'matplotlib',
-                            'prompt-toolkit', 'HTMLParser', 'wx.grid', 'wx._grid',
+                            'prompt_toolkit', 'HTMLParser', 'wx.grid', 'wx._grid',
                             'wx.lib.agw.genericmessagedialog', 'wx.lib.wordwrap', 'wx.lib.buttons',
                             'wx.lib.embeddedimage', 'wx.lib.imageutils', 'wx.lib.agw.aquabutton', 
-                            'wx.lib.agw.gradientbutton', 'FileDialog', 'Dialog', 'UserList', 'UserString',
-                            'pkg_resources.py2_warn'] + collect_submodules('pymavlink'),
+                            'wx.lib.agw.gradientbutton', 'FileDialog', 'Dialog',
+                            ] + collect_submodules('pymavlink'),
              datas= [ ('tools\\graphs\\*.*', 'MAVProxy\\tools\\graphs' ) ],
              hookspath=None,
              runtime_hooks=None,