Update release workflow and dependencies to Python 3.10.10

.azure/azure-pipelines-build.yml

@@ -7,11 +7,11 @@ trigger:
 - master
 
 pool:
-  vmImage: windows-2019  # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
+  vmImage: windows-2022  # https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md
 strategy:
   matrix:
     Py310_x64:
-      python.version: '3.10.9'
+      python.version: '3.10.10'
       python.arch: x64
       addToPath: true
 
@@ -37,7 +37,7 @@ steps:
   displayName: 'Install Python dependencies'
 
 - script: |
-    python -m pip install polib
+    python -m pip install -r requirements/requirements-binaries.in
     python setup.py build_trans
     pyinstaller -w -D --icon=youtube_dl_gui/data/pixmaps/youtube-dl-gui.ico --add-data="youtube_dl_gui/data;youtube_dl_gui/data" --add-data="youtube_dl_gui/locale;youtube_dl_gui/locale" --exclude-module=tests --version-file=file_version_info.txt --noconfirm --name=yt-dlg youtube_dl_gui/__main__.py
   displayName: 'PyInstaller One Directory'

.devcontainer/devcontainer.json

@@ -10,7 +10,7 @@
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local on arm64/Apple Silicon.
 			// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/python-3
-			"VARIANT": "3.10.9-slim-bullseye",
+			"VARIANT": "3.10.10-slim-bullseye",
 			// Options
 			"NODE_VERSION": "none",
 			// set devcontainer-cli arg for Dockerfile

.github/workflows/release.yml

@@ -14,10 +14,10 @@ jobs:
       sha2_windows: ${{ steps.sha2_file.outputs.sha2_windows }}
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8.10
+    - name: Set up Python 3.10.10
       uses: actions/setup-python@v4
       with:
-          python-version: '3.8.10'
+          python-version: '3.10.10'
           architecture: 'x64'
     - name: Install Requirements
       run: |
@@ -66,13 +66,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8.10
+    - name: Set up Python 3.10.10
       uses: actions/setup-python@v4
       with:
-          python-version: '3.8.10'
+          python-version: '3.10.10'
           architecture: 'x64'
     - name: Build Binary using PyInstaller ManyLinux 2.28 Docker Action
-      uses: oleksis/pyinstaller-manylinux@v2.2.1
+      uses: oleksis/pyinstaller-manylinux@v2.3.0
       with:
         pyinstaller-params: "['-w', '-F', '--add-data=youtube_dl_gui/data:youtube_dl_gui/data', '--add-data=youtube_dl_gui/locale:youtube_dl_gui/locale', '--exclude-module=tests', '--name=yt-dlg', 'youtube_dl_gui/__main__.py']"
     - name: Upload Binary Distribution to Release
@@ -110,14 +110,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.8.10
+    - name: Set up Python 3.10.10
       uses: actions/setup-python@v4
       with:
-          python-version: '3.8.10'
+          python-version: '3.10.10'
           architecture: 'x64'
     - name: Install pypa/build
       run: |
-        python -m pip install build
+        python -m pip install --upgrade pip six setuptools wheel
+        python -m pip install polib build
+        python setup.py build_trans
     - name: Build a binary wheel and a source tarball
       run: |
         python -m build --sdist --wheel --outdir dist/ .

.python-version

@@ -1 +1 @@
-3.10.9
+3.10.10

file_version_info.txt

@@ -6,8 +6,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0.
-    filevers=(1, 8, 4, 0),
-    prodvers=(1, 8, 4, 0),
+    filevers=(1, 8, 5, 0),
+    prodvers=(1, 8, 5, 0),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,12 +31,12 @@ VSVersionInfo(
         '000004b0',
         [StringStruct('CompanyName', 'yt-dlg'),
         StringStruct('FileDescription', 'Youtube Downloader GUI'),
-        StringStruct('FileVersion', '1.8.4'),
+        StringStruct('FileVersion', '1.8.5'),
         StringStruct('InternalName', 'yt-dlg'),
         StringStruct('LegalCopyright', 'https://github.com/oleksis/youtube-dl-gui/LICENSE'),
         StringStruct('OriginalFilename', 'yt-dlg.exe'),
         StringStruct('ProductName', 'yt-dlg'),
-        StringStruct('ProductVersion', '1.8.4')])
+        StringStruct('ProductVersion', '1.8.5')])
       ]),
     VarFileInfo([VarStruct('Translation', [0, 1200])])
   ]

requirements/requirements-binaries.in

@@ -1,2 +1,2 @@
-polib==1.1.1
-pyinstaller<=5.7.0,>=3.6
+polib==1.2.0
+pyinstaller<=5.8.0,>=3.6

setup.py

@@ -356,7 +356,7 @@ def setup_windows():
             "wxPython<=4.2.1a1,>=4.0.7.post2",
         ],
         extras_require={
-            "binaries": ["polib>=1.1.0", "pyinstaller<=5.7.0,>=3.6"],
+            "binaries": ["polib>=1.1.0", "pyinstaller<=5.8.0,>=3.6"],
         },
         python_requires=">=3.7",
         classifiers=[

setup.sh

@@ -5,8 +5,8 @@
 # Fail on errors.
 set -e
 
-PYTHON_VERSION=3.8
-PYINSTALLER_VERSION=5.6.2
+PYTHON_VERSION=3.10
+PYINSTALLER_VERSION=5.8.0
 
 # libpng12
 curl -L -O -C - https://sourceforge.net/projects/libpng/files/libpng12/1.2.59/libpng-1.2.59.tar.gz
@@ -55,15 +55,18 @@ dnf install -y \
 # Simple DirectMedia Layer 2
 dnf install -y SDL2-devel
 
+# Perl-compatible regular expression library 2
+dnf install -y pcre2 pcre2-devel
+
 dnf clean all
 rm -rf /var/cache/yum
 
-pyenv virtualenv ${PYTHON_VERSION}.15 venv38
-pyenv local venv38
+pyenv virtualenv ${PYTHON_VERSION}.10 venv310
+pyenv local venv310
 pyenv exec python -m pip install --upgrade pip six setuptools wheel
 
-curl -L -O -C - https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-16.04/wxPython-4.1.1-cp38-cp38-linux_x86_64.whl
-pyenv exec pip install wxPython-4.1.1-cp38-cp38-linux_x86_64.whl
+curl -L -O -C - https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.2.0-cp310-cp310-linux_x86_64.whl
+pyenv exec pip install wxPython-4.2.0-cp310-cp310-linux_x86_64.whl
 # Install requirements here
 pyenv exec pip install --upgrade pyinstaller==$PYINSTALLER_VERSION
 pyenv exec pip install polib -r requirements/requirements.in