diff -pruN 1.0.1-1/CHANGELOG.rst 1.0.2-1/CHANGELOG.rst --- 1.0.1-1/CHANGELOG.rst 2022-06-27 07:26:03.000000000 +0000 +++ 1.0.2-1/CHANGELOG.rst 2022-08-02 09:33:39.000000000 +0000 @@ -1,5 +1,11 @@ Change Log ---------- +Version 1.0.2 (August 2nd, 2022): + +- Adapt boolean indexing as h5py 3.7.0 started supporting it. + By `Kai Mühlbauer `_. +- Fix several tests to work with new h5py 3.7.0. + By `Mark Harfouche `_ and `Kai Mühlbauer `_. Version 1.0.1 (June 27th, 2022): diff -pruN 1.0.1-1/debian/changelog 1.0.2-1/debian/changelog --- 1.0.1-1/debian/changelog 2022-06-27 08:44:56.000000000 +0000 +++ 1.0.2-1/debian/changelog 2022-08-03 12:29:18.000000000 +0000 @@ -1,3 +1,13 @@ +python-h5netcdf (1.0.2-1) unstable; urgency=medium + + * Team upload. + * New upstream release + - fixes use with h5py 3.7.0. Closes: #1016525. + - deprecates debian patch setuptools-scm.patch + * mark python-h5netcdf-doc as Multi-Arch: foreign + + -- Drew Parsons Wed, 03 Aug 2022 14:29:18 +0200 + python-h5netcdf (1.0.1-1) unstable; urgency=medium * Team upload. diff -pruN 1.0.1-1/debian/control 1.0.2-1/debian/control --- 1.0.1-1/debian/control 2022-06-27 08:44:56.000000000 +0000 +++ 1.0.2-1/debian/control 2022-08-03 12:29:18.000000000 +0000 @@ -32,6 +32,7 @@ Description: netCDF4 support via h5py fo Package: python-h5netcdf-doc Architecture: all +Multi-Arch: foreign Section: doc Depends: ${misc:Depends}, ${python3:Depends}, diff -pruN 1.0.1-1/debian/patches/series 1.0.2-1/debian/patches/series --- 1.0.1-1/debian/patches/series 2022-06-27 08:44:56.000000000 +0000 +++ 1.0.2-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -setuptools-scm.patch diff -pruN 1.0.1-1/debian/patches/setuptools-scm.patch 1.0.2-1/debian/patches/setuptools-scm.patch --- 1.0.1-1/debian/patches/setuptools-scm.patch 2022-06-27 08:44:56.000000000 +0000 +++ 1.0.2-1/debian/patches/setuptools-scm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Don't use setuptools_scm, _version.py already exists. -Author: Bas Couwenberg -Forwarded: not-needed - ---- a/setup.py -+++ b/setup.py -@@ -34,7 +34,6 @@ setup( - author_email="devteam@h5netcdf.org", - url="https://h5netcdf.org", - python_requires=">=3.6", -- setup_requires=["setuptools_scm"], - install_requires=["h5py", "packaging"], - tests_require=["netCDF4", "pytest"], - packages=find_packages(), ---- a/h5netcdf/_version.py -+++ b/h5netcdf/_version.py -@@ -1,5 +1,5 @@ - # coding: utf-8 - # file generated by setuptools_scm - # don't change, don't track in version control --__version__ = version = '1.0.1' --__version_tuple__ = version_tuple = (1, 0, 1) -+version = '1.0.1' -+version_tuple = (1, 0, 1) diff -pruN 1.0.1-1/doc/devguide.rst 1.0.2-1/doc/devguide.rst --- 1.0.1-1/doc/devguide.rst 2022-06-27 07:26:03.000000000 +0000 +++ 1.0.2-1/doc/devguide.rst 2022-08-02 09:33:39.000000000 +0000 @@ -11,6 +11,7 @@ Contributors ------------ - `Aleksandar Jelenak `_ +- `Bas Couwenberg `_. - `Brett Naul `_ - `Dion Häfner `_ - `Drew Parsons `_ diff -pruN 1.0.1-1/doc/feature.rst 1.0.2-1/doc/feature.rst --- 1.0.1-1/doc/feature.rst 2022-06-27 07:26:03.000000000 +0000 +++ 1.0.2-1/doc/feature.rst 2022-08-02 09:33:39.000000000 +0000 @@ -14,7 +14,7 @@ differences which are outlined in the fo +---------------------+-------------------------+----------------+------------------+ | feature | legacyapi | new api | type | +=====================+=========================+================+==================+ -| 1D boolean indexer | |check| | |cross| | Variable/Dataset | +| 1D boolean indexer | |check| | |check| | Variable/Dataset | +---------------------+-------------------------+----------------+------------------+ | resize on write | |check| | |cross| | Dimension | | | | | Variable/Dataset | diff -pruN 1.0.1-1/doc/index.rst 1.0.2-1/doc/index.rst --- 1.0.1-1/doc/index.rst 2022-06-27 07:26:03.000000000 +0000 +++ 1.0.2-1/doc/index.rst 2022-08-02 09:33:39.000000000 +0000 @@ -50,7 +50,7 @@ by Stephan Hoyer. The first `official` ` `xarray issue tracker`_ only one day later. The library evolved constantly over the years (fixing bugs and adding enhancements) -and gained contributions from 14 other :ref:`contributors` so far. The library is widely used, +and gained contributions from 15 other :ref:`contributors` so far. The library is widely used, especially as backend within `xarray`_. Early 2020 Kai Mühlbauer started to add contributions and after some time he volunteered diff -pruN 1.0.1-1/h5netcdf/core.py 1.0.2-1/h5netcdf/core.py --- 1.0.1-1/h5netcdf/core.py 2022-06-27 07:26:03.000000000 +0000 +++ 1.0.2-1/h5netcdf/core.py 2022-08-02 09:33:39.000000000 +0000 @@ -280,7 +280,12 @@ class BaseVariable(object): if isinstance(self._parent._root, Dataset): # this is only for legacyapi key = _expanded_indexer(key, self.ndim) - key = _transform_1d_boolean_indexers(key) + # fix boolean indexing for affected versions + # https://github.com/h5py/h5py/pull/2079 + # https://github.com/h5netcdf/h5netcdf/pull/125/ + h5py_version = version.parse(h5py.__version__) + if version.parse("3.0.0") <= h5py_version < version.parse("3.7.0"): + key = _transform_1d_boolean_indexers(key) if getattr(self._root, "decode_vlen_strings", False): string_info = self._root._h5py.check_string_dtype(self._h5ds.dtype) diff -pruN 1.0.1-1/h5netcdf/tests/test_h5netcdf.py 1.0.2-1/h5netcdf/tests/test_h5netcdf.py --- 1.0.1-1/h5netcdf/tests/test_h5netcdf.py 2022-06-27 07:26:03.000000000 +0000 +++ 1.0.2-1/h5netcdf/tests/test_h5netcdf.py 2022-08-02 09:33:39.000000000 +0000 @@ -1600,7 +1600,8 @@ def test_more_than_7_attr_creation(tmp_l # https://github.com/h5netcdf/h5netcdf/issues/136#issuecomment-1017457067 @pytest.mark.parametrize("track_order", [False, True]) def test_more_than_7_attr_creation_track_order(tmp_local_netcdf, track_order): - if track_order: + h5py_version = version.parse(h5py.__version__) + if track_order and h5py_version < version.parse("3.7.0"): expected_errors = pytest.raises(KeyError) else: # We don't expect any errors. This is effectively a void context manager @@ -1695,9 +1696,12 @@ def test_bool_slicing_length_one_dim(tmp data = ds["hello"][bool_slice, :] np.testing.assert_equal(data, np.zeros((1, 2))) - # should raise for h5py >= 3.0.0 + # should raise for h5py >= 3.0.0 and h5py < 3.7.0 + # https://github.com/h5py/h5py/pull/2079 + # https://github.com/h5netcdf/h5netcdf/pull/125/ with h5netcdf.File(tmp_local_netcdf, "r") as ds: - if version.parse(h5py.__version__) >= version.parse("3.0.0"): + h5py_version = version.parse(h5py.__version__) + if version.parse("3.0.0") <= h5py_version < version.parse("3.7.0"): error = "Indexing arrays must have integer dtypes" with pytest.raises(TypeError) as e: ds["hello"][bool_slice, :] diff -pruN 1.0.1-1/h5netcdf/_version.py 1.0.2-1/h5netcdf/_version.py --- 1.0.1-1/h5netcdf/_version.py 2022-06-27 07:26:18.000000000 +0000 +++ 1.0.2-1/h5netcdf/_version.py 2022-08-02 09:34:00.000000000 +0000 @@ -1,5 +1,5 @@ # coding: utf-8 # file generated by setuptools_scm # don't change, don't track in version control -__version__ = version = '1.0.1' -__version_tuple__ = version_tuple = (1, 0, 1) +__version__ = version = '1.0.2' +__version_tuple__ = version_tuple = (1, 0, 2) diff -pruN 1.0.1-1/h5netcdf.egg-info/PKG-INFO 1.0.2-1/h5netcdf.egg-info/PKG-INFO --- 1.0.1-1/h5netcdf.egg-info/PKG-INFO 2022-06-27 07:26:19.000000000 +0000 +++ 1.0.2-1/h5netcdf.egg-info/PKG-INFO 2022-08-02 09:34:00.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: h5netcdf -Version: 1.0.1 +Version: 1.0.2 Summary: netCDF4 via h5py Home-page: https://h5netcdf.org Author: h5netcdf developers diff -pruN 1.0.1-1/PKG-INFO 1.0.2-1/PKG-INFO --- 1.0.1-1/PKG-INFO 2022-06-27 07:26:19.558160000 +0000 +++ 1.0.2-1/PKG-INFO 2022-08-02 09:34:00.711885000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: h5netcdf -Version: 1.0.1 +Version: 1.0.2 Summary: netCDF4 via h5py Home-page: https://h5netcdf.org Author: h5netcdf developers