-
Notifications
You must be signed in to change notification settings - Fork 9
SG-42549 Refactor requirements management #344
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
julien-lang
wants to merge
13
commits into
master
Choose a base branch
from
ticket/SG-42118-refactor-requirements-management
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
5c92fec
SG-42118 Consolidate per-version requirements into a single file
julien-lang 4d67a95
better
julien-lang 74ab9c0
better2
julien-lang b75258f
SG-42118 Improve requirements.txt documentation and CVE annotations
julien-lang 3c8d078
SG-42118 Add azure-pipelines/requirements.txt and update CI dependenc…
julien-lang d85ca35
SG-42118 Exhaustive CVE history annotations in requirements.txt
julien-lang 8172622
SG-42118 Add CVE-2020-35678 (autobahn) and CVE-2020-25659 (cryptograp…
julien-lang 7a5c120
SG-42118 Fix operator and marker for sub-level dependencies
julien-lang 1297285
Remove
julien-lang 46950ad
better
julien-lang 96e61fb
Remove outdated files!
julien-lang 7e016c5
Update resources/python/requirements.txt
julien-lang 2851251
Update azure-pipelines.yml
julien-lang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Test-environment dependencies for Azure Pipelines CI. | ||
| # These supplement the pre-built pkgs.zip bundle and are not shipped with the | ||
| # product. | ||
| # | ||
| # Note: attrs and Twisted versions must be kept in sync with | ||
| # resources/python/requirements.txt. | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # attrs | ||
| # Pinned to prevent tk-ci-tools from upgrading to a newer version automatically. | ||
| attrs==22.2.0 | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # Twisted | ||
| # Must match the version bundled in pkgs.zip/src/ for each Python version. | ||
| # A version mismatch causes a sys.modules 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" | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # websocket-client | ||
| # Test-only dependency (not bundled in pkgs.zip). | ||
| websocket-client==1.6.1 ; python_version < "3.9" # Last version supporting Python 3.7 | ||
| websocket-client~=1.9.0 ; python_version >= "3.9" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| # Targeted Python versions: | ||
| # - 3.7 (legacy) | ||
| # - 3.9 (VFX CY2022) | ||
| # - 3.10 (VFX CY2023) | ||
| # - 3.11 (VFX CY2024) | ||
| # - 3.13 (VFX CY2026) | ||
| # | ||
| # When updating a dependency, follow the process described in README.md. | ||
| # CI handles regeneration automatically. | ||
| # Note: Twisted and attrs are also pinned in azure-pipelines/requirements.txt | ||
| # and must be kept in sync with the versions here. | ||
|
julien-lang marked this conversation as resolved.
|
||
|
|
||
| # ============================================================================ # | ||
| # Direct dependencies | ||
| # Version constraints balance code compatibility and CVE requirements. | ||
| # | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # autobahn | ||
| # CVE-2020-35678 - fixed in 20.12.3 | ||
| autobahn==22.12.1 ; python_version < "3.13" | ||
| autobahn~=24.4.2 ; python_version >= "3.13" | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # pyOpenSSL | ||
| pyopenssl==25.0.0 ; python_version < "3.13" | ||
| pyopenssl~=25.0.0 ; python_version >= "3.13" | ||
|
julien-lang marked this conversation as resolved.
|
||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # Twisted | ||
| # CVE-2022-21712 - fixed in 22.1 | ||
| # CVE-2022-24801 - fixed in 22.1 | ||
| # CVE-2024-41671 & CVE-2024-41810 - fixed in 24.10.0 - N/A for Python 3.7 | ||
| twisted==22.10.0 ; python_version < "3.9" # Last version supporting 3.7 | ||
| twisted==24.10.0 ; python_version >= "3.9" and python_version < "3.13" | ||
| twisted~=24.11.0 ; python_version >= "3.13" | ||
|
|
||
| # ============================================================================ # | ||
| # Selected sub-level dependencies | ||
| # CVE-driven: minimum versions (>= x.y.z). | ||
| # Other reasons (e.g. compatibility, bundling): pinned to a specific version. | ||
| # | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # attrs | ||
| # Required by: | ||
| # → service-identity | ||
| # ↳ Twisted | ||
| # Do not upgrade! The CI pipeline installs attrs==22.2.0 as a system-level test | ||
| # dependency (see azure-pipelines/requirements.txt). pytest also imports attrs | ||
| # early, caching it in sys.modules. From attrs 23.2.0, | ||
| # `attrs/__init__.py` imports `Converter` from `attr`. If the bundled version is | ||
| # newer than the cached one, that import fails with: | ||
| # ImportError: cannot import name 'Converter' from 'attr' | ||
| # Twisted 24.x and autobahn 24.x only require attrs>=22.2.0, so this is safe. | ||
| attrs==22.2.0 | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # certifi | ||
| # Required by: | ||
| # → pyOpenSSL | ||
| # ↳ Twisted | ||
| # Pinned to match the version bundled with FPT Desktop | ||
| certifi==2026.1.4 | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # cffi | ||
| # Required by: | ||
| # → cryptography → autobahn | ||
| # ↳ pyOpenSSL | ||
| # ↳ service-identity | ||
| cffi>=1.15.1 ; python_version < "3.13" | ||
| cffi>=1.17.1 ; python_version >= "3.13" | ||
|
julien-lang marked this conversation as resolved.
|
||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # cryptography | ||
| # Required by: | ||
| # → autobahn | ||
| # ↳ pyOpenSSL | ||
| # ↳ service-identity | ||
| # CVE-2023-2650 - fixed in 41.0.0 | ||
| # CVE-2023-4807 - fixed in 41.0.5 | ||
| # CVE-2023-5678 - fixed in 41.0.7 | ||
| # CVE-2023-49083 - fixed in 41.0.7 | ||
| # CVE-2024-2511 - fixed in 43.0.1 | ||
| # CVE-2024-4603 - fixed in 43.0.1 | ||
| # CVE-2024-6119 - fixed in 43.0.1 | ||
| # CVE-2024-12797 - fixed in 44.0.1 | ||
| cryptography>=44.0.1 | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # hyperlink | ||
| # Required by: | ||
| # → autobahn | ||
| # ↳ Twisted | ||
| hyperlink>=21.0.0 | ||
|
julien-lang marked this conversation as resolved.
|
||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # idna | ||
| # Required by: | ||
| # → hyperlink → autobahn | ||
| # ↳ Twisted | ||
| # CVE-2024-3651 - fixed in 3.7 | ||
| idna>=3.7 ; python_version < "3.13" | ||
| idna>=3.8 ; python_version >= "3.13" | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # service-identity | ||
| # Required by: | ||
| # → Twisted | ||
| service-identity>=21.1.0 ; python_version < "3.13" | ||
| service-identity>=24.2.0 ; python_version >= "3.13" | ||
|
julien-lang marked this conversation as resolved.
|
||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # six | ||
| # Required by: service-identity | ||
| # service-identity 24.x (Python 3.13+) no longer requires six | ||
| six==1.16.0 ; python_version < "3.13" | ||
|
|
||
| #------------------------------------------------------------------------------- | ||
| # zope.interface | ||
| # Required by: Twisted | ||
| zope.interface>=5.5.2 ; python_version < "3.13" | ||
| zope.interface>=7.1.0 ; python_version >= "3.13" | ||
|
julien-lang marked this conversation as resolved.
|
||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice!