summaryrefslogtreecommitdiffstats
path: root/bundle
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 09:06:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 09:06:10 +0000
commit137f07c27a88b07df57df5b2cdebebe3c7722bac (patch)
tree4ebdcbea6b540f69c40ba0be6ac766008030d149 /bundle
parentAdding debian version 2024.05.27-1. (diff)
downloadyt-dlp-137f07c27a88b07df57df5b2cdebebe3c7722bac.tar.xz
yt-dlp-137f07c27a88b07df57df5b2cdebebe3c7722bac.zip
Merging upstream version 2024.07.01.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'bundle')
-rwxr-xr-xbundle/py2exe.py6
-rwxr-xr-xbundle/pyinstaller.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/bundle/py2exe.py b/bundle/py2exe.py
index 2811674..5b7f488 100755
--- a/bundle/py2exe.py
+++ b/bundle/py2exe.py
@@ -42,9 +42,9 @@ def main():
# py2exe cannot import Crypto
'Crypto',
'Cryptodome',
- # py2exe appears to confuse this with our socks library.
- # We don't use pysocks and urllib3.contrib.socks would fail to import if tried.
- 'urllib3.contrib.socks'
+ # requests >=2.32.0 breaks py2exe builds due to certifi dependency
+ 'requests',
+ 'urllib3',
],
'dll_excludes': ['w9xpopen.exe', 'crypt32.dll'],
# Modules that are only imported dynamically must be added here
diff --git a/bundle/pyinstaller.py b/bundle/pyinstaller.py
index db9dbfd..4184c4b 100755
--- a/bundle/pyinstaller.py
+++ b/bundle/pyinstaller.py
@@ -68,7 +68,7 @@ def exe(onedir):
'dist/',
onedir and f'{name}/',
name,
- OS_NAME == 'win32' and '.exe'
+ OS_NAME == 'win32' and '.exe',
)))
@@ -113,7 +113,7 @@ def windows_set_version(exe, version):
),
kids=[
StringFileInfo([StringTable('040904B0', [
- StringStruct('Comments', 'yt-dlp%s Command Line Interface' % suffix),
+ StringStruct('Comments', f'yt-dlp{suffix} Command Line Interface'),
StringStruct('CompanyName', 'https://github.com/yt-dlp'),
StringStruct('FileDescription', 'yt-dlp%s' % (MACHINE and f' ({MACHINE})')),
StringStruct('FileVersion', version),
@@ -123,8 +123,8 @@ def windows_set_version(exe, version):
StringStruct('ProductName', f'yt-dlp{suffix}'),
StringStruct(
'ProductVersion', f'{version}{suffix} on Python {platform.python_version()}'),
- ])]), VarFileInfo([VarStruct('Translation', [0, 1200])])
- ]
+ ])]), VarFileInfo([VarStruct('Translation', [0, 1200])]),
+ ],
))