diff --git a/.github/workflows/package-linux.yml b/.github/workflows/package-linux.yml index 2e31eed..4221ec2 100644 --- a/.github/workflows/package-linux.yml +++ b/.github/workflows/package-linux.yml @@ -34,8 +34,8 @@ jobs: - name: Install python dependencies run: | sudo apt-get update - sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full p7zip-rar python3-pyqt5 python3-pip squashfs-tools libfuse2 - python -m pip install --upgrade pip setuptools wheel certifi pyinstaller PyQt6 --no-binary pyinstaller + sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full p7zip-rar python3-pyside6 python3-pip squashfs-tools libfuse2 + python -m pip install --upgrade pip setuptools wheel certifi pyinstaller pyside6 --no-binary pyinstaller python -m pip install -r requirements.txt - name: build binary run: | diff --git a/Dockerfile-base b/Dockerfile-base index 7013b8a..eb3865a 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -8,7 +8,7 @@ RUN echo "I'm building for $TARGETOS/$TARGETARCH/$TARGETVARIANT" COPY requirements.txt /opt/kcc/ ENV PATH="/opt/venv/bin:$PATH" RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \ - apt-get install -y libpng-dev libjpeg-dev p7zip-full unrar-free libgl1 python3-pyqt5 && \ + apt-get install -y libpng-dev libjpeg-dev p7zip-full unrar-free libgl1 python3-pyside6 && \ python -m pip install --upgrade pip && \ python -m venv /opt/venv && \ python -m pip install -r /opt/kcc/requirements.txt @@ -55,7 +55,7 @@ RUN set -x && \ KEPT_PACKAGES+=(p7zip-full) && \ KEPT_PACKAGES+=(python3) && \ KEPT_PACKAGES+=(python3-pip) && \ - KEPT_PACKAGES+=(python3-pyqt5) && \ + KEPT_PACKAGES+=(python3-pyside6) && \ KEPT_PACKAGES+=(unrar-free) && \ # Install packages DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \ @@ -112,7 +112,7 @@ RUN set -x && \ KEPT_PACKAGES+=(p7zip-full) && \ KEPT_PACKAGES+=(python3) && \ KEPT_PACKAGES+=(python3-pip) && \ - KEPT_PACKAGES+=(python3-pyqt5) && \ + KEPT_PACKAGES+=(python3-pyside6) && \ KEPT_PACKAGES+=(unrar-free) && \ # Install packages DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \ diff --git a/README.md b/README.md index a74562f..bf1370c 100644 --- a/README.md +++ b/README.md @@ -59,18 +59,11 @@ On Debian based distributions these two commands should install all needed depen ```bash -$ sudo apt-get install -y python3 python3-dev libpng-dev libjpeg-dev p7zip-full p7zip-rar unrar-free libgl1 python3-pyqt5 && \ +$ sudo apt-get install -y python3 python3-dev libpng-dev libjpeg-dev p7zip-full p7zip-rar unrar-free libgl1 python3-pyside6 && \ python -m pip install --upgrade pip && \ python -m pip install --upgrade -r requirements.txt ``` - -#### Optional dependencies -- Qt platform integration plugin for Deepin Desktop Environment -```bash -$ sudo apt-get install qt5dxcb-plugin -``` - - KindleGen ~~[deprecated link](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation) - It can be found in [Kindle Previewer](https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011) `Amazon Kindle Previewer 3 Folder\lib\fc\bin`, the usual location in windows is in windows is `C:\Users\user\AppData\Local\Amazon\Kindle Previewer 3\lib\fc\bin\` diff --git a/environment.yml b/environment.yml index a87d9d0..e86750b 100644 --- a/environment.yml +++ b/environment.yml @@ -5,11 +5,11 @@ channels: dependencies: - python=3.11 - Pillow>=5.2.0 - - psutil>=5.0.0 + - psutil>=5.9.5 - python-slugify>=1.2.1 - raven>=6.0.0 - distro - pip - pip: - mozjpeg-lossless-optimization>=1.1.2 - - PyQt5>=5.6.0 + - pyside6>=6.5.1 diff --git a/setup.py b/setup.py index 51259fd..b20617c 100644 --- a/setup.py +++ b/setup.py @@ -92,9 +92,9 @@ setuptools.setup( }, packages=['kindlecomicconverter'], install_requires=[ - 'PyQt5>=5.6.0', + 'pyside6>=6.5.1', 'Pillow>=5.2.0', - 'psutil>=5.0.0', + 'psutil>=5.9.5', 'python-slugify>=1.2.1,<9.0.0', 'raven>=6.0.0', 'mozjpeg-lossless-optimization>=1.1.2',