use only gdal for arm64

gem · Oct 8, 2024 · 1d11cf0 · 1d11cf0
1 parent d6e88f1
commit 1d11cf0
Showing 1 changed file with 100 additions and 100 deletions.
diff --git a/.github/workflows/macos_arm64.yaml b/.github/workflows/macos_arm64.yaml
@@ -12,105 +12,105 @@ on:
 env:
   WHEEL_SDIR: wheelhouse
 jobs:
-  build_pyproj:
-    name: pyproj ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["self-hosted"]
-        python: ["3.10", "3.11", "3.12"]
-        platform: ["arm64"]
-        macos-target: ["13"]
-        os-name: ["osx"]
-    env:
-      REPO_DIR: pyproj
-      BUILD_COMMIT: 3.6.1
-      PLAT: "${{ matrix.platform }}"
-      MB_PYTHON_VERSION: "${{ matrix.python }}"
-      MB_ML_VER: "2014"
-      BUILD_DEPENDS: "cython wheel"
-      TEST_DEPENDS: "cython"
-      TRAVIS_OS_NAME: ${{ matrix.os-name }}
-      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup cmake
-        run: |
-          #brew install cmake
-          export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"
-          echo $PATH
-          brew install cmake
-          echo "check python3"
-          python3 -c "import sys; print(sys.version)"
-      - name: Get code of pyproj
-        env:
-          REPO_DIR: pyproj
-          WHEEL_SDIR: wheelhouse
-          BUILD_COMMIT: 3.6.1
-        run: |
-          bash -x .github/workflows/build.sh
-      - name: Build Wheel of pyproj
-        env:
-          REPO_DIR: pyproj
-          WHEEL_SDIR: wheelhouse
-          BUILD_COMMIT: 3.6.1
-        run: |
-          bash -x .github/workflows/wheel.sh
-      - uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: wheelhouse
-
-  build_Fiona:
-    name: Fiona ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["self-hosted"]
-        python: ["3.10", "3.11", "3.12"]
-        platform: ["arm64"]
-        macos-target: ["13"]
-        os-name: ["osx"]
-    env:
-      REPO_DIR: Fiona
-      BUILD_COMMIT: 1.9.5
-      GDAL_FIONA: 3.7.3
-      PLAT: "${{ matrix.platform }}"
-      MB_PYTHON_VERSION: "${{ matrix.python }}"
-      MB_ML_VER: "2014"
-      BUILD_DEPENDS: "oldest-supported-numpy cython wheel numpy==1.26.2"
-      TEST_DEPENDS: "oldest-supported-numpy attrs pytest click mock boto3 packaging hypothesis wheel pytz"
-      TRAVIS_OS_NAME: ${{ matrix.os-name }}
-      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup cmake
-        run: |
-          #brew install cmake
-          #echo "check python3"
-          #python3 -c "import sys; print(sys.version)"
-          export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"
-          echo $PATH
-          brew install cmake
-          echo "check python3"
-          python3 -c "import sys; print(sys.version)"
-      - name: Get code of Fiona
-        run: |
-          bash -x .github/workflows/build.sh
-      - name: Build Wheel of Fiona
-        env:
-          BUILD_DEPENDS: "oldest-supported-numpy cython wheel numpy==1.26.2"
-          TEST_DEPENDS: "oldest-supported-numpy attrs pytest click mock boto3 packaging hypothesis wheel pytz"
-        run: |
-          bash -x .github/workflows/wheel.sh
-      - uses: actions/upload-artifact@v3
-        with:
-          name: wheels
-          path: wheelhouse
+  #  build_pyproj:
+  #    name: pyproj ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
+  #    runs-on: ${{ matrix.os }}
+  #    strategy:
+  #      fail-fast: false
+  #      matrix:
+  #        os: ["self-hosted"]
+  #        python: ["3.10", "3.11", "3.12"]
+  #        platform: ["arm64"]
+  #        macos-target: ["13"]
+  #        os-name: ["osx"]
+  #    env:
+  #      REPO_DIR: pyproj
+  #      BUILD_COMMIT: 3.6.1
+  #      PLAT: "${{ matrix.platform }}"
+  #      MB_PYTHON_VERSION: "${{ matrix.python }}"
+  #      MB_ML_VER: "2014"
+  #      BUILD_DEPENDS: "cython wheel"
+  #      TEST_DEPENDS: "cython"
+  #      TRAVIS_OS_NAME: ${{ matrix.os-name }}
+  #      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
+  #    steps:
+  #      - uses: actions/checkout@v4
+  #      - name: Setup cmake
+  #        run: |
+  #          #brew install cmake
+  #          export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"
+  #          echo $PATH
+  #          brew install cmake
+  #          echo "check python3"
+  #          python3 -c "import sys; print(sys.version)"
+  #      - name: Get code of pyproj
+  #        env:
+  #          REPO_DIR: pyproj
+  #          WHEEL_SDIR: wheelhouse
+  #          BUILD_COMMIT: 3.6.1
+  #        run: |
+  #          bash -x .github/workflows/build.sh
+  #      - name: Build Wheel of pyproj
+  #        env:
+  #          REPO_DIR: pyproj
+  #          WHEEL_SDIR: wheelhouse
+  #          BUILD_COMMIT: 3.6.1
+  #        run: |
+  #          bash -x .github/workflows/wheel.sh
+  #      - uses: actions/upload-artifact@v3
+  #        with:
+  #          name: wheels
+  #          path: wheelhouse
+  #
+  #  build_Fiona:
+  #    name: Fiona ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
+  #    runs-on: ${{ matrix.os }}
+  #    strategy:
+  #      fail-fast: false
+  #      matrix:
+  #        os: ["self-hosted"]
+  #        python: ["3.10", "3.11", "3.12"]
+  #        platform: ["arm64"]
+  #        macos-target: ["13"]
+  #        os-name: ["osx"]
+  #    env:
+  #      REPO_DIR: Fiona
+  #      BUILD_COMMIT: 1.9.5
+  #      GDAL_FIONA: 3.7.3
+  #      PLAT: "${{ matrix.platform }}"
+  #      MB_PYTHON_VERSION: "${{ matrix.python }}"
+  #      MB_ML_VER: "2014"
+  #      BUILD_DEPENDS: "oldest-supported-numpy cython wheel numpy==1.26.2"
+  #      TEST_DEPENDS: "oldest-supported-numpy attrs pytest click mock boto3 packaging hypothesis wheel pytz"
+  #      TRAVIS_OS_NAME: ${{ matrix.os-name }}
+  #      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
+  #    steps:
+  #      - uses: actions/checkout@v4
+  #        with:
+  #          submodules: true
+  #      - name: Setup cmake
+  #        run: |
+  #          #brew install cmake
+  #          #echo "check python3"
+  #          #python3 -c "import sys; print(sys.version)"
+  #          export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH"
+  #          echo $PATH
+  #          brew install cmake
+  #          echo "check python3"
+  #          python3 -c "import sys; print(sys.version)"
+  #      - name: Get code of Fiona
+  #        run: |
+  #          bash -x .github/workflows/build.sh
+  #      - name: Build Wheel of Fiona
+  #        env:
+  #          BUILD_DEPENDS: "oldest-supported-numpy cython wheel numpy==1.26.2"
+  #          TEST_DEPENDS: "oldest-supported-numpy attrs pytest click mock boto3 packaging hypothesis wheel pytz"
+  #        run: |
+  #          bash -x .github/workflows/wheel.sh
+  #      - uses: actions/upload-artifact@v3
+  #        with:
+  #          name: wheels
+  #          path: wheelhouse
 
   build_GDAL:
     name: GDAL ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
@@ -164,7 +164,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-13"]
+        os: ["self-hosted"]
         python: ["3.12"]
         platform: ["arm64"]
     env: