From 7934860341054abaf8b87939efa29d6896e85359 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca <14138589+paskino@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:48:07 +0100 Subject: [PATCH] deleted conda_build_config.yaml (#418) * deleted conda_build_config.yaml * remove python pinning from recipe * fix for numpy 2 --- CHANGELOG.md | 7 +++++++ Wrappers/Python/ccpi/viewer/utils/io.py | 2 +- Wrappers/Python/conda-recipe/conda_build_config.yaml | 5 ----- Wrappers/Python/conda-recipe/meta.yaml | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 Wrappers/Python/conda-recipe/conda_build_config.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 39829f92..545315c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v24.0.1 + +Build and CI: + - removed python pinning from conda recipe +Bugfix: + - removed deprecated code by numpy v2.0 + ## v24.0.0 New functionality: diff --git a/Wrappers/Python/ccpi/viewer/utils/io.py b/Wrappers/Python/ccpi/viewer/utils/io.py index f399cfe9..248b10f6 100644 --- a/Wrappers/Python/ccpi/viewer/utils/io.py +++ b/Wrappers/Python/ccpi/viewer/utils/io.py @@ -766,7 +766,7 @@ def Write(self): f.attrs['file_name'] = self._FileName #f.attrs['viewer_version'] = version f.attrs['file_time'] = str(datetime.datetime.utcnow()) - f.attrs['creator'] = np.string_('io.py') + f.attrs['creator'] = np.bytes_('io.py') f.attrs['HDF5_Version'] = h5py.version.hdf5_version f.attrs['h5py_version'] = h5py.version.version diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml deleted file mode 100644 index 69378d13..00000000 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -python: - - 3.8 - - 3.9 - - 3.10 - - 3.11 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 030bd475..17a51c51 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -27,11 +27,11 @@ test: requirements: build: - - python {{ python }} + - python >=3.7 - vtk run: - - python {{ python }} + - python >=3.7 - numpy - vtk - pyside2