Skip to content

Commit a368c0f

Browse files
committed
Use faulthandler package.
2 parents dc9c9f7 + 3dbab3f commit a368c0f

22 files changed

Lines changed: 777 additions & 381 deletions

.github/workflows/create-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
create_release:
1010
if: github.repository == 'MusculoskeletalAtlasProject/mapclient'
1111
name: create_release
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Determine release properties
1515
shell: bash

.github/workflows/on-demand-deployment.yaml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
matrixElements=()
5757
variants=${{ steps.set-variants.outputs.variants }}
5858
for v in $variants; do
59-
matrixElements+=('{"os":"windows-2019","variant":"'$v'","tag":"${{ steps.get-tag.outputs.tag }}","release-name":"${{ steps.get-release-name.outputs.name }}","python-version":"3.9"}')
59+
matrixElements+=('{"os":"windows-2025","variant":"'$v'","tag":"${{ steps.get-tag.outputs.tag }}","release-name":"${{ steps.get-release-name.outputs.name }}","python-version":"3.9"}')
6060
matrixElements+=('{"os":"macos-13","variant":"'$v'","tag":"${{ steps.get-tag.outputs.tag }}","release-name":"${{ steps.get-release-name.outputs.name }}","python-version":"3.10"}')
6161
done
6262
if [ "${#matrixElements[@]}" -eq "0" ]; then
@@ -140,10 +140,26 @@ jobs:
140140
run: |
141141
echo -n $EV_CERTIFICATE_PFX_BASE64 | base64 -d - > ./ev_certificate.pfx
142142
#dotnet tool install --global AzureSignTool
143+
- name: Find signtool
144+
if: runner.os == 'Windows'
145+
shell: cmd
146+
run: |
147+
rem Leaving this here for finding signtool.exe when the runner upgrades.
148+
echo "Finding signtool"
149+
dir /s /b "C:\Program Files (x86)\Windows Kits\10\bin\signtool.exe"
143150
- name: Set up Python
144151
uses: actions/setup-python@v5
145152
with:
146153
python-version: ${{ matrix.python-version }}
154+
- name: Install NSIS
155+
if: runner.os == 'Windows'
156+
uses: repolevedavaj/install-nsis@v1.0.3
157+
with:
158+
nsis-version: '3.11'
159+
- name: Verify NSIS Installation
160+
if: runner.os == 'Windows'
161+
run: |
162+
& "C:\\Program Files (x86)\\NSIS\\makensis.exe" -VERSION
147163
- name: Checkout codebase
148164
uses: actions/checkout@v4
149165
with:
@@ -223,6 +239,7 @@ jobs:
223239
asset=${asset//\\//}
224240
fi
225241
242+
echo "Asset created: $asset"
226243
echo "file=$asset" >> $GITHUB_OUTPUT
227244
cat $GITHUB_OUTPUT
228245
@@ -231,7 +248,7 @@ jobs:
231248
shell: cmd
232249
run: |
233250
rem AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.acs.microsoft.com -v ${{ steps.create-application.outputs.file }}
234-
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool" sign /d "MAP Client - mapping tools" /tr http://rfc3161timestamp.globalsign.com/advanced /fd SHA256 /td SHA256 /f ev_certificate.pfx ${{ steps.create-application.outputs.file }}
251+
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\signtool" sign /d "MAP Client - mapping tools" /tr http://rfc3161timestamp.globalsign.com/advanced /fd SHA256 /td SHA256 /f ev_certificate.pfx ${{ steps.create-application.outputs.file }}
235252
236253
- name: Codesign application (macOS)
237254
if: runner.os == 'macOS'
@@ -272,7 +289,7 @@ jobs:
272289
if: runner.os == 'Windows'
273290
shell: cmd
274291
run: |
275-
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool" sign /d "MAP Client - mapping tools" /tr http://rfc3161timestamp.globalsign.com/advanced /fd SHA256 /td SHA256 /f ev_certificate.pfx ${{ steps.create-installer.outputs.file }}
292+
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\signtool" sign /d "MAP Client - mapping tools" /tr http://rfc3161timestamp.globalsign.com/advanced /fd SHA256 /td SHA256 /f ev_certificate.pfx ${{ steps.create-installer.outputs.file }}
276293
rem AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.acs.microsoft.com -v ${{ steps.create-installer.outputs.file }}
277294
278295
- name: Notarize and Staple installer (macOS)

docs/getting_started/install-mapclient.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Install MAP Client
33
==================
44

5-
The MAP Client software is a Python application that uses the PySide2 Qt library bindings.
5+
The MAP Client software is a Python application that uses the PySide6 Qt library bindings.
66

77
There are three main ways of getting the MAP Client installed on your operating system.
88

@@ -14,6 +14,13 @@ The MAP Client relies heavily on plugins to do anything interesting.
1414
If you `Install Using Pre-Built Binary`_ you get everything you need, however you can only use plugins that have all the dependencies already available to the binary. At this time you cannot add dependencies that a new plugin may or may not require to work.
1515
If you `Install Using Pip`_ or `Install Using Git`_, you can either create these yourself or add already available ones to your application by downloading them and using the Plugin Manager Tool in the MAP Client, read the documents :ref:`MAP-feature-demonstration` and :ref:`MAP-plugin-wizard` to learn more.
1616

17+
MAP Client uses OpenGL to render 3D scenes, so OpenGL support must be available on your system for the application to run correctly.
18+
On Windows and macOS, OpenGL is typically pre-installed.
19+
On GNU/Linux systems, you may need to install the necessary OpenGL libraries manually.
20+
For Ubuntu 22.04, you can install the required packages using the following command::
21+
22+
sudo apt install libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev
23+
1724
------------
1825
Installation
1926
------------

0 commit comments

Comments
 (0)