Switch ubuntu runner to 22.04 and macos to 13

This commit is contained in:
Timmy Welch 2024-12-07 12:02:59 -08:00
parent 38932f0782
commit c282ebf845
4 changed files with 7 additions and 5 deletions

View File

@ -47,7 +47,7 @@ jobs:
strategy:
matrix:
python-version: [3.9]
os: [ubuntu-latest, macos-12, windows-latest]
os: [ubuntu-22.04, macos-13, windows-latest]
steps:
- uses: actions/checkout@v4
@ -70,7 +70,7 @@ jobs:
- name: Install linux dependencies
run: |
sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2
sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2 desktop-file-utils
if: runner.os == 'Linux'
- name: Build and install PyPi packages

View File

@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
python-version: [3.9]
os: [ubuntu-latest, macos-12, windows-latest]
os: [ubuntu-22.04, macos-13, windows-latest]
steps:
- uses: actions/checkout@v4
@ -39,7 +39,7 @@ jobs:
- name: Install linux dependencies
run: |
sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2
sudo apt-get update && sudo apt-get upgrade && sudo apt-get install pkg-config libicu-dev libqt5gui5 libfuse2 desktop-file-utils
if: runner.os == 'Linux'
- name: Build, Install and Test PyPi packages

View File

@ -27,7 +27,7 @@ if opts.APPIMAGETOOL.exists():
raise SystemExit(0)
urlretrieve(
"https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage", opts.APPIMAGETOOL
"https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-x86_64.AppImage", opts.APPIMAGETOOL
)
os.chmod(opts.APPIMAGETOOL, 0o0700)

View File

@ -135,6 +135,8 @@ def _find_local_plugins(plugin_path: pathlib.Path) -> Generator[Plugin]:
def find_plugins(plugin_folder: pathlib.Path) -> Plugins:
"""Discovers all plugins (but does not load them)."""
ret: list[LoadedPlugin] = []
if not plugin_folder.is_dir():
return _classify_plugins(ret)
zips = [x for x in plugin_folder.iterdir() if x.is_file() and x.suffix in (".zip", ".whl")]