Skip to content

Commit

Permalink
Merge pull request #14 from jaspersiebring/linux_wxpython
Browse files Browse the repository at this point in the history
Extra sources for wxPython (speedup Linux build)
  • Loading branch information
jaspersiebring committed Dec 19, 2023
2 parents 982d499 + 9b45b03 commit ca6a029
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 28 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-22.04, windows-latest, macos-latest]
steps:
- name: Check out repository code
uses: actions/checkout@v3
Expand Down Expand Up @@ -46,7 +46,10 @@ jobs:
libsdl2-dev \
libunwind-dev \
libgtk2.0-dev
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-22.04'
- name: Manually download wxPython wheel for Ubuntu 22.04 (prevents lengthy build)
run: $(poetry run which pip) install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/ wxPython==4.2.1
if: matrix.os == 'ubuntu-22.04'
- name: Installing Poetry environment
run: poetry install
- name: Setting tag to package version
Expand Down Expand Up @@ -75,10 +78,10 @@ jobs:

- name: Authorize GitHub Actions to publish on PYPI
run: poetry config pypi-token.pypi ${{ secrets.PYPI_API_TOKEN }}
if: steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest'
if: steps.build.outcome == 'success' && matrix.os == 'ubuntu-22.04'
- name: Publish on PYPI
run: poetry publish
if: steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest'
if: steps.build.outcome == 'success' && matrix.os == 'ubuntu-22.04'
- name: Make executable from wheel
run: poetry run pyinstaller ./build.spec
env:
Expand All @@ -99,7 +102,7 @@ jobs:

release:
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
steps:
- name: Collect all artifacts
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.18-bookworm
FROM python:3.9-bullseye

# wxPython dependencies
RUN apt-get update && apt install -y \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This repository does **NOT** include the BIOS files themselves.
- Simple graphical user interface (GUI)
- Scriptable command line interface (CLI)
- Works on Windows, Linux and MacOS
- Available through the Python Package Index (Python >=3.8)
- Available through the Python Package Index (Python >=3.9)
- Available as portable executable (no installation required)


Expand Down
23 changes: 3 additions & 20 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "libretro-finder"
version = "0.3.0"
version = "0.3.1"
description = "Simple tool that finds and prepares your BIOS files for usage with Libretro (or its RetroArch frontend)."
authors = ["Jasper Siebring <j.siebring92@gmail.com>"]
license = "GNU General Public License v3.0"
Expand All @@ -20,6 +20,7 @@ gooey = "^1.0.8.1"
pandas = "^2.1.4"
tqdm = "^4.66.1"
vdf = "^3.4"
wxpython = "^4.2.1"

[tool.poetry.group.dev.dependencies]
pytest = "^7.4.3"
Expand Down

0 comments on commit ca6a029

Please sign in to comment.