Update to 3.2.1 (#1523904)

This commit is contained in:
Miro Hrončok 2018-03-20 00:28:19 +01:00
commit 7c49f4219a
4 changed files with 11 additions and 59 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@
/Uranium-2.7.0.tar.gz
/Uranium-3.0.3.tar.gz
/Uranium-3.1.0.tar.gz
/Uranium-3.2.1.tar.gz

View file

@ -1,52 +0,0 @@
From 4c94d254d7171d1d7df872eb2b5ea167861c6fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Sun, 10 Dec 2017 13:37:58 +0100
Subject: [PATCH] Fix failing test suite after 435285e
Fixes https://github.com/Ultimaker/Uranium/issues/319
---
tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py | 2 +-
tests/Settings/TestContainerRegistry.py | 2 +-
tests/Settings/TestContainerStack.py | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py
index 9af8e697b..bac029a89 100644
--- a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py
+++ b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py
@@ -83,7 +83,7 @@ def serialize(self, ignored_metadata_keys=[]):
## Deserializes the container from a string representation.
#
# This method is not implemented in the mock container.
- def deserialize(self, serialized):
+ def deserialize(self, serialized, file_name=None):
raise NotImplementedError()
def getConfigurationTypeFromSerialized(self, serialized):
diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py
index c7b6d7b0a..8daf837ae 100644
--- a/tests/Settings/TestContainerRegistry.py
+++ b/tests/Settings/TestContainerRegistry.py
@@ -107,7 +107,7 @@ def serialize(self, ignored_metadata_keys = None):
## Deserializes the container from a string representation.
#
# This method is not implemented in the mock container.
- def deserialize(self, serialized):
+ def deserialize(self, serialized, file_name=None):
raise NotImplementedError()
def getConfigurationTypeFromSerialized(self, serialized):
diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py
index 269f74174..4c10d944a 100644
--- a/tests/Settings/TestContainerStack.py
+++ b/tests/Settings/TestContainerStack.py
@@ -106,7 +106,8 @@ def serialize(self, ignored_metadata_keys = None):
# creates different instances (which is desired).
#
# \param serialized A serialised mock container.
- def deserialize(self, serialized):
+ # \param file_name Unused param to match actual signatures.
+ def deserialize(self, serialized, file_name=None):
self._id = int(serialized)
def getConfigurationTypeFromSerialized(self, serialized):

View file

@ -1,14 +1,11 @@
Name: python-uranium
Version: 3.1.0
Release: 2%{?dist}
Version: 3.2.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/pull/320
Patch0: Uranium-issue-319.patch
BuildRequires: python3-devel
BuildRequires: /usr/bin/doxygen
BuildRequires: /usr/bin/msgmerge
@ -60,7 +57,9 @@ related applications.
echo '# empty' >> UM/Settings/ContainerRegistryInterface.py
%build
%{cmake} .
# there is no arch specific content, so we set LIB_SUFFIX to nothing
# see https://github.com/Ultimaker/Uranium/commit/862a246bdfd7e25541b04a35406957612c6f4bb7
%{cmake} -DLIB_SUFFIX:STR= .
make %{?_smp_mflags}
make doc
@ -103,6 +102,10 @@ popd
%changelog
* Mon Mar 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-1
- Update to 3.2.1 (#1523904)
- Force install to /usr/lib and keep this noarch
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (Uranium-3.1.0.tar.gz) = 842b83d0d7275c276588ff0ef9fc136abcf738187f07ef5965810903537c033e1331d658a0c93afa1804c24352f4c4a045d671a7b57c201d090f745994ca3cfa
SHA512 (Uranium-3.2.1.tar.gz) = ab9ec136b2d0c0e78ff161cbbb4ef098e278f399f16d4e23317624392a9ac87b830d805b45c179ddc6e6dd97eacda768af1af5025669b5059c7a8a8f60b4cd57