diff --git a/.forgejo/workflows/Dockerfile b/.forgejo/workflows/Dockerfile deleted file mode 100644 index 1a2530c..0000000 --- a/.forgejo/workflows/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:latest - -RUN apt-get update && apt-get install wine -y -RUN apt-get install wget -y -RUN dpkg --add-architecture i386 && apt-get update && apt-get install wine32:i386 -y -RUN wget https://www.python.org/ftp/python/3.12.2/python-3.12.2-amd64.exe -RUN apt-get install xorg xvfb xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic -y -RUN xvfb-run wine python-3.12.2-amd64.exe /quiet /i InstallAllUsers=1 -RUN cd ~/.wine/drive_c/Program\ Files/Python312 && wine python.exe Scripts/pip.exe install pyinstaller -RUN apt-get install git -y \ No newline at end of file diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 4f31d69..c6f4db4 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -1,6 +1,6 @@ on: [push] jobs: - compile-exe: + upload-release: runs-on: docker container: image: git.venreys-lair.xyz/venrey/pythoncrosscompile:latest @@ -8,11 +8,9 @@ jobs: - run: mkdir -p /dist/release - run: apt-get install zip git -y - run: git clone https://git.venreys-lair.xyz/Venrey/Eddie-Roden-Slide-Tool . - - run: wine ~/.wine/drive_c/Program\ Files/Python312/python.exe -m pip install pillow openpyxl matplotlib - - run: wine ~/.wine/drive_c/Program\ Files/Python312/Scripts/pyinstaller.exe --clean --collect-all pillow --collect-all openpyxl --collect-all matplotlib main.py - - run: mv ./dist/main/main.exe ./ImageGen.exe - - run: mv ./dist/main/_internal ./ - - run: zip -r /dist/release/Winodws.zip ./fonts ./templets ./Numbers.xlsx ./_internal ./ImageGen.exe + - run: wine ~/.wine/drive_c/Program\ Files/Python312/Scripts/pyinstaller.exe --onefile main.py + - run: mv ./dist/main.exe ./ImageGen.exe + - run: zip /dist/release/Winodws.zip ./fonts ./templets ./Numbers.xlsx ./ImageGen.exe - uses: actions/forgejo-release@v2 with: direction: upload diff --git a/README.md b/README.md index f6ab2ef..917c5c6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Auto Slide Tool This tool automaticly composites graphs onto your slides for you. Just edit the **Numbers.xlsx** file and run the script -## Usage (Reqires [Microsoft Visual C++ Redistributable](https://aka.ms/vs/17/release/vc_redist.x64.exe)) -1. Download [latest release](https://git.venreys-lair.xyz/Venrey/Eddie-Roden-Slide-Tool/releases/tag/latest) (**windows.zip**) -2. Extract folder -3. Edit **Numbers.xlsx**, then click ImageGen.exe -4. Check the **gen** folder for the generated slides +## Usage (Python must be installed - 3.12.4) +1. Download tool and extract the files +2. Enter folder +3. Click run.bat +4. check the **gen** folder for the generated slides \ No newline at end of file diff --git a/reqirements.txt b/reqirements.txt deleted file mode 100644 index f725193..0000000 --- a/reqirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -altgraph==0.17.4 -contourpy==1.2.1 -cycler==0.12.1 -et-xmlfile==1.1.0 -fonttools==4.53.0 -kiwisolver==1.4.5 -matplotlib==3.9.0 -numpy==2.0.0 -openpyxl==3.1.4 -packaging==24.0 -pillow==10.3.0 -pyinstaller==6.9.0 -pyinstaller-hooks-contrib==2024.7 -pyparsing==3.1.2 -python-dateutil==2.9.0.post0 -setuptools==69.5.1 -six==1.16.0 diff --git a/run.bat b/run.bat new file mode 100644 index 0000000..0a70a89 --- /dev/null +++ b/run.bat @@ -0,0 +1,2 @@ +pip install pillow openpyxl matplotlib +python main.py \ No newline at end of file