diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ccf7efc..604d57a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,6 +23,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install pyinstaller pip install -r src\requirements.txt 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 - name: Build @@ -94,6 +95,7 @@ jobs: run: | sudo apt-get install -y fuse libfuse2 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-cp37-abi3-linux_x86_64.whl pip install -r src/requirements.txt - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12f39cc..d7a9ed7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -192,6 +192,7 @@ jobs: - name: Install dependencies run: | 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-none-win_amd64.whl pip install -r src\requirements.txt - name: Build @@ -231,7 +232,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - 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 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 run: | @@ -311,7 +313,7 @@ jobs: run: | python -m pip install --upgrade pip pip install pyinstaller==4.6 - 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 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_win7.txt - name: Build run: | @@ -350,6 +352,7 @@ jobs: run: | sudo apt-get install -y fuse libfuse2 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-cp37-abi3-linux_x86_64.whl pip install -r src/requirements.txt - name: Build diff --git a/src/requirements.txt b/src/requirements.txt index 3ac9d90..553f210 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -7,7 +7,7 @@ lxml==4.6.4 pycryptodomex==3.12.0 Pysocks==1.7.1 natsort==8.2.0 -curl_cffi==0.5.10 +curl_cffi jmcomic>=2.4.3 webdavclient3==3.14.6 tqdm==4.66.4 diff --git a/src/requirements_win7.txt b/src/requirements_win7.txt index 6889001..e17ff3e 100644 --- a/src/requirements_win7.txt +++ b/src/requirements_win7.txt @@ -7,7 +7,7 @@ lxml==4.6.4 pycryptodomex==3.12.0 Pysocks==1.7.1 natsort==8.2.0 -curl_cffi==0.5.10 +curl_cffi jmcomic>=2.4.3 webdavclient3==3.14.6 tqdm==4.66.4