Fixed formatting mistakes

numpy · tgross35 · Mar 15, 2022 · Mar 15, 2022 · Mar 15, 2022 · May 1, 2022
commit 055c19bb7511c8c204ce6e701dd31ac215ba0c99
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -14,195 +14,195 @@
 name: Wheel builder
 
 on:
-    schedule:
-        #        ┌───────────── minute (0 - 59)
-        #        │  ┌───────────── hour (0 - 23)
-        #        │  │ ┌───────────── day of the month (1 - 31)
-        #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
-        #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
-        #        │  │ │ │ │
-        - cron: "42 1 * * 4"
-    push:
-    pull_request:
-        types: [labeled, opened, synchronize, reopened]
-    workflow_dispatch:
+  schedule:
+  #        ┌───────────── minute (0 - 59)
+  #        │  ┌───────────── hour (0 - 23)
+  #        │  │ ┌───────────── day of the month (1 - 31)
+  #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+  #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+  #        │  │ │ │ │
+  - cron: "42 1 * * 4"
+  push:
+  pull_request:
+      types: [labeled, opened, synchronize, reopened]
+  workflow_dispatch:
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
-    get_commit_message:
-        name: Get commit message
-        runs-on: ubuntu-latest
-        if: github.repository == 'numpy/numpy'
-        outputs:
-            message: ${{ steps.commit_message.outputs.message }}
-        steps:
-            - name: Checkout numpy
-              uses: actions/checkout@v3
-              # Gets the correct commit message for pull request
-              with:
-                  ref: ${{ github.event.pull_request.head.sha }}
-            - name: Get commit message
-              id: commit_message
-              run: |
-                  set -xe
-                  COMMIT_MSG=$(git log --no-merges -1 --oneline)
-                  echo "::set-output name=message::$COMMIT_MSG"
-                  echo github.ref ${{ github.ref }}
+  get_commit_message:
+    name: Get commit message
+    runs-on: ubuntu-latest
+    if: github.repository == 'numpy/numpy'
+    outputs:
+      message: ${{ steps.commit_message.outputs.message }}
+    steps:
+      - name: Checkout numpy
+        uses: actions/checkout@v3
+        # Gets the correct commit message for pull request
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Get commit message
+        id: commit_message
+        run: |
+          set -xe
+          COMMIT_MSG=$(git log --no-merges -1 --oneline)
+          echo "::set-output name=message::$COMMIT_MSG"
+          echo github.ref ${{ github.ref }}
 
-    build_wheels:
-        name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
-        needs: get_commit_message
-        if: >-
-            contains(needs.get_commit_message.outputs.message, '[wheel build]') ||
-            github.event_name == 'schedule' ||
-            github.event_name == 'workflow_dispatch' ||
-            (github.event_name == 'pull_request' &&
-            (contains(github.event.pull_request.labels.*.name, '36 - Build') ||
-            contains(github.event.pull_request.labels.*.name, '14 - Release'))) ||
-            (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
-        runs-on: ${{ matrix.buildplat[0] }}
-        strategy:
-            # Ensure that a wheel builder finishes even if another fails
-            fail-fast: false
-            matrix:
-                # Github Actions doesn't support pairing matrix values together, let's improvise
-                # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
-                buildplat:
-                    - [ubuntu-20.04, manylinux_x86_64]
-                    - [ubuntu-20.04, musllinux_x86_64]
-                    - [macos-10.15, macosx_*]
-                    - [windows-2019, win_amd64]
-                    - [windows-2019, win32]
-                # TODO: uncomment PyPy 3.9 builds once PyPy
-                # re-releases a new minor version
-                # NOTE: This needs a bump of cibuildwheel version, also, once that happens.
-                python: ["cp38", "cp39", "cp310", "pp38"] #, "pp39"]
-                exclude:
-                    # Don't build PyPy 32-bit windows
-                    - buildplat: [windows-2019, win32]
-                      python: "pp38"
-                    - buildplat: [windows-2019, win32]
-                      python: "pp39"
-                    # No musl version of PyPy
-                    - buildplat: [ubuntu-20.04, musllinux_x86_64]
-                      python: "pp38"
-        env:
-            IS_32_BIT: ${{ matrix.buildplat[1] == 'win32' }}
-            IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-            IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-        steps:
-            - name: Checkout numpy
-              uses: actions/checkout@v3
-              with:
-                  submodules: true
-                  # versioneer.py requires the latest tag to be reachable. Here we
-                  # fetch the complete history to get access to the tags.
-                  # A shallow clone can work when the following issue is resolved:
-                  # https://github.com/actions/checkout/issues/338
-                  fetch-depth: 0
+  build_wheels:
+    name: Build wheel for ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+    needs: get_commit_message
+    if: >-
+      contains(needs.get_commit_message.outputs.message, '[wheel build]') ||
+      github.event_name == 'schedule' ||
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' &&
+      (contains(github.event.pull_request.labels.*.name, '36 - Build') ||
+      contains(github.event.pull_request.labels.*.name, '14 - Release'))) ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
+    runs-on: ${{ matrix.buildplat[0] }}
+    strategy:
+      # Ensure that a wheel builder finishes even if another fails
+      fail-fast: false
+      matrix:
+        # Github Actions doesn't support pairing matrix values together, let's improvise
+        # https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
+        buildplat:
+        - [ubuntu-20.04, manylinux_x86_64]
+        - [ubuntu-20.04, musllinux_x86_64]
+        - [macos-10.15, macosx_*]
+        - [windows-2019, win_amd64]
+        - [windows-2019, win32]
+        # TODO: uncomment PyPy 3.9 builds once PyPy
+        # re-releases a new minor version
+        # NOTE: This needs a bump of cibuildwheel version, also, once that happens.
+        python: ["cp38", "cp39", "cp310", "pp38"] #, "pp39"]
+        exclude:
+        # Don't build PyPy 32-bit windows
+        - buildplat: [windows-2019, win32]
+          python: "pp38"
+        - buildplat: [windows-2019, win32]
+          python: "pp39"
+        # No musl version of PyPy
+        - buildplat: [ubuntu-20.04, musllinux_x86_64]
+          python: "pp39"
+    env:
+      IS_32_BIT: ${{ matrix.buildplat[1] == 'win32' }}
+      IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+      IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    steps:
+      - name: Checkout numpy
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          # versioneer.py requires the latest tag to be reachable. Here we
+          # fetch the complete history to get access to the tags.
+          # A shallow clone can work when the following issue is resolved:
+          # https://github.com/actions/checkout/issues/338
+          fetch-depth: 0
 
