Skip to content

Commit 01199a0

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 3cf16cf + 8d45b4c commit 01199a0

332 files changed

Lines changed: 110845 additions & 146809 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-python/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ runs:
1515

1616
- name: Install dependencies
1717
shell: bash
18-
run: uv sync --locked --all-extras --dev
18+
run: uv sync --locked --all-extras --dev --no-install-package pygobject --no-install-package pycairo

.github/workflows/checks.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
uses: './.github/actions/setup-python'
3535

3636
- name: Run tests
37-
# For example, using `pytest`
37+
env:
38+
UV_NO_SYNC: 1
3839
run: uv run py.test python-src
3940

4041
lint:
@@ -46,4 +47,6 @@ jobs:
4647
uses: './.github/actions/setup-python'
4748

4849
- name: Prek hooks
50+
env:
51+
UV_NO_SYNC: 1
4952
run: uv run prek --show-diff-on-failure --color=always --all-files

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ package/batocera/emulationstation/batocera-emulationstation/keys.txt
3131
*.po~
3232
batocera-mok.key
3333
.venv*
34-
/messages.mo
3534
typescript
3635
.ruff_cache
3736
.coverage
37+
*.mo

Config.in

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,6 @@ menu "Emulators"
373373
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/snes9x/Config.in"
374374
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/sugarbox/Config.in"
375375
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/supermodel/Config.in"
376-
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/supermodel-common/Config.in"
377-
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/supermodel-legacy/Config.in"
378376
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/touchhle/Config.in"
379377
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/tsugaru/Config.in"
380378
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/emulators/vice/Config.in"
@@ -516,10 +514,7 @@ menu "Libraries"
516514
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/python-smbus3/Config.in"
517515
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/pywebview/Config.in"
518516
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/rapidyaml/Config.in"
519-
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sdl3/Config.in"
520-
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sdl3_image/Config.in"
521517
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sdl3_mixer/Config.in"
522-
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sdl3_ttf/Config.in"
523518
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/semver/Config.in"
524519
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/sf_rpi_status/Config.in"
525520
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/libraries/tomlplusplus/Config.in"
@@ -639,6 +634,7 @@ menu "Utils"
639634
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-led-handheld/Config.in"
640635
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-nfc/Config.in"
641636
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-onscreen-keyboard/Config.in"
637+
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-bezel-overlay/Config.in"
642638
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-pygame/Config.in"
643639
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-steam/Config.in"
644640
source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/utils/batocera-test/Config.in"

Dockerfile

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)