Merge branch 'real-imag-remove' into strip-npymath

Author: lysnikolaou

.github/workflows/scorecards.yml

@@ -30,7 +30,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif

.github/workflows/wheels.yml

@@ -140,7 +140,9 @@ jobs:
           NUMPY_STAGING_UPLOAD_TOKEN: ${{ secrets.NUMPY_STAGING_UPLOAD_TOKEN }}
           NUMPY_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}
         run: |
-          conda install -y anaconda-client
+          #conda install -y anaconda-client
+          # pin urllib3 until anaconda-client is fixed upstream
+          conda install -y anaconda-client 'urllib3<2.0.0'
           source tools/wheels/upload_wheels.sh
           set_upload_vars
           # trigger an upload to
@@ -222,7 +224,9 @@ jobs:
           # commented out so the sdist doesn't upload to nightly
           # NUMPY_NIGHTLY_UPLOAD_TOKEN: ${{ secrets.NUMPY_NIGHTLY_UPLOAD_TOKEN }}
         run: |
-          conda install -y anaconda-client
+          #conda install -y anaconda-client
+          # pin urllib3 until anaconda-client is fixed upstream
+          conda install -y anaconda-client 'urllib3<2.0.0'
           source tools/wheels/upload_wheels.sh
           set_upload_vars
           # trigger an upload to

doc/changelog/1.24.4-changelog.rst

@@ -0,0 +1,23 @@
+
+Contributors
+============
+
+A total of 4 people contributed to this release.  People with a "+" by their
+names contributed a patch for the first time.
+
+* Bas van Beek
+* Charles Harris
+* Sebastian Berg
+* Hongyang Peng +
+
+Pull requests merged
+====================
+
+A total of 6 pull requests were merged for this release.
+
+* `#23720 <https://github.com/numpy/numpy/pull/23720>`__: MAINT, BLD: Pin rtools to version 4.0 for Windows builds.
+* `#23739 <https://github.com/numpy/numpy/pull/23739>`__: BUG: fix the method for checking local files for 1.24.x
+* `#23760 <https://github.com/numpy/numpy/pull/23760>`__: MAINT: Copy rtools installation from install-rtools.
+* `#23761 <https://github.com/numpy/numpy/pull/23761>`__: BUG: Fix masked array ravel order for A (and somewhat K)
+* `#23890 <https://github.com/numpy/numpy/pull/23890>`__: TYP,DOC: Annotate and document the ``metadata`` parameter of...
+* `#23994 <https://github.com/numpy/numpy/pull/23994>`__: MAINT: Update rtools installation

doc/release/upcoming_changes/23762.new_function.rst

@@ -0,0 +1,5 @@
+Matrix transpose support for ndarrays
+-------------------------------------
+NumPy now offers support for calculating the matrix transpose of an array. The
+matrix transpose is equivalent to swapping the last two axes of an array.
+`np.ndarray` and `np.ma.MaskedArray` now exposes a `.mT` attribute.

doc/release/upcoming_changes/23871.change.rst

@@ -15,7 +15,7 @@ This changes the following distinct cases:
   to integer first) or ``string_array == "0"`` (if the input is only ever ``0`` or ``1``).
   To get the new result on old NumPy versions use ``string_array != ""``.
 * ``np.nonzero(string_array)`` previously ignored whitespace so that
-  a string only containing whitepsace was considered ``False``.
+  a string only containing whitespace was considered ``False``.
   Whitespace is now considered ``True``.
 
 This change does not affect ``np.loadtxt``, ``np.fromstring``, or ``np.genfromtxt``.

doc/release/upcoming_changes/23936.change.rst

@@ -1,5 +1,4 @@
 * Being fully context and thread-safe, ``np.errstate`` can only
-  be entered once now.  It is possible to enter it again after
-  exiting first.
+  be entered once now.
 * ``np.setbufsize`` is now tied to ``np.errstate()``:  Leaving an
   ``np.errstate`` context will also reset the ``bufsize``.

doc/release/upcoming_changes/23998.expired.rst

@@ -0,0 +1,3 @@
+* The deprecation of ``set_numeric_ops`` and the C functions
+  ``PyArray_SetNumericOps`` and ``PyArray_GetNumericOps`` has
+  been expired and the functions removed.  (Deprecated NumPy 1.16)

doc/release/upcoming_changes/24011.c_api_removal.rst

@@ -0,0 +1,4 @@
+* The ``numpy/old_defines.h`` which was part of the API deprecated since NumPy 1.7
+  has been removed.  This removes macros of the form ``PyArray_CONSTANT``.
+  The script at https://github.com/numpy/numpy/blob/main/tools/replace_old_macros.sed
+  may be useful to convert them to the ``NPY_CONSTANT`` version.

doc/source/conf.py

@@ -191,8 +191,10 @@ def setup(app):
   "twitter_url": "https://twitter.com/numpy_team",
   "collapse_navigation": True,
   "external_links": [
-      {"name": "Learn", "url": "https://numpy.org/numpy-tutorials/"}
+      {"name": "Learn", "url": "https://numpy.org/numpy-tutorials/"},
+      {"name": "NEPs", "url": "https://numpy.org/neps"}
       ],
+  "header_links_before_dropdown": 6,
   # Add light/dark mode and documentation version switcher:
   "navbar_end": ["theme-switcher", "version-switcher", "navbar-icon-links"],
   "switcher": {

doc/source/dev/development_environment.rst

@@ -75,6 +75,8 @@ Testing builds
 Before running the tests, first install the test dependencies::
 
     $ python -m pip install -r test_requirements.txt
+    $ python -m pip install asv # only for running benchmarks
+      
 
 To build the development version of NumPy and run tests, spawn
 interactive shells with the Python import paths properly set up etc.,