Fix yaml

MacPython · Sep 23, 2024 · 713c558 · 713c558
1 parent 170277d
commit 713c558
Showing 1 changed file with 0 additions and 22 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -16,11 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        python: [cp39, cp310, cp311, cp312]
-=======
         python: [cp39, cp310, cp311, cp312, cp313]
->>>>>>> b9e8844 (BLD: Build for Python 3.13)
         os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         python_impl: [Python]
         include:
@@ -40,10 +36,7 @@ jobs:
       CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x} *pyodide*"
       CIBW_REPAIR_WHEEL_COMMAND_LINUX: 'auditwheel repair --strip -w {dest_dir} {wheel}'
       CIBW_BUILD_VERBOSITY: 1
-<<<<<<< HEAD
-=======
       CIBW_PRERELEASE_PYTHONS: True
->>>>>>> b9e8844 (BLD: Build for Python 3.13)
       MULTIBUILD_WHEELS_STAGING_ACCESS: ${{ secrets.MULTIBUILD_WHEELS_STAGING_ACCESS }}
       SCIENTIFIC_PYTHON_NIGHTLY_WHEELS: ${{ secrets.SCIENTIFIC_PYTHON_NIGHTLY_WHEELS }}
       MKL_NUM_THREADS: 1
@@ -64,38 +57,23 @@ jobs:
 
       - name: Build wheels (Default)
         uses: pypa/cibuildwheel@v2.20
-<<<<<<< HEAD
         if: (matrix.python_impl != 'Pyodide') && (matrix.os != 'macos-13')
-=======
-        if: (matrix.python_impl != 'Pyodide') && (matrix.os != 'macos-latest')
->>>>>>> b9e8844 (BLD: Build for Python 3.13)
         with:
           output-dir: wheelhouse
           package-dir: statsmodels
         env:
           CIBW_BEFORE_BUILD: 'git submodule foreach git checkout  ${{ env.BUILD_COMMIT }}'
-<<<<<<< HEAD
           CIBW_ARCHS_MACOS: "arm64"
 
       - name: Build wheels (MacOS x86_64)
         if: matrix.os == 'macos-13'
-=======
-          CIBW_ARCHS_OSX: "x86_64"
-
-      - name: Build wheels (MacOS arm64)
-        if: matrix.os == 'macos-latest'
->>>>>>> b9e8844 (BLD: Build for Python 3.13)
         uses: pypa/cibuildwheel@v2.20
         with:
           output-dir: wheelhouse
           package-dir: statsmodels
         env:
           CIBW_BEFORE_BUILD: 'git submodule foreach git checkout  ${{ env.BUILD_COMMIT }}'
-<<<<<<< HEAD
           CIBW_ARCHS_OSX: "x86_64"
-=======
-          CIBW_ARCHS_OSX: "arm64"          
->>>>>>> b9e8844 (BLD: Build for Python 3.13)
 
       - name: Build Pyodide wheel
         if: matrix.python_impl == 'Pyodide'