Make SBOM steps optional

Author: zooba

sbom.py

@@ -26,18 +26,9 @@
 import zipfile
 from functools import cache
 from pathlib import Path
-from typing import Any, TypedDict, cast
+from typing import Any, LiteralString, NotRequired, TypedDict, cast
 from urllib.request import urlopen
 
-try:
-    from typing import LiteralString
-except ImportError:
-    LiteralString = str
-
-try:
-    from typing import NotRequired
-except ImportError:
-    NotRequired = typing.Optional
 
 class SBOM(TypedDict):
     SPDXID: str

windows-release/msi-steps.yml

@@ -131,13 +131,15 @@ steps:
       "--cpython-source-dir=$(Build.SourcesDirectory)"
       $(gci -r "$(Build.ArtifactStagingDirectory)\msi\**\python-*.exe")
     workingDirectory: $(Build.BinariesDirectory)
+    condition: and(succeeded(), not(variables['SkipSBOM']))
     displayName: 'Create SBOMs for binaries'
     env:
       PYTHON: $(Build.BinariesDirectory)\win32\python.exe
       PYTHONHOME: $(Build.SourcesDirectory)
 
   - task: CopyFiles@2
     displayName: 'Layout Artifact: sbom'
+    condition: and(succeeded(), not(variables['SkipSBOM']))
     inputs:
       sourceFolder: $(Build.ArtifactStagingDirectory)\msi
       targetFolder: $(Build.ArtifactStagingDirectory)\sbom
@@ -152,6 +154,7 @@ steps:
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: sbom'
+    condition: and(succeeded(), not(variables['SkipSBOM']))
     inputs:
       PathtoPublish: '$(Build.ArtifactStagingDirectory)\sbom'
       ArtifactName: sbom

windows-release/stage-layout-embed.yml

@@ -72,6 +72,7 @@ jobs:
       "--cpython-source-dir=$(Build.SourcesDirectory)"
       "$(Build.ArtifactStagingDirectory)\embed\python-$(VersionText)-embed-$(Name).zip"
     workingDirectory: $(Build.BinariesDirectory)
+    condition: and(succeeded(), not(variables['SkipSBOM']))
     displayName: 'Create SBOMs for binaries'
 
   - task: CopyFiles@2

windows-release/stage-layout-pymanager.yml

@@ -215,6 +215,7 @@ jobs:
       "--cpython-source-dir=$(Build.SourcesDirectory)\cpython"
       $(gci "zip\*.zip")
     workingDirectory: $(Build.ArtifactStagingDirectory)
+    condition: and(succeeded(), not(variables['SkipSBOM']))
     displayName: 'Create SBOMs for package'
 
   - publish: '$(Build.ArtifactStagingDirectory)\layout'