Merge remote-tracking branch 'origin/master' into section-change-error

BlueBrain · Oct 4, 2024 · 85344eb · 85344eb
2 parents 11da3be + 04f2274
commit 85344eb
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/.github/workflows/check-sdist.yml b/.github/workflows/check-sdist.yml
@@ -13,12 +13,12 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/.github/workflows/clang_format_check.yaml b/.github/workflows/clang_format_check.yaml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
         - name: Fetch repository
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
           with:
              fetch-depth: 2
         - name: Install packages

diff --git a/.github/workflows/coverage_test.yaml b/.github/workflows/coverage_test.yaml
@@ -16,8 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
       - name: Fetch repository
         run: git fetch --prune --unshallow
 

diff --git a/.github/workflows/docstring_check.yaml b/.github/workflows/docstring_check.yaml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Fetch repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install packages

diff --git a/.github/workflows/publish-sdist-wheels.yml b/.github/workflows/publish-sdist-wheels.yml
@@ -4,9 +4,9 @@ on: [pull_request, push]
 env:
   apt_options: -o Acquire::Retries=3
 
-  CIBW_BUILD_VERBOSITY: 3
+  CIBW_BUILD_VERBOSITY: 1
   CIBW_BUILD: 'cp*'
-  CIBW_SKIP: 'cp35-* cp36-* cp37-* *-manylinux_i686 *-musllinux_* *-win32'
+  CIBW_SKIP: 'cp35-* cp36-* cp37-* cp313-* *-manylinux_i686 *-musllinux_* *-win32'
   CIBW_BEFORE_TEST: pip install -r {project}/tests/requirement_tests.txt
   CIBW_TEST_COMMAND: pytest -s -v {project}/tests
   UNIXY_HDF5_VERSION: 1.14.3
@@ -21,15 +21,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11, windows-2022]
+        os: [ubuntu-20.04, macos-12, windows-2022]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 
@@ -61,7 +61,7 @@ jobs:
         run: |
           # used by setup.py to decide if to set `FindHDF5` to use static hdf5 libraries
           export STATIC_HDF5=True
-          export CMAKE_PREFIX_PATH=/opt/hdf5-static/install-/install/
+          export CMAKE_PREFIX_PATH=/opt/hdf5-static/install-x86_64/install/
 
           CIBW_MANYLINUX_X86_64_IMAGE=manylinux2014 python -m cibuildwheel --output-dir dist
           CIBW_MANYLINUX_X86_64_IMAGE=manylinux_2_28 python -m cibuildwheel --output-dir dist
@@ -149,9 +149,9 @@ jobs:
           python -m cibuildwheel --output-dir dist
 
       - name: Store wheel as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-wheels-${{ matrix.os }}
           path: dist/*.whl
 
   build_sdist:
@@ -160,12 +160,12 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
@@ -182,9 +182,9 @@ jobs:
           pytest -s -v tests
 
       - name: Store sdist as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-sdist
           path: dist/*.tar.gz
 
   upload_artifacts:
@@ -196,10 +196,11 @@ jobs:
 
     steps:
       - name: Download artifacts produced during the build_wheels and build_sdist jobs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: dist
+          name: dist-*
           path: dist/
+          merge-multiple: true
 
       - name: Display structure of downloaded files
         run: ls -R

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -24,12 +24,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'true'
 
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/ci/hdf5-build.sh b/ci/hdf5-build.sh
@@ -1,18 +1,19 @@
 #!/bin/bash
 set -e -x
 
+: "${UNIXY_HDF5_VERSION:=1.14.3}"
+: "${CIBW_ARCHS_MACOS:=$(uname -m)}"
 
 export INPUT=$(cd $(dirname "$1") && pwd -P)/$(basename "$1")
 export OUTPUT="$INPUT/install-$CIBW_ARCHS_MACOS"
 
-: "${UNIXY_HDF5_VERSION:=1.14.3}"
 
 function download_unpack_hdf5 {
     pushd "$INPUT"
     local name=CMake-hdf5-$UNIXY_HDF5_VERSION.tar.gz
     if [[ ! -e $name ]]; then
         echo "Downloading & unpacking HDF5 ${UNIXY_HDF5_VERSION}"
-        curl -fsSLO "https://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${UNIXY_HDF5_VERSION%.*}/hdf5-$UNIXY_HDF5_VERSION/src/$name"
+        curl -fsSLO "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${UNIXY_HDF5_VERSION%.*}/hdf5-$UNIXY_HDF5_VERSION/src/$name"
     fi
     tar xzf "$name"
     popd