numpy · charris · Sep 15, 2023 · Sep 13, 2023 · Aug 24, 2023 · Sep 13, 2023
diff --git a/.gitattributes b/.gitattributes
@@ -9,7 +9,6 @@
 # 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
@@ -24,10 +23,8 @@ 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
 
 # Python sources
 *.py    text diff=python
@@ -106,7 +103,6 @@ numpy/version.py linguist-generated
 ./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

diff --git a/.github/actions/action.yml b/.github/actions/action.yml
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -19,7 +19,8 @@ permissions:
 jobs:
   build-wasm-emscripten:
     runs-on: ubuntu-22.04
-    if: "github.repository == 'numpy/numpy'"
+    if: false  # NOTE: job disabled, it needs to be moved to Meson (see gh-24603)
+    # if: "github.repository == 'numpy/numpy'"
     env:
       PYODIDE_VERSION: 0.23.1
       # PYTHON_VERSION and EMSCRIPTEN_VERSION are determined by PYODIDE_VERSION.

diff --git a/.gitignore b/.gitignore
@@ -68,7 +68,7 @@ build-install
 .mesonpy-native-file.ini
 # sphinx build directory
 _build
-# setup.py dist directory
+# dist directory is where sdist/wheel end up
 dist
 doc/build
 doc/docenv
@@ -77,7 +77,6 @@ doc/cdoc/build
 *.egg-info
 # The shelf plugin uses this dir
 ./.shelf
-MANIFEST
 .cache
 pip-wheel-metadata
 .python-version
@@ -115,82 +114,17 @@ Thumbs.db
 # doc build generated files #
 #############################
 doc/source/savefig/
-
+doc/source/**/generated/
 
 # Things specific to this project #
 ###################################
 # The line below should change to numpy/_version.py for NumPy 2.0
-numpy/version.py
-numpy/core/__svn_version__.py
-doc/numpy.scipy.org/_build
-numpy/__config__.py
-numpy/core/include/numpy/__multiarray_api.h
-numpy/core/include/numpy/__ufunc_api.h
-numpy/core/include/numpy/_numpyconfig.h
-site.cfg
-.tox
-numpy/core/include/numpy/__multiarray_api.c
-numpy/core/include/numpy/__ufunc_api.c
-numpy/core/include/numpy/__umath_generated.c
-numpy/core/include/numpy/_umath_doc_generated.h
-numpy/core/include/numpy/config.h
-numpy/core/lib/
-numpy/core/src/common/npy_sort.h
-numpy/core/src/common/templ_common.h
-numpy/core/src/multiarray/_multiarray_tests.c
-numpy/core/src/multiarray/arraytypes.c
-numpy/core/src/multiarray/einsum.c
-numpy/core/src/multiarray/einsum_sumprod.c
-numpy/core/src/multiarray/lowlevel_strided_loops.c
-numpy/core/src/multiarray/multiarray_tests.c
-numpy/core/src/multiarray/nditer_templ.c
-numpy/core/src/multiarray/scalartypes.c
-numpy/core/src/multiarray/textreading/tokenize.c
-numpy/core/src/npymath/ieee754.c
-numpy/core/src/npymath/npy_math_complex.c
-numpy/core/src/npymath/npy_math_internal.h
-numpy/core/src/npysort/binsearch.c
-numpy/core/src/npysort/heapsort.c
-numpy/core/src/npysort/mergesort.c
-numpy/core/src/npysort/quicksort.c
-numpy/core/src/npysort/radixsort.c
-numpy/core/src/npysort/selection.c
-numpy/core/src/npysort/timsort.c
-numpy/core/src/npysort/sort.c
-numpy/core/src/private/npy_binsearch.h
-numpy/core/src/private/npy_partition.h
-numpy/core/src/private/templ_common.h
-numpy/core/src/umath/_umath_tests.c
-numpy/core/src/umath/scalarmath.c
-numpy/core/src/umath/funcs.inc
-numpy/core/src/umath/clip.[ch]
-numpy/core/src/umath/loops.[ch]
-numpy/core/src/umath/matmul.[ch]
-numpy/core/src/umath/operand_flag_tests.c
-numpy/core/src/umath/simd.inc
-numpy/core/src/umath/struct_ufunc_test.c
-numpy/core/src/umath/test_rational.c
-numpy/core/src/umath/umath_tests.c
-numpy/core/src/umath/loops_utils.h
-numpy/core/src/umath/loops_modulo.dispatch.c
-numpy/distutils/__config__.py
-numpy/linalg/umath_linalg.c
-doc/source/**/generated/
 benchmarks/results
 benchmarks/html
 benchmarks/env
 benchmarks/numpy
 benchmarks/_asv_compare.conf.json
 test.obj
