Update Github Actions configs

rushter · Oct 9, 2024 · f794790 · f794790
1 parent 72ecbbe
commit f794790
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml
@@ -12,14 +12,14 @@ jobs:
     timeout-minutes: 1000
     env:
       CIBW_SKIP: "cp27-* cp34-* cp35-* cp36-* pp27-* cp36-musllinux_aarch64 cp36-*_aarch64 cp37-*_aarch64 cp38-*_aarch64 pp3*"
-      CIBW_BEFORE_BUILD: "pip install Cython==3.0.11"
+      CIBW_BEFORE_BUILD: "pip install Cython==3.0.11 setuptools wheel"
     strategy:
       matrix:
         os: [ubuntu-24.04, windows-latest, macos-latest]
         arch: [auto]
         include:
-        - os: ubuntu-24.04
-          arch: aarch64
+          - os: ubuntu-24.04
+            arch: aarch64
 
     steps:
       - uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
 
       - name: Install cibuildwheel
         run: |
-          python -m pip install cibuildwheel==2.21.2 Cython==3.0.11
+          python -m pip install cibuildwheel==2.21.3 Cython==3.0.11 setuptools wheel
 
       - name: Build wheels
         env:
@@ -45,7 +45,7 @@ jobs:
         run: |
           python -m cibuildwheel --output-dir wheelhouse
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
           retention-days: 1
@@ -55,8 +55,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 40
     env:
-      CIBW_SKIP: "cp27-* cp34-* pp27-* cp35-* cp36-* cp37-*"
-      CIBW_BEFORE_BUILD: "pip install Cython==3.0.11"
+      CIBW_SKIP: "cp27-* cp34-* pp27-*"
+      CIBW_BEFORE_BUILD: "pip install Cython==3.0.11 setuptools wheel"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -68,11 +68,11 @@ jobs:
 
       - name: Build sdist
         run: |
-          pip install Cython==3.0.11 setuptools wheel
+          pip install Cython==3.0.11 setuptools wheel setuptools
           python setup.py build_ext --inplace --cython
           python setup.py sdist
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           path: dist/*.tar.gz
           retention-days: 1
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v4.1.7
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist

diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
@@ -20,7 +20,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip setuptools
         pip install -r requirements_dev.txt
         USE_LEXBOR=1 python setup.py build_ext --inplace --cython
     - name: Test with pytest
@@ -43,7 +43,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip setuptools
           pip install -r requirements_dev.txt
           python3 -m pip install types-pyinstaller
           USE_LEXBOR=1 python setup.py build_ext --inplace --cython