Merge branch 'main' into strip-npymath

Author: lysnikolaou

.circleci/config.yml

@@ -20,7 +20,7 @@ jobs:
       - checkout
 
       - run:
-          name: Check-skip
+          name: check skip
           command: |
             export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ")
             echo "Got commit message:"
@@ -40,22 +40,19 @@ jobs:
       - run:
           name: update submodules
           command: |
-            git submodule init
-            git submodule update
+            git submodule update --init
 
       - run:
-          name: create virtual environment, install dependencies
+          name: install system dependencies
           command: |
             sudo apt-get update
-            #sudo apt-get install -y python3.9 python3.9-dev python3-venv graphviz texlive-fonts-recommended texlive-latex-recommended \
             sudo apt-get install -y graphviz texlive-fonts-recommended texlive-latex-recommended \
               texlive-latex-extra latexmk texlive-xetex texlive-lang-chinese doxygen
-            python3.11 -m venv venv
-            . venv/bin/activate
 
       - run:
-          name: build numpy
+          name: build NumPy
           command: |
+            python3.11 -m venv venv
             . venv/bin/activate
             pip install --progress-bar=off -r test_requirements.txt
             # get newer, pre-release versions of critical packages
@@ -67,16 +64,19 @@ jobs:
           name: create release notes
           command: |
             . venv/bin/activate
-            VERSION=$(python -c "import setup; print(setup.VERSION)")
+            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
 
       - run:
           name: run doctests on documentation
           command: |
             . venv/bin/activate
-            (cd doc ; git submodule update --init)
+            # Note: keep these two checks separate, because they seem to
+            # influence each other through changing global state (e.g., via
+            # `np.polynomial.set_default_printstyle`)
             python tools/refguide_check.py --rst
+            python tools/refguide_check.py --doctests
 
       - run:
           name: build devdocs w/ref warnings

.cirrus.star

@@ -48,4 +48,7 @@ def main(ctx):
     if wheel:
         return fs.read("tools/ci/cirrus_wheels.yml")
 
-    return fs.read("tools/ci/cirrus_macosx_arm64.yml")
+    if int(pr_number) < 0:
+        return []
+
+    return fs.read("tools/ci/cirrus_arm.yml")

.devcontainer/setup.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-curl micro.mamba.pm/install.sh | bash
+"${SHELL}" <(curl -Ls micro.mamba.pm/install.sh) < /dev/null
 
 conda init --all
 micromamba shell init -s bash

.gitattributes

@@ -9,26 +9,22 @@
 # Mark some files as vendored
 numpy/linalg/lapack_lite/f2c.c linguist-vendored
 numpy/linalg/lapack_lite/f2c.h linguist-vendored
-tools/npy_tempita/* linguist-vendored
-numpy/core/include/numpy/libdivide/* linguist-vendored
-numpy/core/src/umath/svml/* linguist-vendored
-numpy/core/src/common/dlpack/dlpack.h linguist-vendored
+numpy/_core/include/numpy/libdivide/* linguist-vendored
+numpy/_core/src/umath/svml/* linguist-vendored
+numpy/_core/src/common/dlpack/dlpack.h linguist-vendored
 
 # Mark some files as generated
 numpy/linalg/lapack_lite/f2c_*.c linguist-generated
 numpy/linalg/lapack_lite/lapack_lite_names.h linguist-generated
-numpy/_version.py linguist-generated
 
-# versioneer config
-numpy/_version.py export-subst
+# version generated from pyproject.toml during build
+numpy/version.py linguist-generated
 
 # Configuration files
 *.ini text
 *.cfg text
-./MANIFEST.in text
-./numpy/core/npymath.ini.in text
-./numpy/core/mlib.ini.in text
-./site.cfg.example text
+./numpy/_core/npymath.ini.in text
+./numpy/_core/mlib.ini.in text
 
 # Python sources
 *.py    text diff=python
@@ -107,8 +103,7 @@ numpy/_version.py export-subst
 ./doc/neps/index.rst.tmpl text
 ./benchmarks/asv_compare.conf.json.tpl text
 ./tools/swig/test/*.i text
-./tools/gitpod/gitpod.Dockerfile text
 ./doc/source/dev/gitwash/git_links.inc text
 ./doc/source/reference/simd/*.inc text
-./numpy/core/src/_simd/*.inc text diff=c
+./numpy/_core/src/_simd/*.inc text diff=c
 

.github/actions/action.yml

@@ -0,0 +1,37 @@
+name: MesonBuildTest
+description: "checkout repo, build, and test numpy"
+runs:
+  using: composite
+  steps:
+  - name: Build
+    shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
+    env:
+      TERM: xterm-256color
+      PKG_CONFIG_PATH: ./.openblas
+    run: |
+      echo "::group::Installing Build Dependencies"
+      pip install -r build_requirements.txt
+      echo "::endgroup::"
+      echo "::group::Building NumPy"
+      spin build --clean -- ${MESON_ARGS[@]}
+      echo "::endgroup::"
+
+  - name: Meson Log
+    shell: bash
+    if: always()
+    run: |
+      echo "::group::Meson Log"
+      cat build/meson-logs/meson-log.txt
+      echo "::endgroup::"
+
+  - name: Test
+    shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"'
+    env:
+      TERM: xterm-256color
+    run: |
+      echo "::group::Installing Test Dependencies"
+      pip install pytest pytest-xdist hypothesis typing_extensions setuptools
+      echo "::endgroup::"
+      echo "::group::Test NumPy"
+      spin test
+      echo "::endgroup::"