Skip to content

Commit

Permalink
Fix: [Installer] Windows 向け PyInstaller の自前ビルド wheel を明示的に poetry の依存…
Browse files Browse the repository at this point in the history
…関係に追加する

pipenv ではできなかった芸当なのでありがたい
  • Loading branch information
tsukumijima committed Sep 22, 2023
1 parent 019621b commit 12df6c6
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 22 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build_installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ jobs:
run: |
pip install poetry
poetry install
# ウイルス検知対策で Windows のみ自前ビルドの PyInstaller に差し替える
poetry run pip install https://github.com/tsukumijima/Pyinstaller-Builds/raw/gh-pages/x86_64/pyinstaller-5.13.0-py3-none-any.whl
# インストーラーを PyInstaller でビルド
- name: Build Installer with PyInstaller
Expand Down
40 changes: 24 additions & 16 deletions installer/poetry.lock

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

9 changes: 5 additions & 4 deletions installer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ psutil = "^5.9.5"
py7zr = "^0.20.6"
# For the Windows version only, to prevent virus detection, when the installer is built by CI,
# it is forced to replace the PyInstaller with my own build.
# When updating PyInstaller, all versions listed in the tsukumijima/Pyinstaller-Builds/.github/workflows/build.yml
# and in KonomiTV/.github/workflows/build_installer.yaml must be updated.
# ref: https://github.com/tsukumijima/Pyinstaller-Builds/blob/master/.github/workflows/build.yml
pyinstaller = "==5.13.0"
# ref: https://python-poetry.org/docs/dependency-specification/#combining-git--url--path-dependencies-with-source-repositories
pyinstaller = [
{ platform = "win32", url = "https://github.com/tsukumijima/Pyinstaller-Builds/raw/gh-pages/x86_64/pyinstaller-5.13.0-py3-none-any.whl" },
{ platform = "linux", version = "5.13.0", source = "pypi" },
]
requests = "^2.31.0"
rich = "^13.5.3"
"ruamel.yaml" = "^0.17.32"
Expand Down

0 comments on commit 12df6c6

Please sign in to comment.