This commit is contained in:
tonquer 2024-11-19 22:43:21 +08:00
parent e29eaa00e0
commit e6826b6009
4 changed files with 61 additions and 11 deletions

View File

@ -26,7 +26,12 @@ jobs:
python -m pip install --upgrade pip
pip install pyinstaller
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp36.cp37.cp38.cp39.cp310.cp311.cp312.cp313-none-macosx_10_9_universal2.whl
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/Pillow-9.1.1-cp310-cp310-macosx_10_10_universal2.whl
cd script
pip install delocate wheel_filename
python build_universal2.py pillow
pip install *.whl
cd ..
pip install -r src/requirements_macos.txt
brew install create-dmg
- name: Build
@ -78,7 +83,11 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install pyinstaller
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/Pillow-9.1.1-cp310-cp310-macosx_10_10_universal2.whl
cd script
pip install delocate wheel_filename
python build_universal2.py pillow
pip install *.whl
cd ..
pip install -r src/requirements_macos.txt
brew install create-dmg
- name: Build
@ -129,7 +138,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pyinstaller==4.8
pip install pyinstaller
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp36.cp37.cp38.cp39.cp310.cp311-none-win_amd64.whl
pip install -r src\requirements.txt
- name: Build
@ -166,7 +175,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pyinstaller==4.8
pip install pyinstaller
pip install -r src\requirements.txt
- name: Build
run: |
@ -274,8 +283,8 @@ jobs:
run: |
sudo apt-get install -y fuse libfuse2
python -m pip install --upgrade pip
pip install pyinstaller==4.8
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp37-cp37m-linux_x86_64.whl
pip install pyinstaller
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp37-abi3-linux_x86_64.whl
pip install -r src/requirements.txt
- name: Build
run: |

View File

@ -59,7 +59,11 @@ jobs:
python -m pip install --upgrade pip
pip install pyinstaller
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp36.cp37.cp38.cp39.cp310.cp311.cp312.cp313-none-macosx_10_9_universal2.whl
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/Pillow-9.1.1-cp310-cp310-macosx_10_10_universal2.whl
cd script
pip install delocate wheel_filename
python build_universal2.py pillow
pip install *.whl
cd ..
pip install -r src/requirements_macos.txt
brew install create-dmg
- name: Build
@ -119,7 +123,11 @@ jobs:
python -m pip install --upgrade pip
pip install pyinstaller
# pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp36.cp37.cp38.cp39.cp310.cp311.cp312.cp313-none-macosx_10_9_universal2.whl
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/Pillow-9.1.1-cp310-cp310-macosx_10_10_universal2.whl
cd script
pip install delocate wheel_filename
python build_universal2.py pillow
pip install *.whl
cd ..
pip install -r src/requirements_macos.txt
brew install create-dmg
- name: Build
@ -177,7 +185,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pyinstaller==4.8
pip install pyinstaller
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp36.cp37.cp38.cp39.cp310.cp311-none-win_amd64.whl
pip install -r src\requirements.txt
Invoke-WebRequest -Uri "https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-win64.zip" -OutFile "upx.zip"
@ -226,7 +234,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pyinstaller==4.8
pip install pyinstaller
pip install -r src\requirements.txt
Invoke-WebRequest -Uri "https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-win64.zip" -OutFile "upx.zip"
Expand-Archive -Path "upx.zip" -DestinationPath "D:\"

View File

@ -0,0 +1,33 @@
import tempfile
import subprocess
import glob
import os
import sys
from wheel_filename import parse_wheel_filename
from delocate import fuse
cwd = "."
class Universal2Bundler:
def build(self, dest_dir, package):
with tempfile.TemporaryDirectory() as tmp_dir:
amd64_binary = "macosx_10_10_x86_64"
arm64_binary = "macosx_11_0_arm64"
subprocess.check_call(['python', '-m', 'pip', 'download', '--only-binary=:all:','--no-deps','--platform', amd64_binary, package, '-d', tmp_dir])
subprocess.check_call(['python', '-m', 'pip', 'download', '--only-binary=:all:','--no-deps','--platform', arm64_binary, package, '-d', tmp_dir])
universal_wheels = glob.glob("{0}/*".format(tmp_dir))
wheel = parse_wheel_filename(universal_wheels[0])
universal2_wheel = os.path.join(dest_dir, "{0}-{1}-{2}-{3}-macosx_10_10_universal2.whl".format(package, wheel.version, wheel.python_tags[0], wheel.abi_tags[0]))
fuse.fuse_wheels(*universal_wheels, universal2_wheel)
print("Successfully created universal2 wheel ", universal2_wheel)
# python3 -m pip download --only-binary=:all: --platform macosx_10_10_x86_64 Pillow
# python3 -m pip download --only-binary=:all: --platform macosx_11_0_arm64 Pillow
name = sys.argv[1]
bundler = Universal2Bundler()
#bundler.build(cwd, "pillow")
#bundler.build(cwd, "cffi")
#bundler.build(cwd, "curl_cffi")
bundler.build(cwd, name)

View File

@ -2,7 +2,7 @@ PySide6==6.4.3
websocket-client==0.59.0
requests==2.26.0
urllib3==1.25.11
pillow==9.1.1
pillow
Pysocks==1.7.1
natsort==8.2.0
webdavclient3==3.14.6