Merge remote-tracking branch 'origin/main' into last_zenodo_check

.github/workflows/build_wheels.yml

@@ -129,7 +129,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install cibuildwheel
         # Nb. keep cibuildwheel version pin consistent with job below
-        run: pipx install cibuildwheel==2.21.3
+        run: pipx install cibuildwheel==2.22.0
       - id: set-matrix
         run: |
           echo "CI_ONLY" $CI_ONLY
@@ -212,7 +212,7 @@ jobs:
           python -m pip install git+https://github.com/alexlancaster/cffconvert.git@combine_features#egg=cffconvert
           python src/PyPop/citation.py
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.21.3
+        uses: pypa/cibuildwheel@v2.22.0
         env:
           # FIXME: only run the slow tests when doing regular pushes, or manual - not for PRs
           CIBW_TEST_COMMAND: "pytest -v {package}/tests ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && '--runslow' || '' }}"

setup.py

@@ -280,7 +280,7 @@ def run(self):
        packages = ["PyPop", "PyPop.xslt"],
        package_data = {"PyPop.xslt": xslt_data_file_paths,
                        "PyPop": citation_data_file_paths},
-       install_requires = ["numpy <= 2.1.3",
+       install_requires = ["numpy <= 2.2.0",
                            "lxml <= 5.3.0",
                            "importlib-resources; python_version <= '3.8'",
                            "importlib-metadata; python_version <= '3.8'"],