using the right wheels #3

Author: behrisch

.github/workflows/cibuildwheel.yml

@@ -152,11 +152,6 @@ jobs:
       with:
         python-version: ${{ matrix.python_version }}
 
-    - name: Installing dependencies
-      if: matrix.os == 'macos-14' || matrix.os == 'macos-15'
-      # we just need proj.db
-      run: brew update && brew install proj
-
     - name: Preparing Python environment
       shell: bash
       run: |
@@ -165,11 +160,37 @@ jobs:
         python -m pip install --upgrade pip
         python -m pip install wheel  # need to do this separately because the texttest install wants it
         python -m pip install texttest
+
+    - name: Installing dependencies (linux / windows)
+      if: ${{ !startsWith(matrix.os, 'macos') }}
+      # we just need proj.db
+      run: |
+        source testenv/bin/activate
         python -m pip install pyproj
         python -c "import pyproj; print('PROJ_LIB=' + pyproj.datadir.get_data_dir())" >> $GITHUB_ENV
+
+    - name: Installing dependencies (macos)
+      if: ${{ startsWith(matrix.os, 'macos') }}
+      # we just need proj.db, the pyproj hack does not seem to work on mac
+      run: brew update && brew install proj
+
+    - name: Installing sumo wheels (macos / windows)
+      if: ${{ !startsWith(matrix.os, 'ubuntu') }}
+      shell: bash
+      run: |
+        source testenv/bin/activate
         python -m pip install --no-index -f python-wheels eclipse_sumo
         python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
 
+    - name: Installing sumo wheels (linux)
+      if: ${{ startsWith(matrix.os, 'ubuntu') }}
+      shell: bash
+      run: |
+        ls python-wheels
+        WHEEL=$(ls python-wheels/eclipse_sumo*${{ matrix.manylinux }}*$(uname -m).whl)
+        echo wheel=$WHEEL
+        python -m pip install $WHEEL
+
     - name: Running "sumo in the wheel" tests without full dependencies
       shell: bash
       run: |
@@ -184,18 +205,17 @@ jobs:
         tests/runTests.sh -b ci -v ci.fast -a complex,sumo,tools,traci
         rm -rf testenv
 
-    - name: Installing libsumo wheels (mac / windows)
-      if: ! startsWith(matrix.os, 'ubuntu')
+    - name: Installing libsumo wheels (macos / windows)
+      if: ${{ !startsWith(matrix.os, 'ubuntu') }}
       shell: bash
       run: python -m pip install --no-index -f python-wheels libsumo
 
     - name: Installing libsumo wheels (linux)
-      if: startsWith(matrix.os, 'ubuntu')
+      if: ${{ startsWith(matrix.os, 'ubuntu') }}
       shell: bash
       run: |
-        ls python-wheels
         PYTAG="${{ matrix.python_version }}"
-        WHEEL=$(ls python-wheels/libsumo*cp${PYTAG/.}-*${{ matrix.manylinux }}*.whl)
+        WHEEL=$(ls python-wheels/libsumo*cp${PYTAG/.}-*${{ matrix.manylinux }}*$(uname -m).whl)
         echo wheel=$WHEEL
         python -m pip install $WHEEL