numpy · TimotheusBachinger · Oct 19, 2023 · Oct 19, 2023 · Oct 20, 2023 · Oct 20, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -61,10 +61,9 @@ jobs:
           name: build numpy
           command: |
             . venv/bin/activate
-            pip install --progress-bar=off --upgrade pip 'setuptools<49.2.0'
             pip install --progress-bar=off -r test_requirements.txt
             pip install --progress-bar=off -r doc_requirements.txt
-            pip install .
+            pip install . --config-settings=setup-args="-Dallow-noblas=true"
 
       - run:
           name: create release notes

diff --git a/.cirrus.star b/.cirrus.star
@@ -24,16 +24,31 @@ def main(ctx):
     # only contains the actual commit message on a non-PR trigger event.
     # For a PR event it contains the PR title and description.
     SHA = env.get("CIRRUS_CHANGE_IN_REPO")
-    url = "https://api.github.com/repos/scipy/scipy/git/commits/" + SHA
+    url = "https://api.github.com/repos/numpy/numpy/git/commits/" + SHA
     dct = http.get(url).json()
-    # if "[wheel build]" in dct["message"]:
-    #     return fs.read("ci/cirrus_wheels.yml")
 
-    if "[skip cirrus]" in dct["message"] or "[skip ci]" in dct["message"]:
+    commit_msg = dct["message"]
+    if "[skip cirrus]" in  commit_msg or "[skip ci]" in commit_msg:
         return []
 
-    # add extra jobs to the cirrus run by += adding to config
-    config = fs.read("tools/ci/cirrus_wheels.yml")
-    config += fs.read("tools/ci/cirrus_macosx_arm64.yml")
+    wheel = False
+    labels = env.get("CIRRUS_PR_LABELS", "")
+    pr_number = env.get("CIRRUS_PR", "-1")
+    tag = env.get("CIRRUS_TAG", "")
 
-    return config
+    if "[wheel build]" in commit_msg:
+        wheel = True
+
+    # if int(pr_number) > 0 and ("14 - Release" in labels or "36 - Build" in labels):
+    #     wheel = True
+
+    if tag.startswith("v") and "dev0" not in tag:
+        wheel = True
+
+    if wheel:
+        return fs.read("tools/ci/cirrus_wheels.yml")
+
+    if int(pr_number) < 0:
+        return []
+
+    return fs.read("tools/ci/cirrus_arm.yml")
diff --git a/.devcontainer/setup.sh b/.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
@@ -11,3 +11,7 @@ micromamba env create -f environment.yml --yes
 # user (same applies to `conda activate`)
 
 git submodule update --init
+
+# Enables users to activate environment without having to specify the full path
+echo "envs_dirs:
+  - /home/codespace/micromamba/envs" > /opt/conda/.condarc
diff --git a/.gitattributes b/.gitattributes
@@ -17,10 +17,9 @@ 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

diff --git a/.github/actions/action.yml b/.github/actions/action.yml
@@ -11,7 +11,6 @@ runs:
       echo DOWNLOAD_OPENBLAS $DOWNLOAD_OPENBLAS
       echo USE_DEBUG $USE_DEBUG
       echo NPY_USE_BLAS_ILP64 $NPY_USE_BLAS_ILP64
-      echo NUMPY_EXPERIMENTAL_ARRAY_FUNCTION $NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
       echo USE_ASV $USE_ASV
       echo PATH $PATH
       echo python `which python`

diff --git a/.github/meson_actions/action.yml b/.github/meson_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::"