python 3.7 end of life

cnr-isti-vclab · Nov 15, 2023 · feac829 · feac829
1 parent 66dd0b5
commit feac829
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-20.04', 'macos-latest', 'windows-latest']
     steps:
     - uses: actions/checkout@v3
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-20.04', 'macos-latest', 'windows-latest']
     steps:
     - uses: actions/checkout@v3
@@ -100,7 +100,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     steps:
     - name: Download PyMeshLab_${{ runner.os }}_python${{ matrix.pyversion }}
@@ -135,7 +135,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     steps:
     - name: Download pymeshlab_whl_${{ runner.os }}_python${{ matrix.pyversion }}

diff --git a/.github/workflows/CreateAndTestRelease.yml b/.github/workflows/CreateAndTestRelease.yml
@@ -32,7 +32,7 @@ jobs:
     needs: update_version
     strategy:
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-20.04', 'macos-latest', 'windows-latest']
     steps:
     - uses: actions/checkout@v3
@@ -86,7 +86,7 @@ jobs:
     needs: build_pymeshlab
     strategy:
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-20.04', 'macos-latest', 'windows-latest']
     steps:
     - uses: actions/checkout@v3
@@ -118,7 +118,7 @@ jobs:
     needs: build_pymeshlab
     strategy:
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     steps:
     - name: Download PyMeshLab_${{ runner.os }}_python${{ matrix.pyversion }}
@@ -152,7 +152,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        pyversion: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        pyversion: ['3.8', '3.9', '3.10', '3.11']
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
     steps:
     - name: Download pymeshlab_whl_${{ runner.os }}_python${{ matrix.pyversion }}

diff --git a/scripts/macOS/2_deploy.sh b/scripts/macOS/2_deploy.sh
@@ -32,11 +32,17 @@ do
     ARGUMENTS="${ARGUMENTS} -executable=${plugin}"
 done
 
-${QT_DIR}macdeployqt $INSTALL_PATH/dummybin.app \
+if ${QT_DIR}macdeployqt $INSTALL_PATH/dummybin.app \
     -executable=$MODULE_NAME \
-    $ARGUMENTS
+    $ARGUMENTS; \
+then
+    rsync -a $INSTALL_PATH/dummybin.app/Contents/Frameworks/ $INSTALL_PATH/Frameworks/
+    rsync -a $INSTALL_PATH/dummybin.app/Contents/PlugIns/ $INSTALL_PATH/PlugIns/
+    mv $INSTALL_PATH/dummybin.app/Contents/pmeshlab* $INSTALL_PATH/
+    rm -rf $INSTALL_PATH/dummybin.app
+else
+    echo "macdeployqt failed with error code $?. Script was not completed successfully."
+    exit 1
+fi
+
 
-rsync -a $INSTALL_PATH/dummybin.app/Contents/Frameworks/ $INSTALL_PATH/Frameworks/
-rsync -a $INSTALL_PATH/dummybin.app/Contents/PlugIns/ $INSTALL_PATH/PlugIns/
-mv $INSTALL_PATH/dummybin.app/Contents/pmeshlab* $INSTALL_PATH/
-rm -rf $INSTALL_PATH/dummybin.app