Merge branch 'main' of https://github.com/pypa/manylinux into dev3

Author: jackalcooper

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      actions:
+        patterns:
+          - "*"

.github/workflows/build.yml

@@ -14,12 +14,14 @@ on:
     paths:
       - ".github/workflows/build.yml"
       - "docker/**"
+      - "tests/**"
       - "*.sh"
   pull_request:
     paths:
       - ".github/workflows/build.yml"
       - "docker/**"
-      - "build.sh"
+      - "tests/**"
+      - "*.sh"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -29,10 +31,12 @@ jobs:
   build_manylinux:
     name: ${{ matrix.policy }}_${{ matrix.platform }}
     runs-on: ubuntu-22.04
+    permissions:
+      actions: write # this permission is needed to delete cache
     strategy:
       fail-fast: false
       matrix:
-        policy: ["manylinux2014", "musllinux_1_1", "musllinux_1_2"]
+        policy: ["manylinux2014", "musllinux_1_2"]
         platform: ["i686", "x86_64"]
         include:
           - policy: "manylinux_2_28"
@@ -46,6 +50,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
 
       - name: Set up emulation
         if: matrix.platform != 'i686' && matrix.platform != 'x86_64'
@@ -56,17 +62,31 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Setup cache
+      - name: Restore cache
         if: github.event_name != 'workflow_dispatch' || fromJSON(github.event.inputs.useCache)
-        uses: actions/cache@v3
+        uses: actions/cache/restore@v4
         with:
           path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
-          key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}-${{ hashFiles('docker/**') }}
-          restore-keys: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}-
+          key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}
 
       - name: Build
         run: ./build.sh
 
+      - name: Delete cache
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: |
+          KEY="buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}"
+          gh cache delete ${KEY} || true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Save cache
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        uses: actions/cache/save@v4
+        with:
+          path: .buildx-cache-${{ matrix.policy }}_${{ matrix.platform }}/*
+          key: buildx-cache-${{ matrix.policy }}-${{ matrix.platform }}
+
       - name: Deploy
         if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'pypa/manylinux'
         run: ./deploy.sh

.github/workflows/update-dependencies.yml

@@ -6,42 +6,45 @@ on:
       - '.github/workflows/update-dependencies.yml'
   workflow_dispatch:
   schedule:
-    - cron: '0 18 * * 0'  # "At 18:00 on Sunday."
+    - cron: '0 18 * * 5'  # "At 18:00 on Friday."
+
+env:
+  FORCE_COLOR: '1'
 
 jobs:
   update-dependencies:
     name: Update dependencies
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: wntrblm/nox@2022.11.21
+    - uses: wntrblm/nox@2024.10.09
       with:
-        python-versions: "3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12-dev"
-    - name: "Allow nox to run with python 3.6"
-      run: pipx runpip nox install 'virtualenv<20.22.0'
+        python-versions: "3.12"
+    - name: "Install uv"
+      run: pipx install uv
     - name: "Setup bot user"
       run: |
         git config --global user.name "manylinux-bot[bot]"
         git config --global user.email "89297709+manylinux-bot[bot]@users.noreply.github.com"
     # we use this step to grab a Github App auth token, so that lastversion can query GitHub API
     # without rate-limit and PRs get run by GHA.
-    - uses: tibdex/github-app-token@v2
+    - uses: actions/create-github-app-token@v1
       id: generate-token
       if: github.ref == 'refs/heads/main' && github.repository == 'pypa/manylinux'
       with:
         app_id: ${{ secrets.MANYLINUX_BOT_APP_ID }}
         private_key: ${{ secrets.MANYLINUX_BOT_APP_PRIVATE_KEY }}
     - name: "Run update native dependencies"
-      run: nox --force-color --error-on-missing-interpreters -s update_native_dependencies
+      run: nox -s update_native_dependencies
       env:
         GITHUB_API_TOKEN: ${{ steps.generate-token.outputs.token || github.token }}
     - name: "Run update downloaded interpreters"
-      run: nox --force-color --error-on-missing-interpreters -s update_interpreters_download
+      run: nox -s update_interpreters_download
     - name: "Run update python dependencies"
-      run: nox --force-color --error-on-missing-interpreters -s update_python_dependencies update_python_tools
+      run: nox -s update_python_dependencies
     - name: Create Pull Request
       if: github.ref == 'refs/heads/main' && github.repository == 'pypa/manylinux'
-      uses: peter-evans/create-pull-request@v5
+      uses: peter-evans/create-pull-request@v7
       with:
         commit-message: Update python dependencies
         title: '[Bot] Update dependencies'
@@ -50,7 +53,6 @@ jobs:
 
           PR generated by "Update dependencies" [workflow](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}).
         branch: update-dependencies-pr
-        committer: "manylinux-bot[bot] <89297709+manylinux-bot[bot]@users.noreply.github.com>"
-        author: "manylinux-bot[bot] <89297709+manylinux-bot[bot]@users.noreply.github.com>"
+        sign-commits: true
         token: ${{ steps.generate-token.outputs.token }}
         delete-branch: true

.travis.yml

@@ -1,6 +1,13 @@
 language: c
 os: linux
 dist: focal
+addons:
+  apt:
+    sources:
+      - sourceline: 'deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable'
+        key_url: 'https://download.docker.com/linux/ubuntu/gpg'
+    packages:
+    - docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 services:
   - docker
 
@@ -41,15 +48,11 @@ jobs:
     - arch: arm64-graviton2
       virt: vm
       group: edge
-      env: POLICY="musllinux_1_1" PLATFORM="aarch64"
-    - arch: s390x
-      env: POLICY="musllinux_1_1" PLATFORM="s390x"
-    - arch: ppc64le
-      env: POLICY="musllinux_1_1" PLATFORM="ppc64le"
+      env: POLICY="musllinux_1_2" PLATFORM="aarch64"
     - arch: arm64-graviton2
       virt: vm
       group: edge
-      env: POLICY="musllinux_1_2" PLATFORM="aarch64"
+      env: POLICY="musllinux_1_2" PLATFORM="armv7l"
     - arch: s390x
       env: POLICY="musllinux_1_2" PLATFORM="s390x"
     - arch: ppc64le
@@ -59,11 +62,10 @@ before_install:
   - if [ -d "${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM}" ]; then cp -rlf ${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM} ./; fi
 
 install:
-  - uptime
-  - nproc
-  - free
-  - cat /proc/cpuinfo
-  - ./travisci-install-buildx.sh
+  - docker version
+  - docker buildx version
+  - docker buildx create --name builder-manylinux --driver docker-container --use
+  - docker buildx inspect --bootstrap --builder builder-manylinux 2>&1 | tee /dev/null
 
 script: |
   BUILD_STATUS=success
@@ -84,11 +86,8 @@ script: |
 
 deploy:
   provider: script
+  dpl_version: 1.10.16
   script: COMMIT_SHA=${TRAVIS_COMMIT} ./deploy.sh
   on:
     branch: main
     repo: pypa/manylinux
-
-after_script:
-  - if [ -f ${HOME}/dockerd-rootless.pid ]; then kill -15 $(cat ${HOME}/dockerd-rootless.pid); fi
-  - if [ -f /tmp/buildkitd.pid ]; then sudo kill -15 $(cat /tmp/buildkitd.pid); fi