From ea4e28a613484f2e4d30036b73f2989f09b6c594 Mon Sep 17 00:00:00 2001 From: pcroland Date: Tue, 2 Jan 2024 19:02:35 +0100 Subject: [PATCH] # deew 3.2.0: - add Windows 7 support with custom Python build: https://github.com/adang1345/PythonWin7 --- .github/workflows/build.yaml | 25 +++++++++++------------- README.md | 4 ++-- README_hu.md | 4 ++-- changelog.md | 4 ++++ deew/__main__.py | 2 +- dev_scripts/readme/help.txt | 2 +- dev_scripts/readme/readme_template_en.md | 2 +- dev_scripts/readme/readme_template_hu.md | 2 +- pyproject.toml | 2 +- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fc615ce..fdc8891 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -58,20 +58,17 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.12" - # - name: Set up Python - # run: | - # Invoke-WebRequest -Uri "https://github.com/adang1345/PythonWin7/raw/master/3.12.1/python.3.12.1.nupkg" -OutFile "python.3.12.1.nupkg" - # mkdir "C:\custom_python" - # nuget --version - # nuget install python -Source "python.3.12.1.nupkg" -OutputDirectory "C:\custom_python" - # echo "C:\custom_python" >> $GITHUB_PATH - # echo "C:\custom_python\Scripts" >> $GITHUB_PATH - # python --version + # uses: actions/setup-python@v5 + # with: + # python-version: "3.12" + + - name: Set up Python + run: | + Invoke-WebRequest -Uri "https://github.com/adang1345/PythonWin7/raw/master/3.12.1/python.3.12.1.nupkg" -OutFile "python.3.12.1.nupkg" + mkdir "C:\pywin7" + nuget install python -Source $(Get-Location) -OutputDirectory "C:\pywin7\" + echo "C:\pywin7\python.3.12.1\tools" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Set up libraries run: | @@ -87,7 +84,7 @@ jobs: - name: Build run: | - python -m pyinstaller -F __main__.py -n deew --icon logo/icon.ico + python -m PyInstaller -F __main__.py -n deew --icon logo/icon.ico - name: Move dist/deew.exe to deew.exe run: mv dist/deew.exe deew.exe diff --git a/README.md b/README.md index ffd5614..1b1445c 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ - if DEE throws `Failed to load library "...dll".` errors when you run deew install [VisualCppRedist AIO](https://github.com/abbodi1406/vcredist/releases) # deew installation -### with standalone build (Windows 8-11/Linux): +### with standalone build (Windows 7-11/Linux): - grab the latest build from: [https://github.com/pcroland/deew/releases](https://github.com/pcroland/deew/releases) - run with: `deew`\ *(run the binary from terminal, doubleclicking it won't work)* @@ -99,7 +99,7 @@ PATH="/usr/local/bin/ffmpeg:$PATH" # Usage ``` ❯ deew -h -deew 3.1.3 +deew 3.2.0 USAGE: deew [-h] [-v] [-i [INPUT ...]] [-ti INDEX] [-o DIRECTORY] [-f FORMAT] [-b BITRATE] [-dm CHANNELS] [-d DELAY] [-r DRC] [-dn DIALNORM] diff --git a/README_hu.md b/README_hu.md index 100bda8..90f54fd 100644 --- a/README_hu.md +++ b/README_hu.md @@ -62,7 +62,7 @@ - ha DEE `Failed to load library "...dll".` hibákat dob deew használatakor, telepítsd fel a [VisualCppRedist AIO](https://github.com/abbodi1406/vcredist/releases)-t # deew telepítése -### standalone buildet használva (Windows 8-11/Linux): +### standalone buildet használva (Windows 7-11/Linux): - tölsd le a legfrissebb buildet innen: [https://github.com/pcroland/deew/releases](https://github.com/pcroland/deew/releases) - futtasd: `deew`\ *(terminálból futtasd, duplaklikk nem fog működni)* @@ -99,7 +99,7 @@ PATH="/usr/local/bin/ffmpeg:$PATH" # Használat ``` ❯ deew -h -deew 3.1.3 +deew 3.2.0 USAGE: deew [-h] [-v] [-i [INPUT ...]] [-ti INDEX] [-o DIRECTORY] [-f FORMAT] [-b BITRATE] [-dm CHANNELS] [-d DELAY] [-r DRC] [-dn DIALNORM] diff --git a/changelog.md b/changelog.md index 7b19da5..7203dac 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# deew 3.2.0: +- add Windows 7 support with custom Python build: + https://github.com/adang1345/PythonWin7 + # deew 3.1.3: - fix #37: Only show basename for already existing intermediate files diff --git a/deew/__main__.py b/deew/__main__.py index 8cf74df..2f2226d 100755 --- a/deew/__main__.py +++ b/deew/__main__.py @@ -45,7 +45,7 @@ from deew.xml_base import xml_dd_ddp_base, xml_thd_base, xml_ac4_base prog_name = 'deew' -prog_version = '3.1.3' +prog_version = '3.2.0' simplens = SimpleNamespace() diff --git a/dev_scripts/readme/help.txt b/dev_scripts/readme/help.txt index 739ba62..63e0d92 100644 --- a/dev_scripts/readme/help.txt +++ b/dev_scripts/readme/help.txt @@ -1,4 +1,4 @@ -deew 3.1.3 +deew 3.2.0 USAGE: deew [-h] [-v] [-i [INPUT ...]] [-ti INDEX] [-o DIRECTORY] [-f FORMAT] [-b BITRATE] [-dm CHANNELS] [-d DELAY] [-r DRC] [-dn DIALNORM] diff --git a/dev_scripts/readme/readme_template_en.md b/dev_scripts/readme/readme_template_en.md index 19af8ce..29bae9a 100644 --- a/dev_scripts/readme/readme_template_en.md +++ b/dev_scripts/readme/readme_template_en.md @@ -23,7 +23,7 @@ description_placeholder - if DEE throws `Failed to load library "...dll".` errors when you run deew install [VisualCppRedist AIO](https://github.com/abbodi1406/vcredist/releases) # deew installation -### with standalone build (Windows 8-11/Linux): +### with standalone build (Windows 7-11/Linux): - grab the latest build from: [https://github.com/pcroland/deew/releases](https://github.com/pcroland/deew/releases) - run with: `deew`\ *(run the binary from terminal, doubleclicking it won't work)* diff --git a/dev_scripts/readme/readme_template_hu.md b/dev_scripts/readme/readme_template_hu.md index b63c9be..0961ebf 100644 --- a/dev_scripts/readme/readme_template_hu.md +++ b/dev_scripts/readme/readme_template_hu.md @@ -23,7 +23,7 @@ description_placeholder - ha DEE `Failed to load library "...dll".` hibákat dob deew használatakor, telepítsd fel a [VisualCppRedist AIO](https://github.com/abbodi1406/vcredist/releases)-t # deew telepítése -### standalone buildet használva (Windows 8-11/Linux): +### standalone buildet használva (Windows 7-11/Linux): - tölsd le a legfrissebb buildet innen: [https://github.com/pcroland/deew/releases](https://github.com/pcroland/deew/releases) - futtasd: `deew`\ *(terminálból futtasd, duplaklikk nem fog működni)* diff --git a/pyproject.toml b/pyproject.toml index 6e628bc..1e20707 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "deew" -version = "3.1.3" +version = "3.2.0" description = "Dolby Encoding Engine Wrapper" authors = ["pcroland "] license = "MIT"