-# cythonized files
-cythonize.dat
-numpy/random/_mtrand/_mtrand.c
-numpy/random/*.c
-numpy/random/legacy/*.c
-numpy/random/_mtrand/randint_helpers.pxi
-numpy/random/bounded_integers.pyx
-numpy/random/bounded_integers.pxd
-numpy/random/lib/npyrandom.lib
 tools/swig/test/Array_wrap.cxx
 tools/swig/test/Farray_wrap.cxx
 tools/swig/test/Farray.py
@@ -205,29 +139,3 @@ tools/swig/test/Tensor.py
 tools/swig/test/Vector.py
 tools/swig/test/Vector_wrap.cxx
 tools/swig/test/Array.py
-
-# SIMD generated files #
-###################################
-# _simd module
-numpy/core/src/_simd/_simd.dispatch.c
-numpy/core/src/_simd/_simd_data.inc
-numpy/core/src/_simd/_simd_inc.h
-# umath module
-numpy/core/src/umath/loops_unary.dispatch.c
-numpy/core/src/umath/loops_unary_fp.dispatch.c
-numpy/core/src/umath/loops_unary_fp_le.dispatch.c
-numpy/core/src/umath/loops_arithm_fp.dispatch.c
-numpy/core/src/umath/loops_arithmetic.dispatch.c
-numpy/core/src/umath/loops_logical.dispatch.c
-numpy/core/src/umath/loops_minmax.dispatch.c
-numpy/core/src/umath/loops_trigonometric.dispatch.c
-numpy/core/src/umath/loops_exponent_log.dispatch.c
-numpy/core/src/umath/loops_umath_fp.dispatch.c
-numpy/core/src/umath/loops_hyperbolic.dispatch.c
-numpy/core/src/umath/loops_modulo.dispatch.c
-numpy/core/src/umath/loops_comparison.dispatch.c
-numpy/core/src/umath/loops_unary_complex.dispatch.c
-numpy/core/src/umath/loops_autovec.dispatch.c
-# multiarray module
-numpy/core/src/multiarray/argfunc.dispatch.c
-numpy/core/src/multiarray/arraytypes.h
diff --git a/LICENSES_bundled.txt b/LICENSES_bundled.txt
@@ -6,11 +6,6 @@ Files: numpy/linalg/lapack_lite/*
 License: BSD-3-Clause
   For details, see numpy/linalg/lapack_lite/LICENSE.txt
 
-Name: tempita
-Files: tools/npy_tempita/*
-License: MIT
-  For details, see tools/npy_tempita/license.txt
-
 Name: dragon4
 Files: numpy/core/src/multiarray/dragon4.c
 License: MIT

diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/doc/HOWTO_RELEASE.rst b/doc/HOWTO_RELEASE.rst
@@ -188,17 +188,17 @@ Check the C API version number
 ------------------------------
 The C API version needs to be tracked in three places
 
-- numpy/core/setup_common.py
+- numpy/core/meson.build
 - numpy/core/code_generators/cversions.txt
 - numpy/core/include/numpy/numpyconfig.h
 
 There are three steps to the process.
 
-1. If the API has changed, increment the C_API_VERSION in setup_common.py. The
-   API is unchanged only if any code compiled against the current API will be
-   backward compatible with the last released NumPy version. Any changes to
-   C structures or additions to the public interface will make the new API
-   not backward compatible.
+1. If the API has changed, increment the C_API_VERSION in
+   numpy/core/meson.build. The API is unchanged only if any code compiled
+   against the current API will be backward compatible with the last released
+   NumPy version. Any changes to C structures or additions to the public
+   interface will make the new API not backward compatible.
 
 2. If the C_API_VERSION in the first step has changed, or if the hash of
    the API has changed, the cversions.txt file needs to be updated. To check
@@ -221,8 +221,8 @@ There are three steps to the process.
    increased from the previous version if some of the functions or macros in
    the include files were deprecated.
 
-The C ABI version number in numpy/core/setup_common.py should only be
-updated for a major release.
+The C ABI version number in numpy/core/meson.build should only be updated for a
+major release.
 
 
 Check the release notes

diff --git a/numpy/_build_utils/setup.py b/numpy/_build_utils/setup.py
diff --git a/numpy/_build_utils/tempita.py b/numpy/_build_utils/tempita.py
@@ -5,8 +5,7 @@
 
 from Cython import Tempita as tempita
 
-# XXX: If this import ever fails (does it really?), vendor either
-# cython.tempita or numpy/npy_tempita.
+# XXX: If this import ever fails (does it really?), vendor cython.tempita
 
 
 def process_tempita(fromfile, outfile=None):

diff --git a/numpy/_pytesttester.py b/numpy/_pytesttester.py
@@ -20,8 +20,9 @@
     DeprecationWarnings and PendingDeprecationWarnings are ignored, other
     warnings are passed through.
 
-In practice, tests run from the numpy repo are run in develop mode. That
-includes the standard ``python runtests.py`` invocation.
+In practice, tests run from the numpy repo are run in development mode with
+``spin``, through the standard ``spin test`` invocation or from an inplace
+build with ``pytest numpy``.
 
 This module is imported by every numpy subpackage, so lies at the top level to
 simplify circular import issues. For the same reason, it contains no numpy

diff --git a/numpy/_typing/setup.py b/numpy/_typing/setup.py
diff --git a/numpy/array_api/setup.py b/numpy/array_api/setup.py
diff --git a/numpy/compat/setup.py b/numpy/compat/setup.py
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt
@@ -1,7 +1,7 @@
 # Hash below were defined from numpy_api_order.txt and ufunc_api_order.txt
 # When adding a new version here for a new minor release, also add the same
 # version as NPY_x_y_API_VERSION in numpyconfig.h and C_API_VERSION in
-# setup_common.py.
+# numpy/core/meson.build
 
 0x00000001 = 603580d224763e58c5e7147f804dc0f5
 0x00000002 = 8ecb29306758515ae69749c803a75da1

diff --git a/numpy/core/code_generators/numpy_api.py b/numpy/core/code_generators/numpy_api.py
@@ -5,7 +5,7 @@
 
 Whenever you change one index, you break the ABI (and the ABI version number
 should be incremented). Whenever you add an item to one of the dict, the API
-needs to be updated in both setup_common.py and by adding an appropriate
+needs to be updated in both numpy/core/meson.build and by adding an appropriate
 entry to cversion.txt (generate the hash via "python cversions.py").
 
 When adding a function, make sure to use the next integer not used as an index