python Optional typing fun

Author: flowstate

scripts/build.sh

@@ -17,5 +17,5 @@ else
   echo "Doing test build of version $VERSION"
   python -m build --wheel --sdist \
     && ls dist/*${VERSION}* \
-    && twine upload -r testpypi dist/*${VERSION}*
+    && twine upload --verbose -r testpypi dist/*${VERSION}*
 fi

socketdev/fullscans/__init__.py

@@ -395,11 +395,11 @@ class DiffArtifact:
     name: str
     license: str
     scores: SocketScore
-    capabilities: Optional[SecurityCapabilities] = None
     files: str
     version: str
     alerts: List[DiffArtifactAlert]
     licenseDetails: List[LicenseDetail]
+    capabilities: Optional[SecurityCapabilities] = None
     base: Optional[DependencyRef] = None
     head: Optional[DependencyRef] = None
     namespace: Optional[str] = None
@@ -425,11 +425,11 @@ def from_dict(cls, data: dict) -> "DiffArtifact":
             name=data["name"],
             license=data.get("license", ""),
             scores=SocketScore.from_dict(data["score"]),
-            capabilities=SecurityCapabilities.from_dict(data["capabilities"]) if data.get("capabilities") else None,
             files=data["files"],
             version=data["version"],
             alerts=[DiffArtifactAlert.from_dict(alert) for alert in data["alerts"]],
             licenseDetails=[LicenseDetail.from_dict(detail) for detail in data["licenseDetails"]],
+            capabilities=SecurityCapabilities.from_dict(data["capabilities"]) if data.get("capabilities") else None,
             base=DependencyRef.from_dict(data["base"]) if data.get("base") else None,
             head=DependencyRef.from_dict(data["head"]) if data.get("head") else None,
             namespace=data.get("namespace"),

socketdev/version.py

@@ -1 +1 @@
-__version__ = "2.0.2" 
+__version__ = "2.0.4"