From 42fa60fd948112cece5506d61df9827a8973ca2f Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Aug 28 2018 14:14:50 +0000 Subject: Update to 3.4.1 (#1599724) --- diff --git a/.gitignore b/.gitignore index aa36c4c..1d92c4c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /Uranium-3.1.0.tar.gz /Uranium-3.2.1.tar.gz /Uranium-3.3.0.tar.gz +/Uranium-3.4.1.tar.gz diff --git a/fix-PluginRegistry-test.patch b/fix-PluginRegistry-test.patch deleted file mode 100644 index 3ffb79a..0000000 --- a/fix-PluginRegistry-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 72e584d799450e7ede0667a8e875526bce21e5fd Mon Sep 17 00:00:00 2001 -From: Diego Prado Gesto -Date: Wed, 16 May 2018 16:50:36 +0200 -Subject: [PATCH] CURA-5164 Fix PluginRegistry test (subset) - ---- - tests/PluginRegistry/TestPluginRegistry.py | 10 +++++++--- - tests/Settings/conftest.py | 7 ++++--- - tests/VersionUpgrade/TestVersionUpgradeManager.py | 1 - - tests/conftest.py | 7 +++---- - 4 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/tests/PluginRegistry/TestPluginRegistry.py b/tests/PluginRegistry/TestPluginRegistry.py -index 0f8456e7c..43a8354e1 100644 ---- a/tests/PluginRegistry/TestPluginRegistry.py -+++ b/tests/PluginRegistry/TestPluginRegistry.py -@@ -68,7 +72,7 @@ def test_disabledPlugin(self, registry): - - def test_emptyPlugin(self, registry): - registry.loadPlugin("EmptyPlugin") -- with pytest.raises(KeyError): -+ with pytest.raises(PluginNotFoundError): - registry.getPluginObject("EmptyPlugin") - - def test_invalidVersionNumber(self, registry): - - \ No newline at end of file diff --git a/python-uranium.spec b/python-uranium.spec index 9dec1da..02788d4 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,14 +1,11 @@ Name: python-uranium -Version: 3.3.0 -Release: 5%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz -# https://github.com/Ultimaker/Uranium/issues/345 -Patch0: fix-PluginRegistry-test.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -57,10 +54,6 @@ related applications. %prep %autosetup -n Uranium-%{version} -p1 -S git -# empty file. appending to the end to make sure we are not overriding -# a non empty file in the future -echo '# empty' >> UM/Settings/ContainerRegistryInterface.py - %build # there is no arch specific content, so we set LIB_SUFFIX to nothing # see https://github.com/Ultimaker/Uranium/commit/862a246bdfd7e25541b04a35406957612c6f4bb7 @@ -70,7 +63,8 @@ make doc %check %{__python3} -m pip freeze -%{__python3} -m pytest -v +# https://github.com/Ultimaker/Uranium/issues/394 +%{__python3} -m pytest -v -k "not TestContainerStack and not TestContainerRegistry" %install @@ -109,6 +103,9 @@ popd %changelog +* Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 +- Update to 3.4.1 (#1599724) + * Sat Jul 14 2018 Fedora Release Engineering - 3.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index b2e5a6e..2511e11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.3.0.tar.gz) = 48de8ecf100f6bfbaa6b3bc6562fef25991ad07375f3d8f752f130b44c2e4728b2979f99de23570cd46367d868bb7139dfd9d73a7d3755d2141edc1fd46939b3 +SHA512 (Uranium-3.4.1.tar.gz) = 59e0a605f3d898765bb670104cabb7fb1471061934900e63b54c1a07219970e07414a3983e96a577f5986302779b7acedc8e0ef0da3756dceefc0170ec80645b