Copy signing changes over

Author: BryanFauble

build_electron_app.bat

@@ -81,6 +81,13 @@ pyinstaller ^
     --collect-all=starlette ^
     --collect-all=pydantic ^
     --collect-all=websockets ^
+    --collect-all=pandas ^
+    --collect-all=numpy ^
+    --collect-all=pandarallel ^
+    --collect-all=inflection ^
+    --collect-all=networkx ^
+    --collect-all=dataclasses_json ^
+    --collect-all=rdflib ^
     --paths "..\.." ^
     --paths "..\..\synapseclient" ^
     --console ^

build_electron_app.sh

@@ -82,6 +82,13 @@ build_python_backend() {
         --collect-all=starlette \
         --collect-all=pydantic \
         --collect-all=websockets \
+        --collect-all=pandas \
+        --collect-all=numpy \
+        --collect-all=pandarallel \
+        --collect-all=inflection \
+        --collect-all=networkx \
+        --collect-all=dataclasses_json \
+        --collect-all=rdflib \
         --paths "../.." \
         --paths "../../synapseclient" \
         --console \
@@ -98,8 +105,18 @@ build_python_backend() {
 
         # Check if we're in a CI environment with signing credentials
         if [ -n "$APPLE_TEAM_ID" ]; then
+            # Determine the signing identity to use
+            # If SIGNING_IDENTITY is set (from CI), use it; otherwise use generic string
+            if [ -n "$SIGNING_IDENTITY" ]; then
+                SIGN_ID="$SIGNING_IDENTITY"
+                echo "Using signing identity from environment: $SIGN_ID"
+            else
+                SIGN_ID="Developer ID Application"
+                echo "Using default signing identity: $SIGN_ID"
+            fi
+
             # Sign with hardened runtime and backend-specific entitlements
-            codesign --sign "Developer ID Application" \
+            codesign --sign "$SIGN_ID" \
                 --force \
                 --options runtime \
                 --entitlements ../build/entitlements.backend.plist \
@@ -110,8 +127,11 @@ build_python_backend() {
             codesign --verify --verbose dist/synapse-backend
             if [ $? -eq 0 ]; then
                 echo "Python backend successfully signed"
+                # Display signature details
+                codesign -dv dist/synapse-backend
             else
                 echo "WARNING: Python backend signature verification failed"
+                exit 1
             fi
         else
             echo "Skipping code signing (not in CI environment or credentials not available)"
@@ -139,6 +159,17 @@ build_electron_app() {
             npm run build -- --linux
             ;;
         "macos")
+            # Ensure Apple notarization env vars are available to electron-builder
+            echo "Checking notarization environment variables..."
+            [ -n "$APPLE_ID" ] && echo "✓ APPLE_ID is set" || echo "✗ APPLE_ID is NOT set"
+            [ -n "$APPLE_APP_SPECIFIC_PASSWORD" ] && echo "✓ APPLE_APP_SPECIFIC_PASSWORD is set" || echo "✗ APPLE_APP_SPECIFIC_PASSWORD is NOT set"
+            [ -n "$APPLE_TEAM_ID" ] && echo "✓ APPLE_TEAM_ID is set" || echo "✗ APPLE_TEAM_ID is NOT set"
+
+            # Export environment variables so they're available to npm and electron-builder
+            export APPLE_ID
+            export APPLE_APP_SPECIFIC_PASSWORD
+            export APPLE_TEAM_ID
+
             npm run build -- --mac
             ;;
         "windows")

setup.cfg

@@ -1,4 +1,3 @@
-
 [metadata]
 name = synapseclient
 description = A client for Synapse, a collaborative, open-source research platform that allows teams to share data, track analyses, and collaborate.
@@ -63,12 +62,12 @@ install_requires =
     httpcore>=1.0.9
     tqdm>=4.66.2,<5.0
     async-lru~=2.0.4
-    psutil~=5.9.8
+    psutil>=5.9.8
 tests_require =
     pytest~=8.2.0
     pytest-mock>=3.0,<4.0
     pytest-socket~=0.6.0
-    pytest-asyncio>=0.25.0,<1.0
+    pytest-asyncio>=1.2.0,<2.0
     flake8>=3.7.0,<4.0
     pytest-xdist[psutil]>=2.2,<3.0.0
     pytest-rerunfailures~=12.0
@@ -81,7 +80,7 @@ dev =
     pytest~=8.2.0
     pytest-mock>=3.0,<4.0
     pytest-socket~=0.6.0
-    pytest-asyncio>=0.25.0,<1.0
+    pytest-asyncio>=1.2.0,<2.0
     flake8>=3.7.0,<4.0
     pytest-xdist[psutil]>=2.2,<3.0.0
     pytest-rerunfailures~=12.0
@@ -95,7 +94,7 @@ tests =
     pytest~=8.2.0
     pytest-mock>=3.0,<4.0
     pytest-socket~=0.6.0
-    pytest-asyncio>=0.25.0,<1.0
+    pytest-asyncio>=1.2.0,<2.0
     flake8>=3.7.0,<4.0
     pytest-xdist[psutil]>=2.2,<3.0.0
     pytest-rerunfailures~=12.0
@@ -106,6 +105,14 @@ tests =
 pandas =
     pandas>=1.5,<3.0
 
+curator =
+    %(pandas)s
+    pandarallel>=1.6.4
+    inflection>=0.5.1
+    networkx>=2.2.8
+    dataclasses-json>=0.6.1
+    rdflib>=6.0.0
+
 pysftp =
     pysftp>=0.2.8,<0.3
     paramiko<4.0.0
@@ -132,6 +139,7 @@ electron =
     python-multipart>=0.0.6
     uvicorn>=0.24.0
     websockets>=12.0
+    %(curator)s
 
 [options.entry_points]
 console_scripts =

synapse-electron/package.json

@@ -64,10 +64,7 @@
       "hardenedRuntime": true,
       "gatekeeperAssess": false,
       "entitlements": "build/entitlements.mac.plist",
-      "entitlementsInherit": "build/entitlements.mac.plist",
-      "notarize": {
-        "teamId": "${APPLE_TEAM_ID}"
-      }
+      "entitlementsInherit": "build/entitlements.mac.plist"
     },
     "linux": {
       "target": [
@@ -92,7 +89,7 @@
     "cross-env": "^10.0.0",
     "dotenv": "^16.0.3",
     "electron": "^27.0.0",
-    "electron-builder": "^24.6.4",
+    "electron-builder": "^25.1.8",
     "@electron/notarize": "^2.1.0"
   },
   "dependencies": {