From ee35ca4b189cb927e971abbe80d7cfa89975b295 Mon Sep 17 00:00:00 2001 From: Matthew Larson Date: Wed, 22 May 2024 14:22:13 -0500 Subject: [PATCH] Fix requests version in workflow --- .github/workflows/main.yml | 18 ++++++++++++++---- src/rest_vol_dataset.c | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc60dacf..032250f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,7 +119,12 @@ jobs: sudo apt update sudo apt install valgrind working-directory: ${{ github.workspace }} - + + # Requests 2.32.0 breaks requests-unixsocket, used by HSDS for socket connections + - name: Fix requests version + run: | + pip install requests==2.31.0 + - name: Start HSDS if: ${{ matrix.endpoint != 'http://127.0.0.1:5101'}} run: | @@ -133,7 +138,7 @@ jobs: ROOT_DIR=${{github.workspace}}/hsdadata ./runall.sh --no-docker 1 & sleep 10 working-directory: ${{github.workspace}}/hsds - + - name: Test HSDS if: ${{matrix.endpoint != 'http://127.0.0.1:5101'}} run: | @@ -240,7 +245,12 @@ jobs: sudo apt update sudo apt install valgrind working-directory: ${{ github.workspace }} - + + # Requests 2.32.0 breaks requests-unixsocket, used by HSDS for socket connections + - name: Fix requests version + run: | + pip install requests==2.31.0 + - name: Start HSDS if: ${{ matrix.endpoint != 'http://127.0.0.1:5101'}} run: | @@ -254,7 +264,7 @@ jobs: ROOT_DIR=${{github.workspace}}/hsdadata ./runall.sh --no-docker 1 & sleep 10 working-directory: ${{github.workspace}}/hsds - + - name: Test HSDS if: ${{matrix.endpoint != 'http://127.0.0.1:5101'}} run: | diff --git a/src/rest_vol_dataset.c b/src/rest_vol_dataset.c index 97ec85fb..b5fc7cbc 100644 --- a/src/rest_vol_dataset.c +++ b/src/rest_vol_dataset.c @@ -3973,7 +3973,7 @@ RV_setup_dataset_create_request_body(void *parent_obj, const char *name, hid_t t /*------------------------------------------------------------------------- * Function: RV_convert_point_selection_to_binary * - * Purpose: Given an HDF5 dataspace containin a point selection, + * Purpose: Given an HDF5 dataspace containing a point selection, * formats the selection within the * dataspace into either a binary representation. * This is currently used only for point reads.