From 5cf9406d4bae6b6ae2b0980859310bb64b07e16f Mon Sep 17 00:00:00 2001 From: Nicolas Dickreuter Date: Mon, 15 Jan 2024 19:10:08 +0000 Subject: [PATCH] release changes --- .github/workflows/release win.yml | 18 ++++++++++-------- poker/main.spec | 1 + requirements_win.txt | 7 +------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release win.yml b/.github/workflows/release win.yml index 20de7d07..8406102c 100644 --- a/.github/workflows/release win.yml +++ b/.github/workflows/release win.yml @@ -1,7 +1,6 @@ name: Binary Release Windows -on: - workflow_dispatch: +on: [push] jobs: build: @@ -35,12 +34,15 @@ jobs: - name: Prepare distribution run: | cd poker - mkdir dist\main\log - mkdir dist\main\pics - mkdir dist\main\log\screenshots - xcopy icon.ico dist\main\poker.ico* /Y - xcopy config_default.ini dist\main\config.ini* /Y - xcopy vboxapi dist\main\vboxapi\ /E + mkdir dist\main\_internal\log + mkdir dist\main\_internal\pics + mkdir dist\main\_internal\log\screenshots + xcopy icon.ico dist\main\_internal\poker.ico* /Y + xcopy config_default.ini dist\main\_internal\config.ini* /Y + xcopy vboxapi dist\main\_internal\vboxapi\ /E + xcopy gui\ui dist\main\gui\ui\ /E + xcopy gui\ui dist\main\_internal\gui\ui\ /E + xcopy ..\tessdata dist\main\_internal\tessdata\ /E - name: Install NSIS run: | diff --git a/poker/main.spec b/poker/main.spec index 6cdd58f0..29e54da8 100644 --- a/poker/main.spec +++ b/poker/main.spec @@ -5,6 +5,7 @@ block_cipher = None a = Analysis(['main.py'], pathex=['poker'], + contents_directory = '.', datas=[ ( 'gui/ui/*.ui', '.' ),( 'gui/ui/*.ui', 'gui/ui' ),( 'decisionmaker/*.json', 'decisionmaker' )], binaries=[], hiddenimports=['pkg_resources.py2_warn', 'fastapi'], diff --git a/requirements_win.txt b/requirements_win.txt index 7b0e8463..d7c4858d 100644 --- a/requirements_win.txt +++ b/requirements_win.txt @@ -3,28 +3,23 @@ h5py==3.8.0 keras==2.12.0 lmfit==1.2.0 matplotlib==3.7.2 -notebook==6.5.4 numexpr==2.8.4 numpy==1.23.5 opencv-python==4.8.0.76 openpyxl==3.1.2 pandas==2.0.3 Pillow==9.5.0 -pycparser==2.21 pydocstyle==6.3.0 -pyinstaller==5.13.0 +pyinstaller==6.3 pylint==2.17.2 pymongo==4.3.3 -PyQt5==5.15.9 PyQt6==6.5.2 pytesseract==0.3.10 pytest==7.3.1 PyYAML==6.0 -QtPy==2.3.1 requests==2.28.2 scipy==1.10.1 seaborn==0.12.2 -Sphinx==7.2.5 tensorboard==2.12.2 tensorflow==2.12.0 tesserocr