Merge pull request #20297 from mrclary/issue-20291

PR: Fix installer issues and bug when getting environment variables

Author: ccordoba12

.github/workflows/installer-macos.yml

@@ -66,6 +66,13 @@ jobs:
         with:
           python-version: '3.9.14'
           architecture: 'x64'
+      - name: Install pcregrep
+        run: |
+          if [[ -z "$(which pcregrep)" ]]; then
+              brew install pcre
+          else
+              echo "$(which pcregrep) already installed."
+          fi
       - name: Install Dependencies
         run: |
           INSTALL_FLAGS=()
@@ -94,7 +101,7 @@ jobs:
       - name: Code Sign Application
         if: ${{github.event_name == 'release'}}
         run: |
-          pil=$(${pythonLocation} -c "import PIL, os; print(os.path.dirname(PIL.__file__))")
+          pil=$(${pythonLocation}/bin/python -c "import PIL, os; print(os.path.dirname(PIL.__file__))")
           rm -v ${DISTDIR}/Spyder.app/Contents/Frameworks/liblzma.5.dylib
           cp -v ${pil}/.dylibs/liblzma.5.dylib ${DISTDIR}/Spyder.app/Contents/Frameworks/
           ./codesign.sh "${DISTDIR}/Spyder.app"

.github/workflows/installers-conda.yml

@@ -97,7 +97,7 @@ jobs:
     needs:
       - build-matrix
       - build-noarch-pkgs
-    if: contains(fromJson('["success", "skipped"]'), needs.build-noarch-pkgs.result) && needs.build-matrix.result == 'success'
+    if: ${{ ! failure() && ! cancelled() }}
     strategy:
       matrix:
         target-platform: ${{fromJson(needs.build-matrix.outputs.target_platform)}}
@@ -115,12 +115,23 @@ jobs:
       APPLICATION_PWD: ${{ secrets.APPLICATION_PWD }}
       CONSTRUCTOR_TARGET_PLATFORM: ${{ matrix.target-platform }}
       STATUS: ${{ needs.build-noarch-pkgs.result }}
+      MAT_STATUS: ${{ needs.build-matrix.result }}
+
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
+      - name: Install pcregrep
+        if: runner.os == 'macOS'
+        run: |
+          if [[ -z "$(which pcregrep)" ]]; then
+              brew install pcre
+          else
+              echo "$(which pcregrep) already installed."
+          fi
+
       - name: Setup Build Environment
         uses: mamba-org/provision-with-micromamba@main
         with:

spyder/utils/environ.py

@@ -60,8 +60,11 @@ def get_user_environment_variables():
     res = stdout.decode().strip().split(os.linesep)
     env_var = {}
     for kv in res:
-        k, v = kv.split('=', 1)
-        env_var[k] = v
+        try:
+            k, v = kv.split('=', 1)
+            env_var[k] = v
+        except Exception:
+            pass
 
     return env_var