Merge branch '1.5' and 'Qt6' into develop

Author: lpozo

.github/workflows/release.yml

@@ -29,6 +29,7 @@ jobs:
         sudo apt update && sudo apt -y install ffmpeg
     - name: Install dependencies
       run: |
+        sudo apt install ffmpeg
         python -m pip install --upgrade pip
         pip install nose pytest pytest-cov black flake8 pep8-naming flake8-debugger flake8-docstrings codecov
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi

.travis.yml

@@ -9,8 +9,8 @@ services:
 matrix:
   include:
     - os: linux
-      python: 3.7
-      env: TESTENV=py37-pyqt5151 QT_API=pyqt5 PEP8=1 COV=1
+      python: 3.10
+      env: TESTENV=py310-pyqt640 QT_API=pyqt6 PEP8=1 COV=1
   fast_finish: true
 
 before_install:
@@ -27,7 +27,7 @@ cache:
 install:
   - pip install pip --upgrade
   - pip install pytest pytest-cov black flake8 pep8-naming flake8-debugger flake8-docstrings codecov
-  - pip install PyQt5==5.15.1
+  - pip install PyQt6==6.4.0
 
 script:
   - flake8 --select=D1 videomorph/*.py

README.md

@@ -40,7 +40,7 @@ VideoMorph is a video converter, just that. Consists on a GUI wrapper for [Ffmpe
 
 VideoMorph uses the following libraries and programs:
 
-- [PyQt5](https://www.riverbankcomputing.com/static/Docs/PyQt5/introduction.html)
+- [PyQt](https://www.riverbankcomputing.com/static/Docs/PyQt6/introduction.html)
 - [FFmpeg](http://ffmpeg.org)
 - [Python](https://python.org) > 3.4
 
@@ -52,7 +52,7 @@ On Windows systems, you also need:
 
 ## Installation
 
-You can install and use VideoMorph on GNU/Linux and Windows systems. There are several ways you can use to install the application. Let's take a look at them. We haven't tried properly **yet** on MacO :-|
+You can install and use VideoMorph on GNU/Linux and on Windows systems. There are several ways you can use to install the application. Let's take a look at them. We haven't tried properly **yet** on macOS :-|
 
 ### Installing From the Binary Packages
 
@@ -63,12 +63,13 @@ If you're using GNU/Linux or Windows, then you can install VideoMorph by using t
 You can install VideoMorph on Debian/Ubuntu and derivatives by running the following steps:
 
 1. Download the `.deb` package
+
 2. Open a terminal, and run the following commands as **root** or using **sudo**:
 
-```bash
-$ apt install ffmpeg python3 python3-pyqt5
+```sh
+$ sudo apt install ffmpeg python3 python3-pyqt6
 $ cd <directory containing VideoMorph binary>
-$ dpkg -i videomorph_x.x_all.deb
+$ sudo dpkg -i videomorph_x.x_all.deb
 ```
 
 That should be enough to get VideoMorph (and its dependencies) installed on your system.
@@ -80,7 +81,9 @@ You can also install VideoMorph's `.deb` package, by using GDebi, which is a GUI
 To install VideoMorph on your Windows system, you can:
 
 1. Download the installer that corresponds to your architecture
+
 2. Run the installer as an `administrator`
+
 3. Follow on-screen instructions
 
 ### Installing Form the Source Packages
@@ -92,7 +95,7 @@ You can install VideoMorph from the source packages. Let's take a look at how to
 To install the application from the source package on a GNU/Linux system, do the following:
 
 1. Download the `.tar.gz` package
-2. Open a terminal, and run the following commands as **root** or using **sudo **when specified (as in step 3 and 5):
+2. Open a terminal, and type in this:
 
 ```bash
 $ tar -xvf videomorph-x.x.tar.gz
@@ -123,7 +126,7 @@ $ cd videomorph-x.x
 $ sudo ./install.sh
 ```
 
-This command will install VideoMorph and its dependencies (Ffmpeg, and PyQt5) from your distro's current repository.
+This command will install VideoMorph, and its dependencies, (Ffmpeg, and PyQt6), from your distro's current repository.
 
 #### On Windows
 
@@ -132,11 +135,11 @@ To install VideoMorph from the source package on your Windows system, first, mak
 1. Download and decompress the `.zip` source package
 2. Open your Windows' command-line (`cmd.exe`), and type the following commands:
 
-```doscon
-C:/> cd videomorph-x.x
-C:/> pip install -r requirements.txt
-C:/> python3 setup.py build
-C:/> python3 setup.py install
+```powershell
+PS> cd videomorph-x.x
+PS> pip install -r requirements.txt
+PS> python3 setup.py build
+PS> python3 setup.py install
 ```
 
 This will install VideoMorph on your system, but you'll need to install Ffmpeg manually.
@@ -174,7 +177,7 @@ To set up the development environment, and contribute code to VideoMorph, just o
 ```console
 $ python3 -m venv venv
 $ source venv/bin/activate
-(venv)$ pip install -r requirements.txt
+(venv) $ pip install -r requirements.txt
 ```
 
 You also need to install the Ffmpeg library on your system.
@@ -183,9 +186,9 @@ You also need to install the Ffmpeg library on your system.
 
 The members of the VideoMorph Development Team that can commit changes into the repo are:
 
+- [Ozkar L. Garcell](https://github.com/codeshard)
 - [Leodanis Pozo Ramos](https://github.com/lpozo)
 - [Leonel Salazar Videaux](https://github.com/leonel-lordford)
-- [Ozkar L. Garcell](https://github.com/codeshard)
 
 ### Internal Contributions Procedure
 
@@ -239,11 +242,11 @@ General rules for writing commit messages:
 5. Use the imperative mood in the subject line
 6. Wrap the body at 72 characters
 7. Use the body to explain what and why vs how
-
 ```
+
 Add support for MOV format
 
-Add support for MOV format with several presets to give more
+Add support for MOV format with several presets to give more 
 default conversion options to the user.
 ```
 
@@ -261,16 +264,15 @@ Following the idea of [python-video-converter](https://github.com/senko/python-v
 
 Authors:
 
-- [Leodanis Pozo Ramos](mailto:[email protected])
 - [Ozkar L. Garcell](mailto:[email protected])
+- [Leodanis Pozo Ramos](mailto:[email protected])
 
 Contributors:
-
-- [Maikel Llamaret Heredia](http://gutl.jovenclub.cu) **[Rest In Peace Dear Friend]**
 - [Leonel Salazar Videaux](http://debianhlg.cubava.cu/)
-- [Carlos Parra Zaldivar](http://libreoffice.cubava.cu)
+- [Maikel Llamaret Heredia](http://gutl.jovenclub.cu) **[Rest in peace dear friend.]**
+- [Carlos Parra Zaldivar](http://libreoffice.cubava.cu) **[Rest in peace dear friend.]**
 - Osmel Cruz
 
 ## Copyright
 
-Copyright 2016-2020 VideoMorph Development Team.
+Copyright 2016-2022 VideoMorph Development Team.

TODO

@@ -23,7 +23,9 @@
 
 - Implement a Dialog to generate the conversion commands using the Ffmpeg options
 - Write a Disclaimer about Ffmpeg options in customized profiles, available codecs and input video quality
-- Implement an alternative class for `conversionlib._Converter` (`subprocess` maybe) to decouple from `PyQt5`
+- Pack in `RPM` format
+- Pack for Arch Linux
+- Implement an alternative class for `conversionlib._Converter` (`subprocess` maybe) to decouple from `PyQt6`
 - Move the business logic present in `videomorph.py`, `about.py` and other views to `converter` package package
 - Move the `HTML` text hardcoded in `about.py` to a file distributed as doc. Read the about info from that file as done with the License
 - Pack in AppImage, Flatpack or Snap

bin/videomorph

@@ -3,8 +3,8 @@
 #
 # File _name: videomorph
 #
-#   VideoMorph - A PyQt5 frontend to ffmpeg.
-#   Copyright 2016-2020 VideoMorph Development Team
+#   VideoMorph - A PyQt6 frontend to ffmpeg.
+#   Copyright 2016-2022 VideoMorph Development Team
 
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.

copyright

@@ -4,7 +4,7 @@ Upstream-Contact: [email protected]
 Source: https://github.com/videomorph-dev/videomorph
 
 Files: *
-Copyright: 2016-2020 VideoMorph Development Team
+Copyright: 2016-2022 VideoMorph Development Team
 
 License: Apache-2.0
 

install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # VideoMorph installation script for Ubuntu
 
-depends="ffmpeg python3 python3-pyqt5 python3-setuptools"
+depends="ffmpeg python3 python3-pyqt6 python3-setuptools"
 
 if type dpkg &> /dev/null
 then

requirements.txt

@@ -1,2 +1,2 @@
-PyQt5==5.12.2
+PyQt6==6.4.0
 setuptools==39.0.1

setup.py

@@ -3,8 +3,8 @@
 #
 # File _name: setup.py
 #
-#   VideoMorph - A PyQt5 frontend to ffmpeg.
-#   Copyright 2016-2020 VideoMorph Development Team
+#   VideoMorph - A PyQt6 frontend to ffmpeg.
+#   Copyright 2016-2022 VideoMorph Development Team
 
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
     USE_DISTUTILS = True
 
 
-LONG_DESCRIPTION = """Video Converter based on ffmpeg, Python 3 and PyQt5.
+LONG_DESCRIPTION = """Video Converter based on ffmpeg, Python 3 and PyQt6.
 Unlike other video converters, VideoMorph focuses on a single goal:
 make video conversion simple, with an easy to use GUI and allowing
 the user to convert to the currently most popular video formats.
@@ -55,7 +55,7 @@
     name=APP_NAME.lower(),
     version=VERSION + "-" + CODENAME.lower(),
     description="Video Converter based on ffmpeg, "
-    "Python 3 and Qt5, focused on usability.",
+    "Python 3 and Qt6, focused on usability.",
     long_description=LONG_DESCRIPTION,
     author="Ozkar L. Garcell",
     author_email="[email protected]",

share/applications/videomorph.desktop

@@ -3,8 +3,8 @@ Type=Application
 Name=VideoMorph
 GenericName=Video Converter
 GenericName[es]=Convertidor de Video
-Comment=Video Converter based on ffmpeg, Python 3 and PyQt5.
-Comment[es]=Convertidor de Video basado en ffmpeg, Python 3 y PyQt5.
+Comment=Video Converter based on ffmpeg, Python 3 and PyQt6.
+Comment[es]=Convertidor de Video basado en ffmpeg, Python 3 y PyQt6.
 Exec=videomorph
 Icon=videomorph
 Terminal=false