From 76f423dabfc8d51a15402a28c9c9e47bad353143 Mon Sep 17 00:00:00 2001
From: spichardo <samuel.pichardo@ucalgary.ca>
Date: Sat, 14 Oct 2023 13:45:50 -0600
Subject: [PATCH] signed pkg working on Intel x64

---
 BabelBrain/create_dmg_Intel64.sh    | 19 +++++++++++
 BabelBrain/create_signed_intel64.sh |  7 ++++
 environment_mac_x64-310.yml         | 50 +++++++++++++++--------------
 3 files changed, 52 insertions(+), 24 deletions(-)
 create mode 100644 BabelBrain/create_dmg_Intel64.sh
 create mode 100644 BabelBrain/create_signed_intel64.sh

diff --git a/BabelBrain/create_dmg_Intel64.sh b/BabelBrain/create_dmg_Intel64.sh
new file mode 100644
index 0000000..0a30128
--- /dev/null
+++ b/BabelBrain/create_dmg_Intel64.sh
@@ -0,0 +1,19 @@
+# Since create-dmg does not clobber, be sure to delete previous DMG
+[[ -f BabelBrain_Intel64.dmg ]] && rm BabelBrain_Intel64.dmg
+rm -rf final
+mkdir final
+mkdir final/ThermalProfiles
+mkdir final/PlanningModels
+cp -r ../ThermalProfiles/* final/ThermalProfiles
+cp -r ../PlanningModels/* final/PlanningModels
+cp -r ../LICENSE final/
+cp BabelBrain_Intel64.pkg final/
+# Create the DMG   --hide-extension "BabelBrain.app" \  --app-drop-link 600 185 \
+create-dmg \
+  --volname "BabelBrain Installer" \
+  --window-pos 200 120 \
+  --window-size 800 400 \
+  --icon-size 100 \
+  --icon "BabelBrain_Intel64.pkg" 200 190 \
+  "BabelBrain_Intel64.dmg" \
+  "final/"
diff --git a/BabelBrain/create_signed_intel64.sh b/BabelBrain/create_signed_intel64.sh
new file mode 100644
index 0000000..bee4ef8
--- /dev/null
+++ b/BabelBrain/create_signed_intel64.sh
@@ -0,0 +1,7 @@
+#script to run all steps to create app, package , dmg , codesign and notarize
+rm -rf dist build 
+pyinstaller BabelBrain.spec
+python pycodesign.py -s -p  -n -t "/Users/spichardo/Library/Mobile Documents/com~apple~CloudDocs/pycodesign/pycodesign_intel64.ini"
+source create_dmg_Intel64.sh
+source "/Users/spichardo/Library/Mobile Documents/com~apple~CloudDocs/pycodesign/notarize_dmg_intel64.sh"
+xcrun stapler staple BabelBrain_Intel64.dmg
diff --git a/environment_mac_x64-310.yml b/environment_mac_x64-310.yml
index a9cfc69..0e771bc 100644
--- a/environment_mac_x64-310.yml
+++ b/environment_mac_x64-310.yml
@@ -4,33 +4,36 @@ channels:
 dependencies:
   - blas=1.0=mkl
   - bzip2=1.0.8=h1de35cc_0
-  - ca-certificates=2022.10.11=hecd8cb5_0
-  - certifi=2022.9.24=py310hecd8cb5_0
+  - ca-certificates=2023.08.22=hecd8cb5_0
+  - certifi=2023.7.22=py310hecd8cb5_0
   - fftw=3.3.9=h9ed2024_1
-  - intel-openmp=2021.4.0=hecd8cb5_3538
+  - intel-openmp=2023.1.0=ha357a0b_43547
   - libcxx=14.0.6=h9765a3e_0
-  - libffi=3.3=hb1e8313_2
+  - libffi=3.4.4=hecd8cb5_0
   - libgfortran=5.0.0=11_3_0_hecd8cb5_28
   - libgfortran5=11.3.0=h9dfd629_28
+  - libllvm14=14.0.6=h91fad77_3
   - llvm-openmp=14.0.6=h0dcd299_0
-  - mkl=2021.4.0=hecd8cb5_637
-  - mkl-service=2.4.0=py310hca72f7f_0
-  - mkl_fft=1.3.1=py310hf879493_0
-  - mkl_random=1.2.2=py310hc081a56_0
-  - ncurses=6.3=hca72f7f_3
-  - numpy=1.23.4=py310h9638375_0
-  - numpy-base=1.23.4=py310ha98c3c9_0
-  - openssl=1.1.1s=hca72f7f_0
-  - pip=22.2.2=py310hecd8cb5_0
-  - python=3.10.8=hdfd78df_0
+  - llvmlite=0.41.0=py310hfff2838_0
+  - mkl=2023.1.0=h8e150cf_43559
+  - mkl-service=2.4.0=py310h6c40b1e_1
+  - mkl_fft=1.3.8=py310h6c40b1e_0
+  - mkl_random=1.2.4=py310ha357a0b_0
+  - ncurses=6.4=hcec6c5f_0
+  - numba=0.58.0=py310h3ea8b11_0
+  - numpy-base=1.24.3=py310ha186be2_1
+  - openssl=3.0.11=hca72f7f_2
+  - pip=23.2.1=py310hecd8cb5_0
+  - python=3.10.13=h5ee71fb_0
   - readline=8.2=hca72f7f_0
-  - scipy=1.9.3=py310h09290a1_0
+  - scipy=1.11.3=py310hdb2ea58_0
   - six=1.16.0=pyhd3eb1b0_1
-  - sqlite=3.40.0=h880c91c_0
+  - sqlite=3.41.2=h6c40b1e_0
+  - tbb=2021.8.0=ha357a0b_0
   - tk=8.6.12=h5d9f67b_0
-  - tzdata=2022f=h04d1e81_0
-  - wheel=0.37.1=pyhd3eb1b0_0
-  - xz=5.2.6=hca72f7f_0
+  - tzdata=2023c=h04d1e81_0
+  - wheel=0.41.2=py310hecd8cb5_0
+  - xz=5.4.2=h6c40b1e_0
   - zlib=1.2.13=h4dc903c_0
   - pip:
     - aiohttp==3.8.3
@@ -39,7 +42,7 @@ dependencies:
     - appdirs==1.4.4
     - async-timeout==4.0.2
     - attrs==22.1.0
-    - babelviscofdtd==1.0.1
+    - babelviscofdtd==1.0.2
     - charset-normalizer==2.1.1
     - chart-studio==1.1.0
     - click==8.1.3
@@ -55,14 +58,13 @@ dependencies:
     - joblib==1.2.0
     - kiwisolver==1.4.4
     - linetimer==0.1.5
-    - llvmlite==0.39.1
     - macholib==1.16.2
     - matplotlib==3.6.2
     - metalcomputebabel @ git+https://github.com/ProteusMRIgHIFU/py-metal-compute.git@75a6adb378a8155c9b6765df8626256f42216224
     - multidict==6.0.2
     - networkx==2.8.8
     - nibabel==4.0.2
-    - numba==0.56.2
+    - numpy==1.25.2
     - numpy-stl==2.17.1
     - packaging==21.3
     - pandas==1.5.0
@@ -73,7 +75,7 @@ dependencies:
     - pooch==1.6.0
     - pydicom==2.3.0
     - pygments==2.13.0
-    - pyinstaller==5.6.2
+    - pyinstaller==6.1.0
     - pyinstaller-hooks-contrib==2022.13
     - pymeshfix==0.16.2
     - pyopencl==2022.2.3
@@ -93,10 +95,10 @@ dependencies:
     - retrying==1.3.3
     - scikit-image==0.19.3
     - scikit-learn==1.1.3
-    - simpleitk==2.2.1
     - scooby==0.7.0
     - setuptools==59.8.0
     - shiboken6==6.4.0.1
+    - simpleitk==2.2.1
     - statsmodels==0.13.5
     - superqt==0.4.0
     - tenacity==8.1.0