-            # Used to push the built wheels
-            - uses: actions/setup-python@v3
-              with:
-                  python-version: "3.x"
+      # Used to push the built wheels
+      - uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
 
-            - name: Configure mingw for 32-bit builds
-              run: |
-                  # Force 32-bit mingw
-                  choco uninstall mingw
-                  choco install -y mingw --forcex86 --force --version=7.3.0
-                  echo "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-                  refreshenv
-              if: ${{ env.IS_32_BIT == 'true' }}
+      - name: Configure mingw for 32-bit builds
+        run: |
+          # Force 32-bit mingw
+          choco uninstall mingw
+          choco install -y mingw --forcex86 --force --version=7.3.0
+          echo "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw32\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          refreshenv
+        if: ${{ env.IS_32_BIT == 'true' }}
 
-            - name: Build wheels
-              uses: pypa/cibuildwheel@v2.4.0
-              env:
-                  CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.4.0
+        env:
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
 
-            - uses: actions/upload-artifact@v3
-              with:
-                  name: ${{ matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }}
-                  path: ./wheelhouse/*.whl
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.python }}-${{ startsWith(matrix.buildplat[1], 'macosx') && 'macosx' || matrix.buildplat[1] }}
+          path: ./wheelhouse/*.whl
 
-            - name: Upload wheels
-              if: success()
-              shell: bash
-              env:
-                  NUMPY_STAGING_UPLOAD_TOKEN: ${{ secrets.NUMPY_STAGING_UPLOAD_TOKEN }}
-                  NUMPY_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}
-              run: |
-                  source tools/wheels/upload_wheels.sh
-                  set_upload_vars
-                  # trigger an upload to
-                  # https://anaconda.org/scipy-wheels-nightly/numpy
-                  # for cron jobs or "Run workflow" (restricted to main branch).
-                  # Tags will upload to
-                  # https://anaconda.org/multibuild-wheels-staging/numpy
-                  # The tokens were originally generated at anaconda.org
-                  upload_wheels
-    build_sdist:
-        name: Build sdist
-        needs: get_commit_message
-        if: >-
-            contains(needs.get_commit_message.outputs.message, '[wheel build]') ||
-            github.event_name == 'schedule' ||
-            github.event_name == 'workflow_dispatch' ||
-            (github.event_name == 'pull_request' &&
-            (contains(github.event.pull_request.labels.*.name, '36 - Build') ||
-            contains(github.event.pull_request.labels.*.name, '14 - Release'))) ||
-            (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
-        runs-on: ubuntu-latest
+      - name: Upload wheels
+        if: success()
+        shell: bash
         env:
-            IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-            IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-        steps:
-            - name: Checkout numpy
-              uses: actions/checkout@v3
-              with:
-                  submodules: true
-                  # versioneer.py requires the latest tag to be reachable. Here we
-                  # fetch the complete history to get access to the tags.
-                  # A shallow clone can work when the following issue is resolved:
-                  # https://github.com/actions/checkout/issues/338
-                  fetch-depth: 0
-            # Used to push the built wheels
-            - uses: actions/setup-python@v3
-              with:
-                  # Build sdist on lowest supported Python
-                  python-version: "3.8"
-            - name: Build sdist
-              run: |
-                  python setup.py sdist
-            - name: Test the sdist
-              run: |
-                  # TODO: Don't run test suite, and instead build wheels from sdist
-                  # Depends on pypa/cibuildwheel#1020
-                  python -m pip install dist/*.gz
-                  pip install -r test_requirements.txt
-                  cd .. # Can't import numpy within numpy src directory
-                  python -c "import numpy; print(numpy.__version__); numpy.test();"
-            - uses: actions/upload-artifact@v3
-              with:
-                  name: sdist
-                  path: ./dist/*
+          NUMPY_STAGING_UPLOAD_TOKEN: ${{ secrets.NUMPY_STAGING_UPLOAD_TOKEN }}
+          NUMPY_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}
+        run: |
+          source tools/wheels/upload_wheels.sh
+          set_upload_vars
+          # trigger an upload to
+          # https://anaconda.org/scipy-wheels-nightly/numpy
+          # for cron jobs or "Run workflow" (restricted to main branch).
+          # Tags will upload to
+          # https://anaconda.org/multibuild-wheels-staging/numpy
+          # The tokens were originally generated at anaconda.org
+          upload_wheels
+  build_sdist:
+    name: Build sdist
+    needs: get_commit_message
+    if: >-
+      contains(needs.get_commit_message.outputs.message, '[wheel build]') ||
+      github.event_name == 'schedule' ||
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'pull_request' &&
+      (contains(github.event.pull_request.labels.*.name, '36 - Build') ||
+      contains(github.event.pull_request.labels.*.name, '14 - Release'))) ||
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ( ! endsWith(github.ref, 'dev0')))
+    runs-on: ubuntu-latest
+    env:
+      IS_PUSH: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+      IS_SCHEDULE_DISPATCH: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
+    steps:
+      - name: Checkout numpy
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          # versioneer.py requires the latest tag to be reachable. Here we
+          # fetch the complete history to get access to the tags.
+          # A shallow clone can work when the following issue is resolved:
+          # https://github.com/actions/checkout/issues/338
+          fetch-depth: 0
+      # Used to push the built wheels
+      - uses: actions/setup-python@v3
+        with:
+          # Build sdist on lowest supported Python
+          python-version: '3.8'
+      - name: Build sdist
+        run: |
+          python setup.py sdist
+      - name: Test the sdist
+        run: |
+          # TODO: Don't run test suite, and instead build wheels from sdist
+          # Depends on pypa/cibuildwheel#1020
+          python -m pip install dist/*.gz
+          pip install -r test_requirements.txt
+          cd .. # Can't import numpy within numpy src directory
+          python -c "import numpy; print(numpy.__version__); numpy.test();"
+      - uses: actions/upload-artifact@v3
+        with:
+          name: sdist
+          path: ./dist/*
 
-            - name: Upload sdist
-              if: success()
-              shell: bash
-              env:
-                  NUMPY_STAGING_UPLOAD_TOKEN: ${{ secrets.NUMPY_STAGING_UPLOAD_TOKEN }}
-                  NUMPY_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}
-              run: |
-                  source tools/wheels/upload_wheels.sh
-                  set_upload_vars
-                  # trigger an upload to
-                  # https://anaconda.org/scipy-wheels-nightly/numpy
-                  # for cron jobs or "Run workflow" (restricted to main branch).
-                  # Tags will upload to
-                  # https://anaconda.org/multibuild-wheels-staging/numpy
-                  # The tokens were originally generated at anaconda.org
-                  upload_wheels
+      - name: Upload sdist
+        if: success()
+        shell: bash
+        env:
+          NUMPY_STAGING_UPLOAD_TOKEN: ${{ secrets.NUMPY_STAGING_UPLOAD_TOKEN }}
+          NUMPY_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}
+        run: |
+          source tools/wheels/upload_wheels.sh
+          set_upload_vars
+          # trigger an upload to
+          # https://anaconda.org/scipy-wheels-nightly/numpy
+          # for cron jobs or "Run workflow" (restricted to main branch).
+          # Tags will upload to
+          # https://anaconda.org/multibuild-wheels-staging/numpy
+          # The tokens were originally generated at anaconda.org
+          upload_wheels