diff --git a/.gitignore b/.gitignore index a3b7985..2d3d01c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /hdmf-2.0.1.tar.gz /hdmf-2.1.0.tar.gz /hdmf-2.4.0.tar.gz +/hdmf-3.1.1.tar.gz diff --git a/0001-test_labelleddict.patch b/0001-test_labelleddict.patch new file mode 100644 index 0000000..9ed21d0 --- /dev/null +++ b/0001-test_labelleddict.patch @@ -0,0 +1,13 @@ +Only in hdmf-3.1.1/: .mypy_cache +diff -ur hdmf-3.1.1.orig/tests/unit/utils_test/test_labelleddict.py hdmf-3.1.1/tests/unit/utils_test/test_labelleddict.py +--- hdmf-3.1.1.orig/tests/unit/utils_test/test_labelleddict.py 2021-08-16 19:08:03.569499506 +0100 ++++ hdmf-3.1.1/tests/unit/utils_test/test_labelleddict.py 2021-08-16 19:08:21.805187946 +0100 +@@ -33,7 +33,7 @@ + def test_set_key_attr(self): + """Test that the key attribute cannot be set after initialization.""" + ld = LabelledDict(label='all_objects') +- with self.assertRaisesWith(AttributeError, "can't set attribute"): ++ with self.assertRaisesRegex(AttributeError, "can't set attribute"): + ld.key_attr = 'another_name' + + def test_getitem_unknown_val(self): diff --git a/python-hdmf.spec b/python-hdmf.spec index 6562b6a..23c0009 100644 --- a/python-hdmf.spec +++ b/python-hdmf.spec @@ -1,9 +1,7 @@ # XXX: note for maintainers # Do NOT update HDMF without checking if packages that depend on it, for example python-pynwb can be installed with the new version -# Have a few failures related to h5py -# Issue filed: https://github.com/hdmf-dev/hdmf/issues/563 -%bcond_with tests +%bcond_without tests %global desc %{expand: \ The Hierarchical Data Modeling Framework The Hierarchical Data Modeling @@ -18,12 +16,14 @@ https://hdmf.readthedocs.io} %global pypi_name hdmf Name: python-%{pypi_name} -Version: 2.4.0 -Release: 4%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: A package for standardizing hierarchical object data License: BSD URL: https://github.com/hdmf-dev/hdmf Source0: %{url}/releases/download/%{version}/%{pypi_name}-%{version}.tar.gz +# https://github.com/hdmf-dev/hdmf/issues/663 +Patch0: 0001-test_labelleddict.patch BuildArch: noarch %{?python_enable_dependency_generator} @@ -48,7 +48,6 @@ BuildRequires: python3-tox %package -n python3-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} %description -n python3-%{pypi_name} %{desc} @@ -65,7 +64,7 @@ Documentation for %{name}. %endif %prep -%autosetup -n %{pypi_name}-%{version} +%autosetup -n %{pypi_name}-%{version} -S patch -p1 # Remove bundled egg-info rm -rf %{pypi_name}.egg-info @@ -101,6 +100,10 @@ PYTHONPATH=%{buildroot}/%{python3_sitelib} %{__python3} test.py %endif %changelog +* Mon Aug 16 2021 Ankur Sinha - 3.1.1-1 +- Update to latest release +- Enable tests + * Fri Jul 23 2021 Fedora Release Engineering - 2.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index bd193cc..19a9b48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hdmf-2.4.0.tar.gz) = 7f2a7e66f0f90d237a256a89625a0025e72c56451935a2a2b31882b97857690c41e946df9da3fbabcbb656b1860c0483a81abc2fdb92a56cbf67d3afc366116c +SHA512 (hdmf-3.1.1.tar.gz) = 41776932b1150126a162e9f87072d6626a28bb3f0e05f75337e4f6529c27005ca9db932fdff0c45bb16cbebf68388c7cbf575bbd17950c29c300702a37afacf0