From 94a014e58aa775a27ab10f683923025bc5c30fa7 Mon Sep 17 00:00:00 2001 From: Alessio Date: Aug 08 2022 09:26:21 +0000 Subject: Merge branch 'f36' into rawhide --- diff --git a/.gitignore b/.gitignore index 1356b65..a3854d0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /pynetdicom-1.5.7.tar.gz /pynetdicom-2.0.0.tar.gz /pynetdicom-2.0.1.tar.gz +/pynetdicom-2.0.2.tar.gz diff --git a/774.patch b/774.patch new file mode 100644 index 0000000..706305d --- /dev/null +++ b/774.patch @@ -0,0 +1,13 @@ +diff --git a/pynetdicom/tests/test_dimse_n.py b/pynetdicom/tests/test_dimse_n.py +index 2237e288b..c0c191dbc 100644 +--- a/pynetdicom/tests/test_dimse_n.py ++++ b/pynetdicom/tests/test_dimse_n.py +@@ -385,7 +385,7 @@ def test_assignment(self): + primitive.AttributeIdentifierList = (0x7FE0, 0x0010) + assert Tag(0x7FE0, 0x0010) == primitive.AttributeIdentifierList + +- elem = DataElement((0x0000, 0x0005), "AT", [Tag(0x0000, 0x1000)]) ++ elem = DataElement((0x0000, 0x0005), "AT", Tag(0x0000, 0x1000)) + assert isinstance(elem.value, BaseTag) + primitive.AttributeIdentifierList = elem.value + assert Tag(0x0000, 0x1000) == primitive.AttributeIdentifierList diff --git a/python-pynetdicom.spec b/python-pynetdicom.spec index af1e445..7bccb20 100644 --- a/python-pynetdicom.spec +++ b/python-pynetdicom.spec @@ -6,11 +6,11 @@ networking protocol. Working with pydicom, it allows the easy creation of DICOM Service Class Users (SCUs) and Service Class Providers (SCPs).} Name: python-pynetdicom -Version: 2.0.1 +Version: 2.0.2 %forgemeta -Release: 5%{?dist} +Release: 1%{?dist} Summary: A Python implementation of the DICOM networking protocol License: MIT and (BSD or ASL 2.0) @@ -41,6 +41,13 @@ Patch0: %{forgeurl}/pull/754.patch # Test failures on s390x: endianness bug # https://bugzilla.redhat.com/show_bug.cgi?id=2064737 Patch1: %{forgeurl}/pull/756.patch +# [MRG] Fix test missed when updating for pydicom changes +# +# Fixes: +# +# TestPrimitive_N_GET::test_assignment failed +# https://github.com/pydicom/pynetdicom/issues/773 +Patch2: 774.patch BuildArch: noarch @@ -109,6 +116,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitelib} %{__python3} -m pytest --deselect=pyn %doc docs/_build/html %changelog +* Fri Aug 05 2022 Alessio - 2.0.2-1 +- Update to 2.0.2 + * Fri Jul 22 2022 Fedora Release Engineering - 2.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -174,7 +184,7 @@ PYTHONPATH=%{buildroot}/%{python3_sitelib} %{__python3} -m pytest --deselect=pyn * Mon Jun 01 2020 Alessio - 1.5.0-1 - 1.5.0 release -* Tue May 26 2020 Miro Hrončok - 1.4.1-3 +* Tue May 26 2020 Miro HronĨok - 1.4.1-3 - Rebuilt for Python 3.9 * Thu Jan 30 2020 Fedora Release Engineering - 1.4.1-2 @@ -182,3 +192,4 @@ PYTHONPATH=%{buildroot}/%{python3_sitelib} %{__python3} -m pytest --deselect=pyn * Mon Sep 30 2019 Alessio - 1.4.1-1 - Initial package + diff --git a/sources b/sources index 9fee36c..e1bfdf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pynetdicom-2.0.1.tar.gz) = 1e9e67a4d9adce2416d577876054181b84a605ea2a0fecb37e0bd17bd7cb69b7e7de6a17b4fb11543970d1a78952a5905af57c4da0f0b7f8efc74a866832d268 +SHA512 (pynetdicom-2.0.2.tar.gz) = e31021a5cc665d7f74f225a13aa1fc40c3901f31c87c3a4cefdc4846b6cb628c5cb5e38705fa1726ba093f5c3d620501bdc678bd7b1cd4c25039dd191b3fc61c