cleanup

Author: julien-lang

.snyk

@@ -8,10 +8,8 @@ ignore:
     - resources/python/src/3.10/explicit_requirements.txt
     - resources/python/src/3.11/explicit_requirements.txt
     - resources/python/src/3.13/explicit_requirements.txt
-    # WHY &&&&??????? that's not what we want to do. Quite the opposite....
 exclude:
   global:
     # Exclude Python 3.7 deps because Snyk only scans with supported versions
-    - resources/python/requirements/3.7/requirements.txt
     - resources/python/bin/3.7/explicit_requirements.txt
     - resources/python/bin/3.7/explicit_requirements.txt

azure-pipelines.yml

@@ -37,7 +37,7 @@ jobs:
     extra_test_dependencies:
       # All runtime dependencies come from the unified requirements file.
       # This guarantees CI-installed versions match what pkgs.zip bundles,
-      # preventing sys.modules version conflicts (see SG-42304). TODO
+      # preventing sys.modules version conflicts.
       - --requirement=azure-pipelines/requirements.txt
     post_tests_steps:
       - task: Bash@3

azure-pipelines/requirements.txt

@@ -1,16 +1,13 @@
 # Required when binary dependencies are not bundled
 attrs==22.2.0    # Fix version. Otherwise tk-ci-tools will install latest
-## TODO will see later if we can update this ..!.!.!.!
 
 # Twisted must match the version bundled in pkgs.zip/src/ for the corresponding
 # Python version. If the test environment installs a different version, it gets
 # loaded first and causes a sys.modules version conflict at runtime (see SG-42304).
 Twisted==22.10.0; python_version < "3.9"
-# Twisted==24.10.0; python_version >= "3.9" and python_version < "3.13"
-# Twisted~=24.11.0; python_version >= "3.13"
-Twisted~=25.5.0; python_version >= "3.9"
+Twisted==24.10.0; python_version >= "3.9" and python_version < "3.13"
+Twisted~=24.11.0; python_version >= "3.13"
 
 # websocket-client is a test-only dependency (not bundled in pkgs.zip).
-# 1.6.2+ dropped Python 3.7 support; our minimum is Python 3.9.
 websocket-client==1.6.1; python_version < "3.9" # Last version supporting Python 3.7
 websocket-client~=1.9.0; python_version >= "3.9"

resources/python/install_binary.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Shotgun Software Inc.
+# Copyright (c) 2026 Shotgun Software Inc.
 #
 # CONFIDENTIAL AND PROPRIETARY
 #
@@ -79,5 +79,3 @@
 ]:
     for match in bin_dir.glob(pattern):
         shutil.rmtree(match, ignore_errors=True)
-
-

resources/python/pipelines/pipelines.yml

@@ -57,7 +57,7 @@ jobs:
   # Source
   # -----------------------------------------------------------------
   - job: source_${{ replace(pyver.name, '.', '_') }}
-    displayName: Py 3rd-Party Pkgs - ${{ pyver.name }} - Src
+    displayName: Pkg Req - Py ${{ pyver.name }} - Src
     pool:
       vmImage: ubuntu-22.04
     ${{ if pyver.prev }}:
@@ -110,7 +110,7 @@ jobs:
   # -----------------------------------------------------------------
   - ${{ each os in parameters.os_platforms }}:
     - job: ${{ os.name }}_${{ replace(pyver.name, '.', '_') }}
-      displayName: Py 3rd-Party Pkgs - ${{ pyver.name }} - ${{ os.short }}
+      displayName: Pkg Req - Py ${{ pyver.name }} - ${{ os.short }}
       ${{ if os.prev }}:
         dependsOn: ${{ os.prev }}_${{ replace(pyver.name, '.', '_') }}
       ${{ else }}:

resources/python/requirements.txt

@@ -1,22 +1,9 @@
-# Unified requirements file for tk-framework-desktopserver Python dependencies.
-#
-# This is the single source of truth for all Python dependency versions.
-# It serves two purposes:
-#
-#   1. Building pkgs.zip - passed to update_requirements.py which calls pip
-#      under each target Python version. Pip env markers are resolved
-#      automatically based on the running interpreter.
-#
-#   2. CI test dependencies - referenced in azure-pipelines.yml as:
-#         extra_test_dependencies:
-#           - --requirement resources/python/requirements.txt
-#
 # Supported Python versions:
 #   - 3.7  (legacy; Twisted capped at 22.10.0)
 #   - 3.9  (VFX CY2022)
 #   - 3.10 (VFX CY2023)
 #   - 3.11 (VFX CY2024)
-#   - 3.13 (VFX CY2026; 3.12 was skipped - not a VFX platform year)
+#   - 3.13 (VFX CY2026)
 #
 # When updating a dependency, run update_requirements.py for each Python
 # version to regenerate the frozen explicit_requirements.txt files, then
@@ -32,8 +19,8 @@
 # 24.10.0 is used for 3.9-3.11.
 # 24.11+ is required for 3.13 (dropped legacy code paths incompatible with
 # the new interpreter).
-Twisted==22.10.0; python_version == "3.7"
-Twisted==24.10.0; python_version > "3.7" and python_version < "3.13"
+Twisted==22.10.0; python_version < "3.9"
+Twisted==24.10.0; python_version >= "3.9" and python_version < "3.13"
 Twisted~=24.11.0; python_version >= "3.13"
 
 # autobahn - WebSocket and WAMP protocol implementation on top of Twisted.
@@ -58,7 +45,8 @@ service-identity~=24.2.0; python_version >= "3.13"
 # cryptography - low-level cryptography backend for pyOpenSSL.
 # Binary package (wheel). NOTE: only needed for SAST scanning, not runtime.
 # 44.x compatible across all supported Python versions.
-cryptography==44.0.1
+cryptography==44.0.3; python_version < "3.13"
+cryptography~=44.0.1; python_version >= "3.13"
 
 # cffi - C foreign function interface; dependency of cryptography.
 # Binary package (wheel). 1.17.x required for Python 3.13 (updated C API