Merge branch 'main' into DOC/21351/np.char

Author: mdhaber

.circleci/config.yml

@@ -54,29 +54,22 @@ jobs:
           command: |
             python3.11 -m venv venv
             . venv/bin/activate
-            pip install --progress-bar=off -r requirements/test_requirements.txt
+            pip install --progress-bar=off -r requirements/test_requirements.txt \
+               -r requirements/build_requirements.txt \
+               -r requirements/ci_requirements.txt
             # get newer, pre-release versions of critical packages
-            pip install --progress-bar=off --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple -r requirements/doc_requirements.txt
+            pip install --progress-bar=off --pre -r requirements/doc_requirements.txt
             # then install numpy HEAD, which will override the version installed above
-            pip install . --config-settings=setup-args="-Dallow-noblas=true"
-
-      - run:
-          name: create release notes
-          command: |
-            . venv/bin/activate
-            VERSION=$(pip show numpy | grep Version: | cut -d ' ' -f 2 | cut -c 1-5)
-            towncrier build --version $VERSION --yes
-            ./tools/ci/test_all_newsfragments_used.py
+            spin build --with-scipy-openblas=64
 
       - run:
           name: build devdocs w/ref warnings
           command: |
             . venv/bin/activate
-            cd doc
             # Don't use -q, show warning summary"
-            SPHINXOPTS="-W -n" make -e html
-            if [[ $(find build/html -type f | wc -l) -lt 1000 ]]; then
-                echo "doc build failed: build/html is empty"
+            SPHINXOPTS="-W -n" spin docs
+            if [[ $(find doc/build/html -type f | wc -l) -lt 1000 ]]; then
+                echo "doc build failed: doc/build/html is empty"
                 exit -1
             fi
 
@@ -95,9 +88,16 @@ jobs:
      #      destination: neps
 
       - run:
-          name: run refguide-check
+          name: check doctests
           command: |
             . venv/bin/activate
+            spin check-docs -v
+            spin check-tutorials -v
+            # Currently, this does two checks not done by check-docs:
+            #  - validates ReST blocks (via validate_rst_syntax)
+            #  - checks that all of a module's `__all__` is reflected in the
+            #    module-level docstring autosummary
+            echo calling python tools/refguide_check.py -v
             python tools/refguide_check.py -v
 
       - persist_to_workspace:

.editorconfig

@@ -6,3 +6,21 @@ indent_size = 4
 indent_style = space
 max_line_length = 80
 trim_trailing_whitespace = true
+
+[*.{py,pyi,pxd}]
+# https://peps.python.org/pep-0008/
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+# Keep in sync with `tools/lint_diff.ini` and `tools/linter.py`
+# https://pycodestyle.pycqa.org/en/latest/intro.html#configuration
+max_line_length = 88
+
+[*.pyi]
+# https://typing.readthedocs.io/en/latest/guides/writing_stubs.html#style-guide
+max_line_length = 130

.github/workflows/codeql.yml

@@ -45,7 +45,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,6 +68,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/cygwin.yml

@@ -62,7 +62,7 @@ jobs:
           cd tools
           /usr/bin/python3.9 -m pytest --pyargs numpy -n2 -m "not slow"
       - name: Upload wheel if tests fail
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         if: failure()
         with:
           name: numpy-cygwin-wheel

.github/workflows/emscripten.yml

@@ -32,11 +32,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
-permissions:
-  contents: read  # to fetch code (actions/checkout)
 
 jobs:
   build-wasm-emscripten:
+    permissions:
+      contents: read  # to fetch code (actions/checkout)
     name: Build NumPy distribution for Pyodide
     runs-on: ubuntu-22.04
     # To enable this workflow on a fork, comment out:
@@ -48,24 +48,37 @@ jobs:
           submodules: recursive
           fetch-tags: true
 
