Update numpy pinning strategy (#39875)

This pulls a couple of changes into `ornl-next`
* #39865 
* #39803 
* #39871

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: thomashampson <thomas.hampson@stfc.ac.uk>

Author: 3 people

.pre-commit-config.yaml

@@ -59,7 +59,7 @@ repos:
           )$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.9
+    rev: v0.12.10
     # ruff must appear before black in the list of hooks
     hooks:
       - id: ruff-check

conda/recipes/conda_build_config.yaml

@@ -47,7 +47,6 @@ hdf5: # this is to move to libcurl>=8.4
 graphviz:
   - '>=2.47.0'
 
-# this must match the version in the developer dependencies
 jemalloc:
   - 5.2.0 # [linux]
   - 5.2.* # [osx]
@@ -58,13 +57,13 @@ jsoncpp:
 libglu:
   - '>=9.0'
 
-#v2.8.5 caused seg faults on Mantid conda versions and large numbers of tests failing
+#v2.3.5 caused seg faults on Mantid conda versions and large numbers of tests failing
 muparser:
   - '>=2.3.2, <2.3.5'
 
-# We follow conda-forge and build with the lowest supported version of numpy for forward compatibility.
+# Aim to build using the latest minor version, and rely on numpy's generous backward compatibility.
 numpy:
-  - 2.0.*
+  - 2.1.*
 
 matplotlib:
   - 3.9.*
@@ -169,5 +168,8 @@ versioningit:
   - '>=2.1'
 
 pin_run_as_build:
-    boost:
-      max_pin: x.x
+  boost:
+    max_pin: x.x
+  numpy:
+    min_pin: x
+    max_pin: x.x

conda/recipes/mantid-developer/meta.yaml

@@ -30,7 +30,7 @@ requirements:
     - matplotlib {{ matplotlib }}
     - muparser {{ muparser }}
     - ninja {{ ninja }}
-    - numpy>=2.0,<2.2 # This is intentionally different to conda_build_config.yaml, will address later.
+    - numpy {{ numpy }}
     - occt {{ occt }}
     - pip {{ pip }}
     - poco {{ poco }}

conda/recipes/mantid/meta.yaml

@@ -63,7 +63,6 @@ requirements:
     - jemalloc {{ jemalloc }}  # [osx or linux]
     - lib3mf  # [win]
     - muparser {{ muparser }}
-    - {{ pin_compatible("numpy", upper_bound="2.2") }}
     - occt {{ occt }}
     - pycifrw
     - pydantic {{ pydantic }}

installers/conda/win/create_package.sh

@@ -115,7 +115,6 @@ mv $CONDA_ENV_PATH/Library/mingw-w64/bin/libgcc_s_seh*.dll $COPY_DIR/bin/
 
 echo "Copy Mantid specific files from env/Library/bin to package/bin"
 mv $CONDA_ENV_PATH/Library/bin/Mantid.properties $COPY_DIR/bin/
-mv $CONDA_ENV_PATH/Library/bin/MantidNexusParallelLoader.exe $COPY_DIR/bin/
 mv $CONDA_ENV_PATH/Library/bin/mantid-scripts.pth $COPY_DIR/bin/
 
 echo "Copy Mantid icon files from source to package/bin"