From 2a6bb4c13b5e1cb7f33b1fafcd65c18547538e69 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 22 Jul 2024 13:45:11 +0100 Subject: [PATCH 1/4] replace with numpy 2 api --- pyfive/dataobjects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfive/dataobjects.py b/pyfive/dataobjects.py index dcdef0a..5d4b79e 100644 --- a/pyfive/dataobjects.py +++ b/pyfive/dataobjects.py @@ -187,7 +187,7 @@ def unpack_attribute(self, offset): # read in the dataspace information shape, maxshape = determine_data_shape(self.msg_data, offset) - items = int(np.product(shape)) + items = int(np.prod(shape)) offset += _padded_size(attr_dict['dataspace_size'], padding_multiple) # read in the value(s) From 376ad8b3ea958044f7e21e2495db66fba6fdb20d Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 22 Jul 2024 13:45:23 +0100 Subject: [PATCH 2/4] adjust local test --- .github/workflows/pytest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 6081f94..286242e 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -5,7 +5,7 @@ name: Python package on: push: - branches: [ master ] + branches: [ master, numpy_prod ] pull_request: branches: [ master ] @@ -30,6 +30,7 @@ jobs: python -m pip install flake8 pytest python -m pip install -e . if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + python -m pip list - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names From eb483f7c5e4ce1e5a40f7d6b1e1fd06fddd40f8e Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 22 Jul 2024 13:46:07 +0100 Subject: [PATCH 3/4] correct branch --- .github/workflows/pytest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 286242e..18bf5da 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -5,9 +5,9 @@ name: Python package on: push: - branches: [ master, numpy_prod ] + branches: [ master, issue60 ] pull_request: - branches: [ master ] + branches: [ master, issue60 ] jobs: build: From 8fec70b92feb24ee87bbc1e52686d2df062a00ae Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 22 Jul 2024 13:53:11 +0100 Subject: [PATCH 4/4] use just issue60 for GH testing at push --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 18bf5da..880a3a3 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -7,7 +7,7 @@ on: push: branches: [ master, issue60 ] pull_request: - branches: [ master, issue60 ] + branches: [ master ] jobs: build: