Merge 64faaf01a2 into be3579aaf0

.github/workflows/build.yml

@@ -504,8 +504,7 @@ jobs:
       - windows32
     runs-on: ubuntu-latest
     steps:
-      - name: Download artifacts
+      - uses: actions/download-artifact@v4
-        uses: actions/download-artifact@v4
         with:
           path: artifact
           pattern: build-bin-*

.github/workflows/release-master.yml

@@ -28,20 +28,3 @@ jobs:
       actions: write  # For cleaning up cache
       id-token: write  # mandatory for trusted publishing
     secrets: inherit
-
-  publish_pypi:
-    needs: [release]
-    if: vars.MASTER_PYPI_PROJECT != ''
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: dist
-          name: build-pypi
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true

.github/workflows/release-nightly.yml

@@ -41,20 +41,3 @@ jobs:
       actions: write  # For cleaning up cache
       id-token: write  # mandatory for trusted publishing
     secrets: inherit
-
-  publish_pypi:
-    needs: [release]
-    if: vars.NIGHTLY_PYPI_PROJECT != ''
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write  # mandatory for trusted publishing
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: dist
-          name: build-pypi
-      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          verbose: true

.github/workflows/release.yml

@@ -2,6 +2,10 @@ name: Release
 on:
   workflow_call:
     inputs:
+      prerelease:
+        required: false
+        default: true
+        type: boolean
       source:
         required: false
         default: ''
@@ -14,10 +18,6 @@ on:
         required: false
         default: ''
         type: string
-      prerelease:
-        required: false
-        default: true
-        type: boolean
   workflow_dispatch:
     inputs:
       source:
@@ -278,20 +278,11 @@ jobs:
           make clean-cache
           python -m build --no-isolation .
 
-      - name: Upload artifacts
-        if: github.event_name != 'workflow_dispatch'
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-pypi
-          path: |
-            dist/*
-          compression-level: 0
-
       - name: Publish to PyPI
-        if: github.event_name == 'workflow_dispatch'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           verbose: true
+          attestations: false  # Currently doesn't work w/ reusable workflows (breaks nightly)
 
   publish:
     needs: [prepare, build]

pyproject.toml

@@ -52,7 +52,7 @@ default = [
     "pycryptodomex",
     "requests>=2.32.2,<3",
     "urllib3>=1.26.17,<3",
-    "websockets>=13.0,<14",
+    "websockets>=13.0",
 ]
 curl-cffi = [
     "curl-cffi==0.5.10; os_name=='nt' and implementation_name=='cpython'",

yt_dlp/dependencies/Cryptodome.py

@@ -24,7 +24,7 @@ try:
         from Crypto.Cipher import AES, PKCS1_OAEP, Blowfish, PKCS1_v1_5  # noqa: F401
         from Crypto.Hash import CMAC, SHA1  # noqa: F401
         from Crypto.PublicKey import RSA  # noqa: F401
-except (ImportError, OSError):
+except ImportError:
     __version__ = f'broken {__version__}'.strip()