-      - uses: pypa/cibuildwheel@bd033a44476646b606efccdd5eed92d5ea1d77ad  # v2.20.0
+      - uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b  # v2.21.3
         env:
           CIBW_PLATFORM: pyodide
 
       - name: Upload wheel artifact(s)
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a  # v4.3.6
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882  # v4.4.3
         with:
           name: cp312-pyodide_wasm32
           path: ./wheelhouse/*.whl
+          if-no-files-found: error
+
+  # Push to https://anaconda.org/scientific-python-nightly-wheels/numpy
+  # WARNING: this job will overwrite any existing WASM wheels.
+  upload-wheels:
+    name: Upload NumPy WASM wheels to Anaconda.org
+    runs-on: ubuntu-22.04
+    permissions: {}
+    needs: [build-wasm-emscripten]
+    if: >-
+      (github.repository == 'numpy/numpy') &&
+      (github.event_name == 'workflow_dispatch' && github.event.inputs.push_wheels == 'true') ||
+      (github.event_name == 'schedule')
+    steps:
+      - name: Download wheel artifact(s)
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16  # v4.1.8
+        with:
+          path: wheelhouse/
+          merge-multiple: true
 
-        # Push to https://anaconda.org/scientific-python-nightly-wheels/numpy
-        # WARNING: this job will overwrite any existing WASM wheels.
       - name: Push to Anaconda PyPI index
-        if: >-
-          (github.repository == 'numpy/numpy') &&
-          (github.event_name == 'workflow_dispatch' && github.event.inputs.push_wheels == 'true') ||
-          (github.event_name == 'schedule')
-        uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc  # v0.5.0
+        uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b  # v0.6.1
         with:
           artifacts_path: wheelhouse/
           anaconda_nightly_upload_token: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}

.github/workflows/linux.yml

@@ -274,7 +274,7 @@ jobs:
         pip install vulture
     - name: Build and install NumPy
       run: |
-        # Install using the fastests way to build (no BLAS, no SIMD)
+        # Install using the fastest way to build (no BLAS, no SIMD)
         spin build -j2 -- -Dallow-noblas=true -Dcpu-baseline=none -Dcpu-dispatch=none
     - name: Check build-internal dependencies
       run: |
@@ -302,7 +302,7 @@ jobs:
         submodules: recursive
         fetch-tags: true
     # TODO: replace with setup-python when there is support
-    - uses: deadsnakes/action@6c8b9b82fe0b4344f4b98f2775fcc395df45e494 # v3.1.0
+    - uses: deadsnakes/action@e640ac8743173a67cca4d7d77cd837e514bf98e8 # v3.2.0
       with:
           python-version: '3.13-dev'
           nogil: true

.github/workflows/linux_qemu.yml

@@ -108,7 +108,7 @@ jobs:
         sudo apt install -y ninja-build gcc-${TOOLCHAIN_NAME} g++-${TOOLCHAIN_NAME} gfortran-${TOOLCHAIN_NAME}
 
     - name: Cache docker container
-      uses: actions/cache@v4.0.2
+      uses: actions/cache@v4.1.1
       id: container-cache
       with:
         path: ~/docker_${{ matrix.BUILD_PROP[1] }}

.github/workflows/linux_simd.yml

@@ -17,7 +17,7 @@ name: Linux SIMD tests
 #
 # - native:
 #   Tests against the host CPU features set as the baseline without enabling any runtime dispatched features.
-#   Intended to assess the entire NumPy codebase against host flags, even for code sections lacking handwritten SIMD intrincis.
+#   Intended to assess the entire NumPy codebase against host flags, even for code sections lacking handwritten SIMD intrinsics.
 #
 # - without_avx512/avx2/fma3:
 #   Uses runtime SIMD dispatching but disables AVX2, FMA3, and AVX512.

.github/workflows/macos.yml

@@ -44,7 +44,7 @@ jobs:
         echo "today=$(/bin/date -u '+%Y%m%d')" >> $GITHUB_OUTPUT
 
     - name: Setup compiler cache
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       id:    cache-ccache
       with:
         path: ${{ steps.prep-ccache.outputs.dir }}
@@ -68,7 +68,7 @@ jobs:
     # ensure we re-solve once a day (since we don't lock versions). Could be
     # replaced by a conda-lock based approach in the future.
     - name: Cache conda environment
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       env:
         # Increase this value to reset cache if environment.yml has not changed
         CACHE_NUMBER: 1

.github/workflows/mypy.yml

@@ -47,8 +47,8 @@ jobs:
       matrix:
         os_python:
           - [ubuntu-latest, '3.12']
-          - [windows-2019, '3.11']
-          - [macos-12, '3.10']
+          - [windows-latest, '3.11']
+          - [macos-latest, '3.10']
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with: