From 8f5b92c4689f367d18161f3051715e6229b9c1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 10 Dec 2017 13:54:55 +0100 Subject: [PATCH 01/79] Update to 3.1.0 (#1523904) --- .gitignore | 1 + python-uranium.spec | 21 +++++++++++---------- sources | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index fd7e45d..01387b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Uranium-2.6.1.tar.gz /Uranium-2.7.0.tar.gz /Uranium-3.0.3.tar.gz +/Uranium-3.1.0.tar.gz diff --git a/python-uranium.spec b/python-uranium.spec index 70a8189..ddca5d2 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,11 +1,14 @@ Name: python-uranium -Version: 3.0.3 +Version: 3.1.0 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 @@ -52,10 +55,6 @@ related applications. %prep %autosetup -n Uranium-%{version} -p1 -S git -# Upstream installs to lib/python3/dist-packages -# We want to install to %%{python3_sitelib} -sed -i 's|lib/python${PYTHON_VERSION_MAJOR}/dist-packages|%(echo %{python3_sitelib} | sed -e s@%{_prefix}/@@)|g' CMakeLists.txt - # 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 @@ -68,11 +67,7 @@ make doc %check pip3 freeze - -# The failing tests are reported at: -# https://github.com/Ultimaker/Uranium/issues/225 -# Skipping -%{__python3} -m pytest -v -k "not getMimeTypeForFile" +%{__python3} -m pytest -v %install @@ -108,6 +103,12 @@ popd %changelog +* Sun Dec 10 2017 Miro Hrončok - 3.1.0-1 +- Update to 3.1.0 (#1523904) +- No need to sed dist-packages out anymore +- getMimeTypeForFile fails no more +- but some others tests are, add a fix + * Fri Oct 20 2017 Charalampos Stratakis - 3.0.3-1 - Update to 3.0.3 (#1504439) diff --git a/sources b/sources index 225e256..97acf4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.0.3.tar.gz) = 6afc6f186b1ead6d71c9616abad487ac4d5894aa8ebd4b642680186eaac0ad5cce5aa3491b73c3f565acb2ec3faf2afc1d58ed096b2077d6094278b1d0ab0060 +SHA512 (Uranium-3.1.0.tar.gz) = 842b83d0d7275c276588ff0ef9fc136abcf738187f07ef5965810903537c033e1331d658a0c93afa1804c24352f4c4a045d671a7b57c201d090f745994ca3cfa From 7744dc6482e8688efc8776ed309e24f6ea6806c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 10 Dec 2017 14:01:51 +0100 Subject: [PATCH 02/79] Add missing patch --- Uranium-issue-319.patch | 52 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 Uranium-issue-319.patch diff --git a/Uranium-issue-319.patch b/Uranium-issue-319.patch new file mode 100644 index 0000000..0561b2f --- /dev/null +++ b/Uranium-issue-319.patch @@ -0,0 +1,52 @@ +From 4c94d254d7171d1d7df872eb2b5ea167861c6fc5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +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): From ed2a371befdd66e43446b779b1ca954d6a4d004e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 11:29:30 +0000 Subject: [PATCH 03/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index ddca5d2..9e328e1 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 3.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -103,6 +103,9 @@ popd %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Dec 10 2017 Miro Hrončok - 3.1.0-1 - Update to 3.1.0 (#1523904) - No need to sed dist-packages out anymore From 7c49f4219a6f517b49621c66810cbbc59f9c4f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 20 Mar 2018 00:28:19 +0100 Subject: [PATCH 04/79] Update to 3.2.1 (#1523904) --- .gitignore | 1 + Uranium-issue-319.patch | 52 ----------------------------------------- python-uranium.spec | 15 +++++++----- sources | 2 +- 4 files changed, 11 insertions(+), 59 deletions(-) delete mode 100644 Uranium-issue-319.patch diff --git a/.gitignore b/.gitignore index 01387b2..5888a2a 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Uranium-issue-319.patch b/Uranium-issue-319.patch deleted file mode 100644 index 0561b2f..0000000 --- a/Uranium-issue-319.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4c94d254d7171d1d7df872eb2b5ea167861c6fc5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -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): diff --git a/python-uranium.spec b/python-uranium.spec index 9e328e1..f442daf 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -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 - 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 - 3.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 97acf4b..dae7ef2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.1.0.tar.gz) = 842b83d0d7275c276588ff0ef9fc136abcf738187f07ef5965810903537c033e1331d658a0c93afa1804c24352f4c4a045d671a7b57c201d090f745994ca3cfa +SHA512 (Uranium-3.2.1.tar.gz) = ab9ec136b2d0c0e78ff161cbbb4ef098e278f399f16d4e23317624392a9ac87b830d805b45c179ddc6e6dd97eacda768af1af5025669b5059c7a8a8f60b4cd57 From 00326a6960c08ff2062b566f05f8e7bcd7820aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 May 2018 15:14:32 +0200 Subject: [PATCH 05/79] Update to 3.3.0 (#1571792) --- .gitignore | 1 + python-uranium.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5888a2a..aa36c4c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Uranium-3.0.3.tar.gz /Uranium-3.1.0.tar.gz /Uranium-3.2.1.tar.gz +/Uranium-3.3.0.tar.gz diff --git a/python-uranium.spec b/python-uranium.spec index f442daf..d1c1aa4 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 3.2.1 +Version: 3.3.0 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -66,7 +66,8 @@ make doc %check pip3 freeze -%{__python3} -m pytest -v +# https://github.com/Ultimaker/Uranium/issues/345 +%{__python3} -m pytest -v -k "not test_emptyPlugin" %install @@ -102,6 +103,10 @@ popd %changelog +* Wed May 02 2018 Miro Hrončok - 3.3.0-1 +- Update to 3.3.0 (#1571792) +- Skip test_emptyPlugin + * Mon Mar 19 2018 Miro Hrončok - 3.2.1-1 - Update to 3.2.1 (#1523904) - Force install to /usr/lib and keep this noarch diff --git a/sources b/sources index dae7ef2..b2e5a6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.2.1.tar.gz) = ab9ec136b2d0c0e78ff161cbbb4ef098e278f399f16d4e23317624392a9ac87b830d805b45c179ddc6e6dd97eacda768af1af5025669b5059c7a8a8f60b4cd57 +SHA512 (Uranium-3.3.0.tar.gz) = 48de8ecf100f6bfbaa6b3bc6562fef25991ad07375f3d8f752f130b44c2e4728b2979f99de23570cd46367d868bb7139dfd9d73a7d3755d2141edc1fd46939b3 From b0d71399a2d69e677c592b79425112e359f1e0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 28 May 2018 10:16:23 +0200 Subject: [PATCH 06/79] Fix PluginRegistry test --- fix-PluginRegistry-test.patch | 27 +++++++++++++++++++++++++++ python-uranium.spec | 11 ++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 fix-PluginRegistry-test.patch diff --git a/fix-PluginRegistry-test.patch b/fix-PluginRegistry-test.patch new file mode 100644 index 0000000..3ffb79a --- /dev/null +++ b/fix-PluginRegistry-test.patch @@ -0,0 +1,27 @@ +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 d1c1aa4..a5d4549 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,11 +1,14 @@ Name: python-uranium Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?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: /usr/bin/doxygen BuildRequires: /usr/bin/msgmerge @@ -66,8 +69,7 @@ make doc %check pip3 freeze -# https://github.com/Ultimaker/Uranium/issues/345 -%{__python3} -m pytest -v -k "not test_emptyPlugin" +%{__python3} -m pytest -v %install @@ -103,6 +105,9 @@ popd %changelog +* Mon May 28 2018 Miro Hrončok - 3.3.0-2 +- Fix PluginRegistry test + * Wed May 02 2018 Miro Hrončok - 3.3.0-1 - Update to 3.3.0 (#1571792) - Skip test_emptyPlugin From 89052d21c53bfd0e607992d199f34d6e443a0331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 7 Jun 2018 13:15:42 +0200 Subject: [PATCH 07/79] Bytecompile the plugins explicitly --- python-uranium.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index a5d4549..df75fba 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -25,8 +25,7 @@ BuildRequires: python3-pytest BuildArch: noarch # There are Python plugins in /usr/lib/uranium -# We need to byte-compile it with Python 3 -%global __python %{__python3} +%global _python_bytecompile_extra 0 %description Uranium is a Python framework for building 3D printing related applications. @@ -86,6 +85,9 @@ rm locale/uranium.pot rm locale/*/uranium.po popd +# Bytecompile the plugins +%py_byte_compile %{__python3} %{buildroot}%{_prefix}/lib/uranium + %find_lang uranium @@ -105,6 +107,9 @@ popd %changelog +* Thu Jun 07 2018 Miro Hrončok - 3.3.0-3 +- Bytecompile the plugins explicitly + * Mon May 28 2018 Miro Hrončok - 3.3.0-2 - Fix PluginRegistry test From 9acd39c9185d78e2f7331e711082c0d858c1cb80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 17 Jun 2018 16:19:17 +0200 Subject: [PATCH 08/79] Add back __python definition for backwards compatibility --- python-uranium.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-uranium.spec b/python-uranium.spec index df75fba..13c81ba 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -26,6 +26,8 @@ BuildArch: noarch # There are Python plugins in /usr/lib/uranium %global _python_bytecompile_extra 0 +# For backwards compatibility (not needed on F29+): +%global __python %{__python3} %description Uranium is a Python framework for building 3D printing related applications. From 019141572bc78a6f364037e4128a5ce33bac3635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:23:16 +0200 Subject: [PATCH 09/79] Rebuilt for Python 3.7 --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 13c81ba..2918727 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 3.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Tue Jun 19 2018 Miro Hrončok - 3.3.0-4 +- Rebuilt for Python 3.7 + * Thu Jun 07 2018 Miro Hrončok - 3.3.0-3 - Bytecompile the plugins explicitly From 2a9081628bfec856548986a9644a28c8f4273016 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 02:30:57 +0000 Subject: [PATCH 10/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 2918727..6c309e3 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 3.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 3.3.0-4 - Rebuilt for Python 3.7 From b1418928b8a2cd0330f0b9c434fed095517fa022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 23 Aug 2018 17:08:04 +0200 Subject: [PATCH 11/79] Fix BRs --- python-uranium.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 6c309e3..9dec1da 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -10,10 +10,11 @@ Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz Patch0: fix-PluginRegistry-test.patch BuildRequires: python3-devel +BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen BuildRequires: /usr/bin/msgmerge BuildRequires: cmake -BuildRequires: git +BuildRequires: git-core # Tests BuildRequires: python3-arcus == %{version} @@ -68,8 +69,7 @@ make %{?_smp_mflags} make doc %check -pip3 freeze - +%{__python3} -m pip freeze %{__python3} -m pytest -v From 42fa60fd948112cece5506d61df9827a8973ca2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 28 Aug 2018 16:14:50 +0200 Subject: [PATCH 12/79] Update to 3.4.1 (#1599724) --- .gitignore | 1 + fix-PluginRegistry-test.patch | 27 --------------------------- python-uranium.spec | 17 +++++++---------- sources | 2 +- 4 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 fix-PluginRegistry-test.patch 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 From d891d6b5ddb19b2c825294039b4bc4385fa9a5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 12 Sep 2018 11:24:58 +0200 Subject: [PATCH 13/79] Fix tests --- fix-tests.patch | 117 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 fix-tests.patch diff --git a/fix-tests.patch b/fix-tests.patch new file mode 100644 index 0000000..41a3f14 --- /dev/null +++ b/fix-tests.patch @@ -0,0 +1,117 @@ +From b1f054ffbf85eaa403e2158c2d7548bcc5491e73 Mon Sep 17 00:00:00 2001 +From: Lipu Fei +Date: Wed, 11 Jul 2018 12:20:57 +0200 +Subject: [PATCH] Fix unit tests + +--- + .../ContainerTestPlugin.py | 8 +++++++- + tests/Settings/TestContainerRegistry.py | 14 +++++++++----- + tests/Settings/TestContainerStack.py | 19 +++++++++---------- + 3 files changed, 25 insertions(+), 16 deletions(-) + +diff --git a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py +index 71e5561..5afb021 100644 +--- a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py ++++ b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py +@@ -1,7 +1,7 @@ + # Copyright (c) 2017 Ultimaker B.V. + # Uranium is released under the terms of the LGPLv3 or higher. + +-from typing import Optional ++from typing import Any, Optional + import uuid + + from UM.PluginObject import PluginObject +@@ -63,6 +63,9 @@ class ContainerTestPlugin(ContainerInterface, PluginObject): + def isReadOnly(self): + return False + ++ def getAllKeys(self): ++ pass ++ + ## Get the value of a property of a container item. + # + # Since this test container cannot contain any items, it always returns +@@ -72,6 +75,9 @@ class ContainerTestPlugin(ContainerInterface, PluginObject): + def getProperty(self, key, property_name, context = None): + pass + ++ def setProperty(self, key: str, property_name: str, property_value: Any, container: "ContainerInterface" = None, set_from_cache: bool = False) -> None: ++ pass ++ + def hasProperty(self, key, property_name): + pass + +diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py +index bd3f666..1db4578 100644 +--- a/tests/Settings/TestContainerRegistry.py ++++ b/tests/Settings/TestContainerRegistry.py +@@ -1,10 +1,11 @@ + # Copyright (c) 2017 Ultimaker B.V. + # Uranium is released under the terms of the LGPLv3 or higher. + +-import os.path +-import pytest ++import os + from typing import Optional + ++import pytest ++ + import UM.PluginObject + from UM.Resources import Resources + from UM.Settings.DefinitionContainer import DefinitionContainer +@@ -75,9 +76,12 @@ class MockContainer(ContainerInterface, UM.PluginObject.PluginObject): + def setPath(self, path): + pass + +- ## Gets the value of a property of a container item. +- # +- # This method is not implemented in the mock container. ++ def getAllKeys(self): ++ pass ++ ++ def setProperty(self, key, property_name, property_value, container = None, set_from_cache = False): ++ pass ++ + def getProperty(self, key, property_name, context = None): + raise NotImplementedError() + +diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py +index a07b647..9bf918c 100644 +--- a/tests/Settings/TestContainerStack.py ++++ b/tests/Settings/TestContainerStack.py +@@ -38,6 +38,9 @@ class MockContainer(ContainerInterface): + def getName(self): + return "Fred" + ++ def getAllKeys(self): ++ pass ++ + ## Get whether the container item is stored on a read only location in the filesystem. + # + # \return Always returns False +@@ -52,9 +55,6 @@ class MockContainer(ContainerInterface): + def setPath(self, path): + pass + +- ## Returns the metadata dictionary. +- # +- # \return A dictionary containing metadata for this container stack. + def getMetaData(self): + return self._metadata + +@@ -69,11 +69,9 @@ class MockContainer(ContainerInterface): + return self._metadata["entry"] + return default + +- ## Gets the value of a container item property. +- # +- # If the key doesn't exist, returns None. +- # +- # \param key The key of the item to get. ++ def setProperty(self, key, property_name, property_value, container = None, set_from_cache = False): ++ pass ++ + def getProperty(self, key, property_name, context = None): + if key in self.items: + return self.items[key] From 517d0a181d5357aefe5a12feb8fedf688578df2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 Nov 2018 10:57:42 +0100 Subject: [PATCH 14/79] Update to 3.5.1 (#1644323) --- .gitignore | 1 + fix-tests.patch | 117 -------------------------------------------- python-uranium.spec | 10 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 121 deletions(-) delete mode 100644 fix-tests.patch diff --git a/.gitignore b/.gitignore index 1d92c4c..867246b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /Uranium-3.2.1.tar.gz /Uranium-3.3.0.tar.gz /Uranium-3.4.1.tar.gz +/Uranium-3.5.1.tar.gz diff --git a/fix-tests.patch b/fix-tests.patch deleted file mode 100644 index 41a3f14..0000000 --- a/fix-tests.patch +++ /dev/null @@ -1,117 +0,0 @@ -From b1f054ffbf85eaa403e2158c2d7548bcc5491e73 Mon Sep 17 00:00:00 2001 -From: Lipu Fei -Date: Wed, 11 Jul 2018 12:20:57 +0200 -Subject: [PATCH] Fix unit tests - ---- - .../ContainerTestPlugin.py | 8 +++++++- - tests/Settings/TestContainerRegistry.py | 14 +++++++++----- - tests/Settings/TestContainerStack.py | 19 +++++++++---------- - 3 files changed, 25 insertions(+), 16 deletions(-) - -diff --git a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py -index 71e5561..5afb021 100644 ---- a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py -+++ b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py -@@ -1,7 +1,7 @@ - # Copyright (c) 2017 Ultimaker B.V. - # Uranium is released under the terms of the LGPLv3 or higher. - --from typing import Optional -+from typing import Any, Optional - import uuid - - from UM.PluginObject import PluginObject -@@ -63,6 +63,9 @@ class ContainerTestPlugin(ContainerInterface, PluginObject): - def isReadOnly(self): - return False - -+ def getAllKeys(self): -+ pass -+ - ## Get the value of a property of a container item. - # - # Since this test container cannot contain any items, it always returns -@@ -72,6 +75,9 @@ class ContainerTestPlugin(ContainerInterface, PluginObject): - def getProperty(self, key, property_name, context = None): - pass - -+ def setProperty(self, key: str, property_name: str, property_value: Any, container: "ContainerInterface" = None, set_from_cache: bool = False) -> None: -+ pass -+ - def hasProperty(self, key, property_name): - pass - -diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py -index bd3f666..1db4578 100644 ---- a/tests/Settings/TestContainerRegistry.py -+++ b/tests/Settings/TestContainerRegistry.py -@@ -1,10 +1,11 @@ - # Copyright (c) 2017 Ultimaker B.V. - # Uranium is released under the terms of the LGPLv3 or higher. - --import os.path --import pytest -+import os - from typing import Optional - -+import pytest -+ - import UM.PluginObject - from UM.Resources import Resources - from UM.Settings.DefinitionContainer import DefinitionContainer -@@ -75,9 +76,12 @@ class MockContainer(ContainerInterface, UM.PluginObject.PluginObject): - def setPath(self, path): - pass - -- ## Gets the value of a property of a container item. -- # -- # This method is not implemented in the mock container. -+ def getAllKeys(self): -+ pass -+ -+ def setProperty(self, key, property_name, property_value, container = None, set_from_cache = False): -+ pass -+ - def getProperty(self, key, property_name, context = None): - raise NotImplementedError() - -diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py -index a07b647..9bf918c 100644 ---- a/tests/Settings/TestContainerStack.py -+++ b/tests/Settings/TestContainerStack.py -@@ -38,6 +38,9 @@ class MockContainer(ContainerInterface): - def getName(self): - return "Fred" - -+ def getAllKeys(self): -+ pass -+ - ## Get whether the container item is stored on a read only location in the filesystem. - # - # \return Always returns False -@@ -52,9 +55,6 @@ class MockContainer(ContainerInterface): - def setPath(self, path): - pass - -- ## Returns the metadata dictionary. -- # -- # \return A dictionary containing metadata for this container stack. - def getMetaData(self): - return self._metadata - -@@ -69,11 +69,9 @@ class MockContainer(ContainerInterface): - return self._metadata["entry"] - return default - -- ## Gets the value of a container item property. -- # -- # If the key doesn't exist, returns None. -- # -- # \param key The key of the item to get. -+ def setProperty(self, key, property_name, property_value, container = None, set_from_cache = False): -+ pass -+ - def getProperty(self, key, property_name, context = None): - if key in self.items: - return self.items[key] diff --git a/python-uranium.spec b/python-uranium.spec index 02788d4..d3f6f53 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 3.4.1 +Version: 3.5.1 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -17,6 +17,7 @@ BuildRequires: git-core BuildRequires: python3-arcus == %{version} BuildRequires: python3-numpy BuildRequires: python3-scipy +BuildRequires: python3-shapely BuildRequires: python3-qt5 BuildRequires: python3-pytest @@ -38,6 +39,7 @@ Provides: uranium = %{version}-%{release} Requires: python3-arcus == %{version} Requires: python3-numpy Requires: python3-scipy +Requires: python3-shapely Requires: python3-qt5 Recommends: python3-numpy-stl @@ -63,8 +65,7 @@ make doc %check %{__python3} -m pip freeze -# https://github.com/Ultimaker/Uranium/issues/394 -%{__python3} -m pytest -v -k "not TestContainerStack and not TestContainerRegistry" +%{__python3} -m pytest -v %install @@ -103,6 +104,9 @@ popd %changelog +* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 +- Update to 3.5.1 (#1644323) + * Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 - Update to 3.4.1 (#1599724) diff --git a/sources b/sources index 2511e11..7d335e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.4.1.tar.gz) = 59e0a605f3d898765bb670104cabb7fb1471061934900e63b54c1a07219970e07414a3983e96a577f5986302779b7acedc8e0ef0da3756dceefc0170ec80645b +SHA512 (Uranium-3.5.1.tar.gz) = 2924721f5308eb8f27826316a705a12f0768889a4a6c9de431d6827a98036b664497c12ef1dd42e47f67e566fe169d7b5941b62426952c9bec1797933bfc62ce From 113106aa7192c7ac1ac0aa084cfda0ddb0daa9c3 Mon Sep 17 00:00:00 2001 From: Gabriel Feron Date: Sat, 26 Jan 2019 12:59:58 +0100 Subject: [PATCH 15/79] Update to 3.6.0 Signed-off-by: Gabriel Feron --- .gitignore | 1 + python-uranium-fix-wrong-import.patch | 60 +++++++++++++++++++++++++++ python-uranium.spec | 7 +++- sources | 2 +- 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 python-uranium-fix-wrong-import.patch diff --git a/.gitignore b/.gitignore index 867246b..4eb6529 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /Uranium-3.3.0.tar.gz /Uranium-3.4.1.tar.gz /Uranium-3.5.1.tar.gz +/Uranium-3.6.0.tar.gz diff --git a/python-uranium-fix-wrong-import.patch b/python-uranium-fix-wrong-import.patch new file mode 100644 index 0000000..099b758 --- /dev/null +++ b/python-uranium-fix-wrong-import.patch @@ -0,0 +1,60 @@ +diff --git a/tests/0001-Fix-wrong-import.patch b/tests/0001-Fix-wrong-import.patch +new file mode 100644 +index 00000000..7a2f1fdc +--- /dev/null ++++ b/tests/0001-Fix-wrong-import.patch +@@ -0,0 +1,25 @@ ++From 4b02dee5b9ab4d73b3e710605151dc2c2cdbdc32 Mon Sep 17 00:00:00 2001 ++From: Gabriel Feron ++Date: Sat, 26 Jan 2019 12:30:14 +0100 ++Subject: [PATCH] Fix wrong import ++ ++--- ++ tests/Settings/TestContainerRegistry.py | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py ++index 9b87b16f..4b241fdf 100644 ++--- a/tests/Settings/TestContainerRegistry.py +++++ b/tests/Settings/TestContainerRegistry.py ++@@ -9,7 +9,7 @@ from UM.Resources import Resources ++ from UM.Settings.DefinitionContainer import DefinitionContainer ++ from UM.Settings.InstanceContainer import InstanceContainer ++ from UM.Settings.ContainerStack import ContainerStack ++-from tests.Settings.MockContainer import MockContainer +++from MockContainer import MockContainer ++ ++ Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__))) ++ ++-- ++2.20.1 ++ +diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py +index 9b87b16f..4b241fdf 100644 +--- a/tests/Settings/TestContainerRegistry.py ++++ b/tests/Settings/TestContainerRegistry.py +@@ -9,7 +9,7 @@ from UM.Resources import Resources + from UM.Settings.DefinitionContainer import DefinitionContainer + from UM.Settings.InstanceContainer import InstanceContainer + from UM.Settings.ContainerStack import ContainerStack +-from tests.Settings.MockContainer import MockContainer ++from MockContainer import MockContainer + + Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__))) + +diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py +index 966800a2..bc7db098 100644 +--- a/tests/Settings/TestContainerStack.py ++++ b/tests/Settings/TestContainerStack.py +@@ -14,7 +14,7 @@ from UM.Settings.ContainerStack import InvalidContainerStackError + from UM.Settings.DefinitionContainer import DefinitionContainer + from UM.Settings.InstanceContainer import InstanceContainer + from UM.Resources import Resources +-from tests.Settings.MockContainer import MockContainer ++from MockContainer import MockContainer + + Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__))) + +-- +2.20.1 + diff --git a/python-uranium.spec b/python-uranium.spec index d3f6f53..db81e3b 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,11 +1,13 @@ Name: python-uranium -Version: 3.5.1 +Version: 3.6.0 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 +Patch0: %{name}-fix-wrong-import.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -104,6 +106,9 @@ popd %changelog +* Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 +- Update to 3.6.0 + * Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 - Update to 3.5.1 (#1644323) diff --git a/sources b/sources index 7d335e3..469f3f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.5.1.tar.gz) = 2924721f5308eb8f27826316a705a12f0768889a4a6c9de431d6827a98036b664497c12ef1dd42e47f67e566fe169d7b5941b62426952c9bec1797933bfc62ce +SHA512 (Uranium-3.6.0.tar.gz) = 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d From 12425e03d17f9bbf97044b88acf21ef732cd1553 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 09:53:52 +0000 Subject: [PATCH 16/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index db81e3b..9fc8bf5 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -106,6 +106,9 @@ popd %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 - Update to 3.6.0 From ff3ec5a04ccbe557deae6b0d3400c48dbe624f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Wed, 3 Apr 2019 23:32:13 +0200 Subject: [PATCH 17/79] Update to 4.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Féron --- .gitignore | 1 + python-uranium-fix-wrong-import.patch | 60 --------------------------- python-uranium.spec | 9 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 python-uranium-fix-wrong-import.patch diff --git a/.gitignore b/.gitignore index 4eb6529..921c647 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /Uranium-3.4.1.tar.gz /Uranium-3.5.1.tar.gz /Uranium-3.6.0.tar.gz +/Uranium-4.0.0.tar.gz diff --git a/python-uranium-fix-wrong-import.patch b/python-uranium-fix-wrong-import.patch deleted file mode 100644 index 099b758..0000000 --- a/python-uranium-fix-wrong-import.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/tests/0001-Fix-wrong-import.patch b/tests/0001-Fix-wrong-import.patch -new file mode 100644 -index 00000000..7a2f1fdc ---- /dev/null -+++ b/tests/0001-Fix-wrong-import.patch -@@ -0,0 +1,25 @@ -+From 4b02dee5b9ab4d73b3e710605151dc2c2cdbdc32 Mon Sep 17 00:00:00 2001 -+From: Gabriel Feron -+Date: Sat, 26 Jan 2019 12:30:14 +0100 -+Subject: [PATCH] Fix wrong import -+ -+--- -+ tests/Settings/TestContainerRegistry.py | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py -+index 9b87b16f..4b241fdf 100644 -+--- a/tests/Settings/TestContainerRegistry.py -++++ b/tests/Settings/TestContainerRegistry.py -+@@ -9,7 +9,7 @@ from UM.Resources import Resources -+ from UM.Settings.DefinitionContainer import DefinitionContainer -+ from UM.Settings.InstanceContainer import InstanceContainer -+ from UM.Settings.ContainerStack import ContainerStack -+-from tests.Settings.MockContainer import MockContainer -++from MockContainer import MockContainer -+ -+ Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__))) -+ -+-- -+2.20.1 -+ -diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py -index 9b87b16f..4b241fdf 100644 ---- a/tests/Settings/TestContainerRegistry.py -+++ b/tests/Settings/TestContainerRegistry.py -@@ -9,7 +9,7 @@ from UM.Resources import Resources - from UM.Settings.DefinitionContainer import DefinitionContainer - from UM.Settings.InstanceContainer import InstanceContainer - from UM.Settings.ContainerStack import ContainerStack --from tests.Settings.MockContainer import MockContainer -+from MockContainer import MockContainer - - Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__))) - -diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py -index 966800a2..bc7db098 100644 ---- a/tests/Settings/TestContainerStack.py -+++ b/tests/Settings/TestContainerStack.py -@@ -14,7 +14,7 @@ from UM.Settings.ContainerStack import InvalidContainerStackError - from UM.Settings.DefinitionContainer import DefinitionContainer - from UM.Settings.InstanceContainer import InstanceContainer - from UM.Resources import Resources --from tests.Settings.MockContainer import MockContainer -+from MockContainer import MockContainer - - Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__))) - --- -2.20.1 - diff --git a/python-uranium.spec b/python-uranium.spec index 9fc8bf5..9f74b91 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,13 +1,11 @@ Name: python-uranium -Version: 3.6.0 -Release: 2%{?dist} +Version: 4.0.0 +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 -Patch0: %{name}-fix-wrong-import.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -106,6 +104,9 @@ popd %changelog +* Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 +- Update to 4.0.0 + * Sat Feb 02 2019 Fedora Release Engineering - 3.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 469f3f5..00a97d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-3.6.0.tar.gz) = 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d +SHA512 (Uranium-4.0.0.tar.gz) = c75f929d3c263655eadc123d306cc3368fd68e4b3289fcb5ab0fb1a908511ef9f87096c82c31dedf3e15995cf64c0f04f05180348238bf9dbcddebfcc50711a4 From 9e6a6646f00b7742eb358dd7b45c74da63bc5d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 19 Apr 2019 14:36:15 +0200 Subject: [PATCH 18/79] Add fix for pytest 4 https://github.com/Ultimaker/Uranium/pull/482 --- 482.patch | 31 +++++++++++++++++++++++++++++++ python-uranium.spec | 3 +++ 2 files changed, 34 insertions(+) create mode 100644 482.patch diff --git a/482.patch b/482.patch new file mode 100644 index 0000000..66ab171 --- /dev/null +++ b/482.patch @@ -0,0 +1,31 @@ +From 3d1c83677c8151fa151822473a1021d783cf6daf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 19 Apr 2019 14:32:24 +0200 +Subject: [PATCH] Support Pytest 4, config.warn is no more + +https://docs.pytest.org/en/latest/deprecations.html#config-warn-and-node-warn +--- + tests/benchmarks/conftest.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/benchmarks/conftest.py b/tests/benchmarks/conftest.py +index d08442e9f..6fc1c9ebd 100644 +--- a/tests/benchmarks/conftest.py ++++ b/tests/benchmarks/conftest.py +@@ -2,6 +2,7 @@ + # Uranium is released under the terms of the LGPLv3 or higher. + + import pytest ++import warnings + + warn = True + +@@ -12,7 +13,7 @@ def pytest_ignore_collect(path, config): + else: + global warn + if warn: +- config.warn("", "Skipping benchmarks because pytest-benchmark plugin was not found.", "tests/benchmarks/conftest.py") ++ warnings.warn(pytest.PytestWarning("Skipping benchmarks because pytest-benchmark plugin was not found.")) + warn = False + + return True diff --git a/python-uranium.spec b/python-uranium.spec index 9f74b91..7025660 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -6,6 +6,9 @@ License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz +# pytest 4 +Patch1: %{url}/pull/482.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen From bee71b49a2857ad3f58f864114045680ed2724cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 18 Jun 2019 23:06:52 +0200 Subject: [PATCH 19/79] Update to 4.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Féron --- .gitignore | 13 +------------ python-uranium.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 921c647..fd4c160 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ -/Uranium-2.5.0.tar.gz -/Uranium-2.6.0.tar.gz -/Uranium-2.6.1.tar.gz -/Uranium-2.7.0.tar.gz -/Uranium-3.0.3.tar.gz -/Uranium-3.1.0.tar.gz -/Uranium-3.2.1.tar.gz -/Uranium-3.3.0.tar.gz -/Uranium-3.4.1.tar.gz -/Uranium-3.5.1.tar.gz -/Uranium-3.6.0.tar.gz -/Uranium-4.0.0.tar.gz +/Uranium-*.tar.gz diff --git a/python-uranium.spec b/python-uranium.spec index 7025660..c3d9007 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 4.0.0 +Version: 4.1.0 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -107,6 +107,9 @@ popd %changelog +* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 +- Update to 4.1.0 + * Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 - Update to 4.0.0 diff --git a/sources b/sources index 00a97d0..6d9d756 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.0.0.tar.gz) = c75f929d3c263655eadc123d306cc3368fd68e4b3289fcb5ab0fb1a908511ef9f87096c82c31dedf3e15995cf64c0f04f05180348238bf9dbcddebfcc50711a4 +SHA512 (Uranium-4.1.0.tar.gz) = 537b0aaf7d946ab25994e6532f85f2e235d809381aa84e93f27b544a85c420ee76824cd1bfa5b5aa159b8891dae697053faf06644b1c8797620c50f424fb891c \ No newline at end of file From 450f05779f0d3746747b6b58dc34704d5d064db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Jul 2019 14:26:47 +0200 Subject: [PATCH 20/79] Remove unused patch --- 482.patch | 31 ------------------------------- python-uranium.spec | 3 --- 2 files changed, 34 deletions(-) delete mode 100644 482.patch diff --git a/482.patch b/482.patch deleted file mode 100644 index 66ab171..0000000 --- a/482.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3d1c83677c8151fa151822473a1021d783cf6daf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Fri, 19 Apr 2019 14:32:24 +0200 -Subject: [PATCH] Support Pytest 4, config.warn is no more - -https://docs.pytest.org/en/latest/deprecations.html#config-warn-and-node-warn ---- - tests/benchmarks/conftest.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/benchmarks/conftest.py b/tests/benchmarks/conftest.py -index d08442e9f..6fc1c9ebd 100644 ---- a/tests/benchmarks/conftest.py -+++ b/tests/benchmarks/conftest.py -@@ -2,6 +2,7 @@ - # Uranium is released under the terms of the LGPLv3 or higher. - - import pytest -+import warnings - - warn = True - -@@ -12,7 +13,7 @@ def pytest_ignore_collect(path, config): - else: - global warn - if warn: -- config.warn("", "Skipping benchmarks because pytest-benchmark plugin was not found.", "tests/benchmarks/conftest.py") -+ warnings.warn(pytest.PytestWarning("Skipping benchmarks because pytest-benchmark plugin was not found.")) - warn = False - - return True diff --git a/python-uranium.spec b/python-uranium.spec index c3d9007..c90dfb6 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -6,9 +6,6 @@ License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz -# pytest 4 -Patch1: %{url}/pull/482.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen From 401d81833820ff8885fc32e568a684d146eba593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Jul 2019 15:27:30 +0200 Subject: [PATCH 21/79] Add newline to the end of sources This might workaround a problem in Koji --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6d9d756..ec15c96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.1.0.tar.gz) = 537b0aaf7d946ab25994e6532f85f2e235d809381aa84e93f27b544a85c420ee76824cd1bfa5b5aa159b8891dae697053faf06644b1c8797620c50f424fb891c \ No newline at end of file +SHA512 (Uranium-4.1.0.tar.gz) = 537b0aaf7d946ab25994e6532f85f2e235d809381aa84e93f27b544a85c420ee76824cd1bfa5b5aa159b8891dae697053faf06644b1c8797620c50f424fb891c From 4dfffac47873559f86e7b279bef8a5085f6047e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Jul 2019 15:52:46 +0200 Subject: [PATCH 22/79] Approximate equality in numeric tests --- 497.patch | 32 ++++++++++++++++++++++++++++++++ python-uranium.spec | 3 +++ 2 files changed, 35 insertions(+) create mode 100644 497.patch diff --git a/497.patch b/497.patch new file mode 100644 index 0000000..477c4a4 --- /dev/null +++ b/497.patch @@ -0,0 +1,32 @@ +From b61b8bb719fc676d5a140015a829c6a08d04abb5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 8 Jul 2019 15:49:19 +0200 +Subject: [PATCH] Allow approximate equality in TestVector.test_normalize for + smaller arches + +Fixes https://github.com/Ultimaker/Uranium/issues/496 +--- + tests/Math/TestVector.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Math/TestVector.py b/tests/Math/TestVector.py +index 33f7f0889..292f415f3 100644 +--- a/tests/Math/TestVector.py ++++ b/tests/Math/TestVector.py +@@ -3,6 +3,7 @@ + + import unittest + import numpy ++import pytest + + from UM.Math.Vector import Vector + +@@ -30,7 +31,7 @@ def test_angleBetweenVectors(self): + + def test_normalize(self): + vector = Vector(10, 10, 10) +- assert vector.normalized().length() == 1 ++ assert vector.normalized().length() == pytest.approx(1) + + def test_setValues(self): + x = 10 diff --git a/python-uranium.spec b/python-uranium.spec index c90dfb6..e098d90 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -6,6 +6,9 @@ License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz +# Approximate equality in numeric tests +Patch0: %{url}/pull/497.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen From e176fd321ffa91aa38aaf4dbca298bc14513c54e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 16:55:05 +0000 Subject: [PATCH 23/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index e098d90..6362820 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -107,6 +107,9 @@ popd %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 - Update to 4.1.0 From 68cf61fc480358a5f98683b5fa0a4a844255b565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 2 Aug 2019 12:46:12 +0200 Subject: [PATCH 24/79] Python 3.8 fixes --- ...5eb59a49eaf5219c27cf93251764237ccd91.patch | 41 +++++++++++++++++++ python-uranium.spec | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch diff --git a/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch b/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch new file mode 100644 index 0000000..189406d --- /dev/null +++ b/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch @@ -0,0 +1,41 @@ +From d7ed5eb59a49eaf5219c27cf93251764237ccd91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Wed, 10 Jul 2019 09:05:51 +0200 +Subject: [PATCH] Fix visiting string constants in CPython 3.8+ + +The Cura builds target CPython 3.5.2 now so it's not a problem for that, but if we upgrade to CPython 3.8 or higher in the future, or right now for the package managers in Linux, this fixes some function evaluations. + +Fixes #498. +--- + UM/Settings/SettingFunction.py | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/UM/Settings/SettingFunction.py b/UM/Settings/SettingFunction.py +index 4d6b0a0dc..48365b137 100644 +--- a/UM/Settings/SettingFunction.py ++++ b/UM/Settings/SettingFunction.py +@@ -1,4 +1,4 @@ +-# Copyright (c) 2018 Ultimaker B.V. ++# Copyright (c) 2019 Ultimaker B.V. + # Uranium is released under the terms of the LGPLv3 or higher. + + import ast +@@ -180,10 +180,18 @@ def visit_Name(self, node: ast.Name) -> None: # [CodeStyle: ast.NodeVisitor req + self.values.add(node.id) + self.keys.add(node.id) + ++ ## This one is used before Python 3.8 to visit string types. ++ # ++ # visit_Str will be marked as deprecated from Python 3.8 and onwards. + def visit_Str(self, node: ast.AST) -> None: + if node.s not in self._knownNames and node.s not in dir(builtins): # type: ignore #AST uses getattr stuff, so ignore type of node.s. + self.keys.add(node.s) # type: ignore + ++ ## This one is used on Python 3.8+ to visit string types. ++ def visit_Constant(self, node: ast.AST) -> None: ++ if isinstance(node.value, str) and node.value not in self._knownNames and node.value not in dir(builtins): # type: ignore #AST uses getattr stuff, so ignore type of node.value. ++ self.keys.add(node.value) # type: ignore ++ + _knownNames = { + "math", + "max", diff --git a/python-uranium.spec b/python-uranium.spec index 6362820..78a418e 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -9,6 +9,9 @@ Source0: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz # Approximate equality in numeric tests Patch0: %{url}/pull/497.patch +# Python 3.8 fixes +Patch1: %{url}/commit/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen From aa066bab5039e3916599ea0290bac966c23158fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:34:44 +0200 Subject: [PATCH 25/79] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 78a418e..e9f3028 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -110,6 +110,9 @@ popd %changelog +* Thu Oct 03 2019 Miro Hrončok - 4.1.0-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Fri Jul 26 2019 Fedora Release Engineering - 4.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a115b7357383eb10ae2c9242a24487454c3720fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 4 Nov 2019 20:34:06 +0100 Subject: [PATCH 26/79] Update to 4.4.0 --- 497.patch | 32 --------------- ...5eb59a49eaf5219c27cf93251764237ccd91.patch | 41 ------------------- python-uranium.spec | 13 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 82 deletions(-) delete mode 100644 497.patch delete mode 100644 d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch diff --git a/497.patch b/497.patch deleted file mode 100644 index 477c4a4..0000000 --- a/497.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b61b8bb719fc676d5a140015a829c6a08d04abb5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 8 Jul 2019 15:49:19 +0200 -Subject: [PATCH] Allow approximate equality in TestVector.test_normalize for - smaller arches - -Fixes https://github.com/Ultimaker/Uranium/issues/496 ---- - tests/Math/TestVector.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/Math/TestVector.py b/tests/Math/TestVector.py -index 33f7f0889..292f415f3 100644 ---- a/tests/Math/TestVector.py -+++ b/tests/Math/TestVector.py -@@ -3,6 +3,7 @@ - - import unittest - import numpy -+import pytest - - from UM.Math.Vector import Vector - -@@ -30,7 +31,7 @@ def test_angleBetweenVectors(self): - - def test_normalize(self): - vector = Vector(10, 10, 10) -- assert vector.normalized().length() == 1 -+ assert vector.normalized().length() == pytest.approx(1) - - def test_setValues(self): - x = 10 diff --git a/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch b/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch deleted file mode 100644 index 189406d..0000000 --- a/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d7ed5eb59a49eaf5219c27cf93251764237ccd91 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Wed, 10 Jul 2019 09:05:51 +0200 -Subject: [PATCH] Fix visiting string constants in CPython 3.8+ - -The Cura builds target CPython 3.5.2 now so it's not a problem for that, but if we upgrade to CPython 3.8 or higher in the future, or right now for the package managers in Linux, this fixes some function evaluations. - -Fixes #498. ---- - UM/Settings/SettingFunction.py | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/UM/Settings/SettingFunction.py b/UM/Settings/SettingFunction.py -index 4d6b0a0dc..48365b137 100644 ---- a/UM/Settings/SettingFunction.py -+++ b/UM/Settings/SettingFunction.py -@@ -1,4 +1,4 @@ --# Copyright (c) 2018 Ultimaker B.V. -+# Copyright (c) 2019 Ultimaker B.V. - # Uranium is released under the terms of the LGPLv3 or higher. - - import ast -@@ -180,10 +180,18 @@ def visit_Name(self, node: ast.Name) -> None: # [CodeStyle: ast.NodeVisitor req - self.values.add(node.id) - self.keys.add(node.id) - -+ ## This one is used before Python 3.8 to visit string types. -+ # -+ # visit_Str will be marked as deprecated from Python 3.8 and onwards. - def visit_Str(self, node: ast.AST) -> None: - if node.s not in self._knownNames and node.s not in dir(builtins): # type: ignore #AST uses getattr stuff, so ignore type of node.s. - self.keys.add(node.s) # type: ignore - -+ ## This one is used on Python 3.8+ to visit string types. -+ def visit_Constant(self, node: ast.AST) -> None: -+ if isinstance(node.value, str) and node.value not in self._knownNames and node.value not in dir(builtins): # type: ignore #AST uses getattr stuff, so ignore type of node.value. -+ self.keys.add(node.value) # type: ignore -+ - _knownNames = { - "math", - "max", diff --git a/python-uranium.spec b/python-uranium.spec index e9f3028..466ba9e 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,17 +1,11 @@ Name: python-uranium -Version: 4.1.0 -Release: 3%{?dist} +Version: 4.4.0 +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 -# Approximate equality in numeric tests -Patch0: %{url}/pull/497.patch - -# Python 3.8 fixes -Patch1: %{url}/commit/d7ed5eb59a49eaf5219c27cf93251764237ccd91.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -110,6 +104,9 @@ popd %changelog +* Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 +- Update to 4.4.0 + * Thu Oct 03 2019 Miro Hrončok - 4.1.0-3 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index ec15c96..c5006a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.1.0.tar.gz) = 537b0aaf7d946ab25994e6532f85f2e235d809381aa84e93f27b544a85c420ee76824cd1bfa5b5aa159b8891dae697053faf06644b1c8797620c50f424fb891c +SHA512 (Uranium-4.4.0.tar.gz) = 2f8966a1ce383ec927360d62c586cdedcde54591efbb1c6feea06268bf14b74410d7d411a001b9811f109d3bddd91f6e44d8d0b0f34ebe351d9ac170f87d3937 From efa0c9715055362cc452b9d816810c29d2c87273 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 16:00:47 +0000 Subject: [PATCH 27/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 466ba9e..a89a87f 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -104,6 +104,9 @@ popd %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 - Update to 4.4.0 From 5abd7e51799c37b562df32680c59bcb50204b4ea Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 21 Apr 2020 23:29:48 +0200 Subject: [PATCH 28/79] Update to 4.6.0 --- python-uranium.spec | 21 +++++++++++++-------- sources | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index a89a87f..f231246 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium -Version: 4.4.0 -Release: 2%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -15,19 +15,16 @@ BuildRequires: git-core # Tests BuildRequires: python3-arcus == %{version} +BuildRequires: python3-cryptography BuildRequires: python3-numpy BuildRequires: python3-scipy BuildRequires: python3-shapely BuildRequires: python3-qt5 BuildRequires: python3-pytest +BuildRequires: python3-twisted BuildArch: noarch -# There are Python plugins in /usr/lib/uranium -%global _python_bytecompile_extra 0 -# For backwards compatibility (not needed on F29+): -%global __python %{__python3} - %description Uranium is a Python framework for building 3D printing related applications. @@ -37,6 +34,7 @@ Provides: uranium = %{version}-%{release} %{?python_provide:%python_provide python3-uranium} Requires: python3-arcus == %{version} +Requires: python3-cryptography Requires: python3-numpy Requires: python3-scipy Requires: python3-shapely @@ -65,7 +63,11 @@ make doc %check %{__python3} -m pip freeze -%{__python3} -m pytest -v + +# skipping failing tests, see: +# * https://github.com/Ultimaker/Uranium/issues/594 +# * https://github.com/Ultimaker/Uranium/issues/603 +%{__python3} -m pytest -v -k "not (TestSettingFunction and test_init_bad) and not TestHttpRequestManager" %install @@ -104,6 +106,9 @@ popd %changelog +* Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.0 + * Thu Jan 30 2020 Fedora Release Engineering - 4.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index c5006a2..ebcbe91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.4.0.tar.gz) = 2f8966a1ce383ec927360d62c586cdedcde54591efbb1c6feea06268bf14b74410d7d411a001b9811f109d3bddd91f6e44d8d0b0f34ebe351d9ac170f87d3937 +SHA512 (Uranium-4.6.0.tar.gz) = a9f356c3ed5f37268cef5f0689698c963f3b554896cd1896f6991edd446a5a0b4c12e63ab09e2713f74fcd79bb7281793961c4aef928961d05150d67ac2c2551 From 179c3ad02c5f5a6e1c685b29262bdb363f4bc7bb Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 5 May 2020 18:36:03 +0200 Subject: [PATCH 29/79] Update to 4.6.1 --- python-uranium.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index f231246..a80c53a 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 4.6.0 +Version: 4.6.1 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -106,6 +106,9 @@ popd %changelog +* Tue May 5 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.1 + * Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 - Update to 4.6.0 diff --git a/sources b/sources index ebcbe91..751b120 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.6.0.tar.gz) = a9f356c3ed5f37268cef5f0689698c963f3b554896cd1896f6991edd446a5a0b4c12e63ab09e2713f74fcd79bb7281793961c4aef928961d05150d67ac2c2551 +SHA512 (Uranium-4.6.1.tar.gz) = ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a From ed025157cdc7c61670abfcd788aae88b6c91eec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:44:31 +0200 Subject: [PATCH 30/79] Rebuilt for Python 3.9 --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index a80c53a..f51d097 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -106,6 +106,9 @@ popd %changelog +* Tue May 26 2020 Miro Hrončok - 4.6.1-2 +- Rebuilt for Python 3.9 + * Tue May 5 2020 Gabriel Féron - 4.6.0-1 - Update to 4.6.1 From b6f7c334de31efd5e362d28236988343871d90d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 26 Jul 2020 15:14:33 +0200 Subject: [PATCH 31/79] https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds --- python-uranium.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index f51d097..3d272fe 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -25,6 +25,9 @@ BuildRequires: python3-twisted BuildArch: noarch +# Get Fedora 33++ behavior on anything older +%undefine __cmake_in_source_build + %description Uranium is a Python framework for building 3D printing related applications. @@ -57,9 +60,9 @@ related applications. %build # 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 +%cmake -DLIB_SUFFIX:STR= . +%cmake_build +%cmake_build -- doc %check %{__python3} -m pip freeze @@ -71,7 +74,7 @@ make doc %install -make install DESTDIR=%{buildroot} +%cmake_install # Move the cmake files mv %{buildroot}%{_datadir}/cmake* %{buildroot}%{_datadir}/cmake From faa9f3e1ac41dc2291225784245d2efe8640d339 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 04:28:48 +0000 Subject: [PATCH 32/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 3d272fe..3d72f9d 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 4.6.1-2 - Rebuilt for Python 3.9 From 55b538f7c43e4740b91a7d524b5ccb96c816f8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 31 Aug 2020 20:52:31 +0200 Subject: [PATCH 33/79] Update to 4.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gabriel Féron --- python-uranium.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 3d72f9d..3e1a7d6 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium -Version: 4.6.1 -Release: 3%{?dist} +Version: 4.7.0 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Mon Aug 31 2020 Gabriel Féron - 4.7.0-1 +- Update to 4.7.0 + * Wed Jul 29 2020 Fedora Release Engineering - 4.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 751b120..7c3d232 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.6.1.tar.gz) = ba7ed12d507fb1bd08fc0e77285933802a31b63d09f2dd0c7329e5644f82e6372fa11a1bbc28f3f1928ae0acfb3cb0afdeedf8e90e619c484fd5f623f8af722a +SHA512 (Uranium-4.7.0.tar.gz) = e049fff57823107785b418a368d6c6c399775c35ffad90831c77643dee060be2ab13ad8871b11f8d59d2a090a1d26786f4cf39a5a731b616a1b08a8ae5dea996 From 97eeafa1da2d7f907517020e93c0963ac9a88bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Sep 2020 18:31:08 +0200 Subject: [PATCH 34/79] Update to 4.7.1 --- python-uranium.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 3e1a7d6..f006c3a 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 4.7.0 +Version: 4.7.1 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -109,6 +109,9 @@ popd %changelog +* Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 +- Update to 4.7.1 + * Mon Aug 31 2020 Gabriel Féron - 4.7.0-1 - Update to 4.7.0 diff --git a/sources b/sources index 7c3d232..34a9c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.7.0.tar.gz) = e049fff57823107785b418a368d6c6c399775c35ffad90831c77643dee060be2ab13ad8871b11f8d59d2a090a1d26786f4cf39a5a731b616a1b08a8ae5dea996 +SHA512 (Uranium-4.7.1.tar.gz) = 3f05623b265310fb71034172f6a593815752c8052db6c73a6b28391feda50ad6f5489756bf354c3212dd7ab7ea8e573fbd2593e02c82c893ee42bbefd0e7f102 From ebb4da4ab674c23f3ad9a858422c9f91b44a0afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 27 Nov 2020 16:43:47 +0100 Subject: [PATCH 35/79] Fix a test failure with Python 3.10 --- 095a7a6848.patch | 25 +++++++++++++++++++++++++ python-uranium.spec | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 095a7a6848.patch diff --git a/095a7a6848.patch b/095a7a6848.patch new file mode 100644 index 0000000..75c85ea --- /dev/null +++ b/095a7a6848.patch @@ -0,0 +1,25 @@ +From 095a7a68482d2fc984f7f8dae1ce67d429e8aff6 Mon Sep 17 00:00:00 2001 +From: Ghostkeeper +Date: Fri, 30 Oct 2020 17:52:39 +0100 +Subject: [PATCH] Round coordinates before creating QPoint + +QPoint only accepts integers. Maybe we'd need QPointF but honestly we probably want to render this just pixel-aligned anyway. + +Contributes to issue CURA-7501. +--- + UM/Qt/Bindings/PointingRectangle.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/UM/Qt/Bindings/PointingRectangle.py b/UM/Qt/Bindings/PointingRectangle.py +index a0a79c6a1..64430a632 100644 +--- a/UM/Qt/Bindings/PointingRectangle.py ++++ b/UM/Qt/Bindings/PointingRectangle.py +@@ -103,7 +103,7 @@ def updatePaintNode(self, paint_node, update_data): + vertex_data[5].set(0, 0) + vertex_data[6].set(0, 0) + +- target_offset = self._target - QPoint(self.x(), self.y()) ++ target_offset = self._target - QPoint(round(self.x()), round(self.y())) + + arrow_on_side = -1 # no arrow + arrow_size = 0 diff --git a/python-uranium.spec b/python-uranium.spec index f006c3a..061ac20 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,11 +1,15 @@ Name: python-uranium Version: 4.7.1 -Release: 1%{?dist} +Release: 2%{?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 +# Round coordinates before creating QPoint +# QPoint(self.x(), self.y()): argument 1 has unexpected type 'float' +Patch1: %{url}/commit/095a7a6848.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -109,6 +113,10 @@ popd %changelog +* Fri Nov 27 2020 Miro Hrončok - 4.7.1-2 +- Round coordinates before creating QPoint +- Fixes a test failure with Python 3.10 + * Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 - Update to 4.7.1 From b91290df9bc814122c1364dd1326127bb949356d Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Tue, 22 Dec 2020 23:19:00 +0100 Subject: [PATCH 36/79] Update to 4.8.0 --- python-uranium.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 061ac20..8741d88 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium -Version: 4.7.1 -Release: 2%{?dist} +Version: 4.8.0 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -113,6 +113,9 @@ popd %changelog +* Tue Dec 22 2020 Jan Pazdziora - 4.8.0-1 +- Update to 4.8.0 + * Fri Nov 27 2020 Miro Hrončok - 4.7.1-2 - Round coordinates before creating QPoint - Fixes a test failure with Python 3.10 diff --git a/sources b/sources index 34a9c8b..bd295f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.7.1.tar.gz) = 3f05623b265310fb71034172f6a593815752c8052db6c73a6b28391feda50ad6f5489756bf354c3212dd7ab7ea8e573fbd2593e02c82c893ee42bbefd0e7f102 +SHA512 (Uranium-4.8.0.tar.gz) = a2cb923d703e626760c885ceb657566abfa5662f63729fef0b5cdf408da2ed3c23fefcd173b8af529ee79c2384505b2558379b82ba2cfd7a2d2291fe723ddbbd From 9349f9caac6f48cef7a7e70172aa22c4d0a709fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:01:44 +0000 Subject: [PATCH 37/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 8741d88..7e34a2b 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -113,6 +113,9 @@ popd %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Dec 22 2020 Jan Pazdziora - 4.8.0-1 - Update to 4.8.0 From 57fc98d4ca5d3aaa22e69f900246e41e78fda812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 26 Apr 2021 11:26:24 +0200 Subject: [PATCH 38/79] Update to 4.9.0 --- 095a7a6848.patch | 25 ------------------------- python-uranium.spec | 11 +++++------ sources | 2 +- 3 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 095a7a6848.patch diff --git a/095a7a6848.patch b/095a7a6848.patch deleted file mode 100644 index 75c85ea..0000000 --- a/095a7a6848.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 095a7a68482d2fc984f7f8dae1ce67d429e8aff6 Mon Sep 17 00:00:00 2001 -From: Ghostkeeper -Date: Fri, 30 Oct 2020 17:52:39 +0100 -Subject: [PATCH] Round coordinates before creating QPoint - -QPoint only accepts integers. Maybe we'd need QPointF but honestly we probably want to render this just pixel-aligned anyway. - -Contributes to issue CURA-7501. ---- - UM/Qt/Bindings/PointingRectangle.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/UM/Qt/Bindings/PointingRectangle.py b/UM/Qt/Bindings/PointingRectangle.py -index a0a79c6a1..64430a632 100644 ---- a/UM/Qt/Bindings/PointingRectangle.py -+++ b/UM/Qt/Bindings/PointingRectangle.py -@@ -103,7 +103,7 @@ def updatePaintNode(self, paint_node, update_data): - vertex_data[5].set(0, 0) - vertex_data[6].set(0, 0) - -- target_offset = self._target - QPoint(self.x(), self.y()) -+ target_offset = self._target - QPoint(round(self.x()), round(self.y())) - - arrow_on_side = -1 # no arrow - arrow_size = 0 diff --git a/python-uranium.spec b/python-uranium.spec index 7e34a2b..cf0a71c 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,15 +1,11 @@ Name: python-uranium -Version: 4.8.0 -Release: 2%{?dist} +Version: 4.9.0 +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 -# Round coordinates before creating QPoint -# QPoint(self.x(), self.y()): argument 1 has unexpected type 'float' -Patch1: %{url}/commit/095a7a6848.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -113,6 +109,9 @@ popd %changelog +* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 +- Update to 4.9.0 + * Wed Jan 27 2021 Fedora Release Engineering - 4.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index bd295f0..ba7da94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.8.0.tar.gz) = a2cb923d703e626760c885ceb657566abfa5662f63729fef0b5cdf408da2ed3c23fefcd173b8af529ee79c2384505b2558379b82ba2cfd7a2d2291fe723ddbbd +SHA512 (Uranium-4.9.0.tar.gz) = 2ae202ae79559c7d19a0afebf7e5739ee229264d3811ae611743a71ab4ec1433ec9b7b9b4f5529d71137d30b72c62271eb0f2aebb3ac49b2d5ce7029b3c53ee7 From 429e2c22ba9baa4e21b091eaf48b679055d54bd4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:07:18 +0200 Subject: [PATCH 39/79] Rebuilt for Python 3.10 --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index cf0a71c..2a32d3e 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Fri Jun 04 2021 Python Maint - 4.9.0-2 +- Rebuilt for Python 3.10 + * Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 - Update to 4.9.0 From b9c2188e7fc194f78a85d1e495a3c3e8d51e5d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Thu, 10 Jun 2021 15:47:33 +0200 Subject: [PATCH 40/79] Update to 4.9.1 --- python-uranium.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 2a32d3e..0af309e 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium -Version: 4.9.0 -Release: 2%{?dist} +Version: 4.9.1 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 +- Update to 4.9.1 + * Fri Jun 04 2021 Python Maint - 4.9.0-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index ba7da94..bc7b4e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.9.0.tar.gz) = 2ae202ae79559c7d19a0afebf7e5739ee229264d3811ae611743a71ab4ec1433ec9b7b9b4f5529d71137d30b72c62271eb0f2aebb3ac49b2d5ce7029b3c53ee7 +SHA512 (Uranium-4.9.1.tar.gz) = e665a1ff8ebfc629e4bc2253533a3332d8f8804155432af921ad2e7251d5725daf9346cc5f110595914ac6f0d194db6d7e06dfcd3795b57e35b3d5e6dae594a7 From 2527c13b4368c31c788e94286f3464b299992813 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 27 Jul 2021 08:29:35 +0000 Subject: [PATCH 41/79] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 0af309e..162b155 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,10 @@ popd %changelog +* Tue Jul 27 2021 Fedora Release Engineering - 4.9.1-2 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 - Update to 4.9.1 From 8543a2f1434012190111a44d415ab420ec2a8c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 16 Aug 2021 12:06:37 +0200 Subject: [PATCH 42/79] Update to 4.10.0 --- python-uranium.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 162b155..02e0e23 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.10.0 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -109,6 +109,9 @@ popd %changelog +* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 +- Update to 4.10.0 + * Tue Jul 27 2021 Fedora Release Engineering - 4.9.1-2 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index bc7b4e9..b6839a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.9.1.tar.gz) = e665a1ff8ebfc629e4bc2253533a3332d8f8804155432af921ad2e7251d5725daf9346cc5f110595914ac6f0d194db6d7e06dfcd3795b57e35b3d5e6dae594a7 +SHA512 (Uranium-4.10.0.tar.gz) = 1b54550b92a51c91352c66deb4df546de6eae059c49dd8ce0c84b462e22015b989c2e5ba32ad58f2da4108a81a074d8797f585ad356902f378533be624b71b2f From cc25d93c6d9b71448f1f2d9eafa5c1a362933f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Wed, 15 Sep 2021 23:56:17 +0200 Subject: [PATCH 43/79] Update to 4.11.0 --- python-uranium.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 02e0e23..d18a15c 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 4.10.0 +Version: 4.11.0 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -109,6 +109,9 @@ popd %changelog +* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 +- Update to 4.11.0 + * Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 - Update to 4.10.0 diff --git a/sources b/sources index b6839a9..c3a8eec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.10.0.tar.gz) = 1b54550b92a51c91352c66deb4df546de6eae059c49dd8ce0c84b462e22015b989c2e5ba32ad58f2da4108a81a074d8797f585ad356902f378533be624b71b2f +SHA512 (Uranium-4.11.0.tar.gz) = 37cf6528fae7e5bfcec1c1445b6811641526471d809bc5423fae0a839f30e19508c3eb702a043837ae6bb421b8d144e2d67c351557ffd3b17d8a84147b9feac1 From fe5b0b0d9409a6cf47ee2f5067bae1eaa5c140ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Nov 2021 14:50:29 +0100 Subject: [PATCH 44/79] Round coordinates on getFaceIdAtPosition, to fix crash with Python 3.10+ Fixes https://bugzilla.redhat.com/2021157 Patch by Elia Devito --- 750.patch | 28 ++++++++++++++++++++++++++++ python-uranium.spec | 12 +++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 750.patch diff --git a/750.patch b/750.patch new file mode 100644 index 0000000..e89fc17 --- /dev/null +++ b/750.patch @@ -0,0 +1,28 @@ +From 970c94b8ce5008ca90a1cbfaeeef5470879a138f Mon Sep 17 00:00:00 2001 +From: Elia Devito +Date: Sat, 6 Nov 2021 23:22:28 +0100 +Subject: [PATCH] Round coordinates on getFaceIdAtPosition + +PyQt Pixel expects integer coordinates as parameters. + +This fixes the crash on cura when using the +"Select face to align to the build plate" tool +--- + UM/View/SelectionPass.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/UM/View/SelectionPass.py b/UM/View/SelectionPass.py +index f0344e3d22..945b789776 100644 +--- a/UM/View/SelectionPass.py ++++ b/UM/View/SelectionPass.py +@@ -158,8 +158,8 @@ def getFaceIdAtPosition(self, x, y): + + window_size = self._renderer.getWindowSize() + +- px = (0.5 + x / 2.0) * window_size[0] +- py = (0.5 + y / 2.0) * window_size[1] ++ px = round((0.5 + x / 2.0) * window_size[0]) ++ py = round((0.5 + y / 2.0) * window_size[1]) + + if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1): + return -1 diff --git a/python-uranium.spec b/python-uranium.spec index d18a15c..138d67a 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,11 +1,16 @@ Name: python-uranium Version: 4.11.0 -Release: 1%{?dist} +Release: 2%{?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 +# Round coordinates on getFaceIdAtPosition, to fix crash with Python 3.10+ +# Merged upstream +# Fixes https://bugzilla.redhat.com/2021157 +Patch1: %{url}/pull/750.patch + BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -109,6 +114,11 @@ popd %changelog +* Mon Nov 08 2021 Miro Hrončok - 4.11.0-2 +- Round coordinates on getFaceIdAtPosition, to fix crash with Python 3.10+ +- Fixes a crash when using "Select face to align to the build plate" tool +- Fixes rhbz#2021157 + * Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 - Update to 4.11.0 From 6a3ecc4095647dd39597ee0bc0b51da117225d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 13 Dec 2021 09:49:27 +0100 Subject: [PATCH 45/79] Update to 4.12.1 --- python-uranium.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 138d67a..50c5978 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium -Version: 4.11.0 -Release: 2%{?dist} +Version: 4.12.1 +Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -114,6 +114,9 @@ popd %changelog +* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 +- Update to 4.12.1 + * Mon Nov 08 2021 Miro Hrončok - 4.11.0-2 - Round coordinates on getFaceIdAtPosition, to fix crash with Python 3.10+ - Fixes a crash when using "Select face to align to the build plate" tool diff --git a/sources b/sources index c3a8eec..49f2996 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.11.0.tar.gz) = 37cf6528fae7e5bfcec1c1445b6811641526471d809bc5423fae0a839f30e19508c3eb702a043837ae6bb421b8d144e2d67c351557ffd3b17d8a84147b9feac1 +SHA512 (Uranium-4.12.1.tar.gz) = bdf118341a52ac957ae8cc0acf2fb2c7381f9082e82c190a038333845ffc0fefa8c92702438898a63ccca9f0add69312b43168b993fcd38fe4f3ee3856b36eb9 From 9fca3d75bce5a01ce7df048b67d4a76d5e686a90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 16:17:16 +0000 Subject: [PATCH 46/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 50c5978..ae0ca25 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -114,6 +114,9 @@ popd %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 - Update to 4.12.1 From 97dcc006330cb3d943158be3f814c7332a49b247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 11 Jan 2022 20:10:09 +0100 Subject: [PATCH 47/79] Update to 4.13.0 --- 750.patch | 28 ---------------------------- python-uranium.spec | 12 +++++------- sources | 2 +- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 750.patch diff --git a/750.patch b/750.patch deleted file mode 100644 index e89fc17..0000000 --- a/750.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 970c94b8ce5008ca90a1cbfaeeef5470879a138f Mon Sep 17 00:00:00 2001 -From: Elia Devito -Date: Sat, 6 Nov 2021 23:22:28 +0100 -Subject: [PATCH] Round coordinates on getFaceIdAtPosition - -PyQt Pixel expects integer coordinates as parameters. - -This fixes the crash on cura when using the -"Select face to align to the build plate" tool ---- - UM/View/SelectionPass.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/UM/View/SelectionPass.py b/UM/View/SelectionPass.py -index f0344e3d22..945b789776 100644 ---- a/UM/View/SelectionPass.py -+++ b/UM/View/SelectionPass.py -@@ -158,8 +158,8 @@ def getFaceIdAtPosition(self, x, y): - - window_size = self._renderer.getWindowSize() - -- px = (0.5 + x / 2.0) * window_size[0] -- py = (0.5 + y / 2.0) * window_size[1] -+ px = round((0.5 + x / 2.0) * window_size[0]) -+ py = round((0.5 + y / 2.0) * window_size[1]) - - if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1): - return -1 diff --git a/python-uranium.spec b/python-uranium.spec index ae0ca25..5069c3f 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,16 +1,11 @@ Name: python-uranium -Version: 4.12.1 -Release: 2%{?dist} +Version: 4.13.0 +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 -# Round coordinates on getFaceIdAtPosition, to fix crash with Python 3.10+ -# Merged upstream -# Fixes https://bugzilla.redhat.com/2021157 -Patch1: %{url}/pull/750.patch - BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: /usr/bin/doxygen @@ -114,6 +109,9 @@ popd %changelog +* Fri Jan 21 2022 Gabriel Féron - 4.13.0-1 +- Update to 4.13.0 + * Fri Jan 21 2022 Fedora Release Engineering - 4.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 49f2996..d99a607 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.12.1.tar.gz) = bdf118341a52ac957ae8cc0acf2fb2c7381f9082e82c190a038333845ffc0fefa8c92702438898a63ccca9f0add69312b43168b993fcd38fe4f3ee3856b36eb9 +SHA512 (Uranium-4.13.0.tar.gz) = bba41754670b42eb92826fe1c2380b76afb62d16158c07f960315dbd77c55932d29dff594d71aff8eafc2f58d1aac4a14b0f6fc36a0a352872077b97c0d7f555 From fe3e4c5aef8d3a9bee8c9a27e5f5d98a6664bf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 1 Feb 2022 11:13:27 +0100 Subject: [PATCH 48/79] Update to 4.13.1 --- python-uranium.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index 5069c3f..ff990ab 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,5 +1,5 @@ Name: python-uranium -Version: 4.13.0 +Version: 4.13.1 Release: 1%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ @@ -109,6 +109,9 @@ popd %changelog +* Tue Feb 01 2022 Gabriel Féron - 4.13.1-1 +- Update to 4.13.1 + * Fri Jan 21 2022 Gabriel Féron - 4.13.0-1 - Update to 4.13.0 diff --git a/sources b/sources index d99a607..53c23c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-4.13.0.tar.gz) = bba41754670b42eb92826fe1c2380b76afb62d16158c07f960315dbd77c55932d29dff594d71aff8eafc2f58d1aac4a14b0f6fc36a0a352872077b97c0d7f555 +SHA512 (Uranium-4.13.1.tar.gz) = ff9573104c9cdf0a1ba3ff304c17dbbcdab561a7158138067067ea3c2d063c139545effb1b1c944da986053cb3ea68dc5b947c30c5578ef29f6858e3f9e461c3 From 4c9d2a170254ab7df83b05cf67c97f8ac120f57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 Mar 2022 23:06:12 +0100 Subject: [PATCH 49/79] Fix build with cmake 3.23.0rc2 --- python-uranium.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/python-uranium.spec b/python-uranium.spec index ff990ab..99b4182 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -25,9 +25,6 @@ BuildRequires: python3-twisted BuildArch: noarch -# Get Fedora 33++ behavior on anything older -%undefine __cmake_in_source_build - %description Uranium is a Python framework for building 3D printing related applications. @@ -60,7 +57,7 @@ related applications. %build # 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= . +%cmake -DLIB_SUFFIX:STR= %cmake_build %cmake_build -- doc @@ -109,6 +106,10 @@ popd %changelog +* Wed Mar 02 2022 Miro Hrončok - 4.13.1-2 +- Fix build with cmake 3.23.0rc2 +- Related: rhbz#2059201, rhbz#2059188, rhbz#2057738 + * Tue Feb 01 2022 Gabriel Féron - 4.13.1-1 - Update to 4.13.1 From 6909851465c8e63322fbd35a0a2a0839ebf72b40 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 17 Jun 2022 13:23:45 +0200 Subject: [PATCH 50/79] Rebuilt for Python 3.11 --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 99b4182..1a1e599 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.13.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -106,6 +106,9 @@ popd %changelog +* Fri Jun 17 2022 Python Maint - 4.13.1-3 +- Rebuilt for Python 3.11 + * Wed Mar 02 2022 Miro Hrončok - 4.13.1-2 - Fix build with cmake 3.23.0rc2 - Related: rhbz#2059201, rhbz#2059188, rhbz#2057738 From 751a64d9fc94fc2407abffc267283ad8ef617faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Jul 2022 14:45:02 +0200 Subject: [PATCH 51/79] https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- python-uranium.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-uranium.spec b/python-uranium.spec index 1a1e599..0c5d52e 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -25,6 +25,11 @@ BuildRequires: python3-twisted BuildArch: noarch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 +ExcludeArch: %{ix86} +%endif + %description Uranium is a Python framework for building 3D printing related applications. From 0f69743157d50a29c57ff5b6f384a90dcdfa7809 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 23:13:19 +0000 Subject: [PATCH 52/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 0c5d52e..6ff4038 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.13.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -111,6 +111,9 @@ popd %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 4.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jun 17 2022 Python Maint - 4.13.1-3 - Rebuilt for Python 3.11 From 3a6fe01b0b153ddbeaea1fe9326843c564cbab79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 18:11:21 +0000 Subject: [PATCH 53/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-uranium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-uranium.spec b/python-uranium.spec index 6ff4038..8ccb265 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 4.13.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -111,6 +111,9 @@ popd %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 4.13.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d82c9680eb6d667f5a37c2087ad48632628f2743 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Mar 2023 10:55:11 -0500 Subject: [PATCH 54/79] update to 5.3.0 --- CMakeLists.txt | 63 + CPackConfig.cmake | 34 + Doxyfile | 2331 +++++++++++++++++++++++++++++++++ UraniumPluginInstall.cmake | 99 ++ UraniumTests.cmake | 56 + UraniumTranslationTools.cmake | 114 ++ mod_bundled_packages_json.py | 69 + python-uranium.spec | 34 +- sources | 2 +- 9 files changed, 2795 insertions(+), 7 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 CPackConfig.cmake create mode 100644 Doxyfile create mode 100644 UraniumPluginInstall.cmake create mode 100644 UraniumTests.cmake create mode 100644 UraniumTranslationTools.cmake create mode 100644 mod_bundled_packages_json.py diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8e64f48 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,63 @@ +project(uranium NONE) + +cmake_minimum_required(VERSION 3.6) + +message(STATUS ${CMAKE_MODULE_PATH}) + +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/ + ${CMAKE_MODULE_PATH}) +include(UraniumTranslationTools) + +include(GNUInstallDirs) + +find_package(PythonInterp 3 REQUIRED) + +message("Using python version ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") + +# # Checks using pylint +# Note that we use exit 0 here to not mark the build as a failure on check failure +# In addition, the specified pylint configuration uses the spellchecker plugin. This required python-enchant to be installed. +add_custom_target(check) +add_custom_command(TARGET check POST_BUILD COMMAND "PYTHONPATH=${CMAKE_SOURCE_DIR}" ${PYTHON_EXECUTABLE} -m pylint --rcfile=${CMAKE_SOURCE_DIR}/pylint.cfg UM --msg-template=\"{path}:{line}: [{msg_id}({symbol}) , {obj}] {msg}\" > ${CMAKE_BINARY_DIR}/pylint.log || exit 0 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + +# # Check using Mypy +add_custom_target(typecheck) +add_custom_command(TARGET typecheck POST_BUILD COMMAND ${PYTHON_EXECUTABLE} run_mypy.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + +# # Tests +include(UraniumTests) + +# # Benchmarks +# add_custom_target(benchmark) +# file(GLOB bench_files tests/benchmarks/*/profile*.py) +# foreach(file ${bench_files}) +# add_custom_command(TARGET benchmark POST_BUILD COMMAND "PYTHONPATH=${CMAKE_SOURCE_DIR}" kernprof ARGS -l -v ${file}) +# endforeach() + + +# Documentation +find_package(Doxygen) +if(${DOXYGEN_FOUND}) + add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif() + +# Extract Strings +add_custom_target(extract-messages ${CMAKE_SOURCE_DIR}/scripts/extract-messages ${CMAKE_SOURCE_DIR} uranium) + +# Build Translations +CREATE_TRANSLATION_TARGETS() + + +if(EXISTS /etc/debian_version) + install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages) +else() + install(DIRECTORY UM DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +endif() +install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake + DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ ) +install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium) + +# Detect plugins to install +include(UraniumPluginInstall) + +include(CPackConfig.cmake) diff --git a/CPackConfig.cmake b/CPackConfig.cmake new file mode 100644 index 0000000..b104d64 --- /dev/null +++ b/CPackConfig.cmake @@ -0,0 +1,34 @@ +set(CPACK_PACKAGE_VENDOR "Ultimaker") +set(CPACK_PACKAGE_CONTACT "Arjen Hiemstra ") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Uranium 3D Application Framework") +set(CPACK_PACKAGE_VERSION_MAJOR 15) +set(CPACK_PACKAGE_VERSION_MINOR 05) +set(CPACK_PACKAGE_VERSION_PATCH 93) +set(CPACK_GENERATOR "DEB;RPM") + +set(RPM_REQUIRES + "python3 >= 3.5.0" + "python3-qt5 >= 5.6.0" + "qt5-qtquickcontrols >= 5.6.0" + "arcus >= 15.05.90" +) +string(REPLACE ";" "," RPM_REQUIRES "${RPM_REQUIRES}") +set(CPACK_RPM_PACKAGE_REQUIRES ${RPM_REQUIRES}) + +set(DEB_DEPENDS + "python3 (>= 3.5.0)" + "python3-pyqt5 (>= 5.6.0)" + "python3-pyqt5.qtopengl (>= 5.6.0)" + "python3-pyqt5.qtquick (>= 5.6.0)" + "python3-pyqt5.qtsvg (>= 5.6.0)" + "qml-module-qtquick2 (>= 5.6.0)" + "qml-module-qtquick-window2 (>= 5.6.0)" + "qml-module-qtquick-layouts (>= 5.6.0)" + "qml-module-qtquick-dialogs (>= 5.6.0)" + "qml-module-qtquick-controls (>= 5.6.0)" + "arcus (>= 15.05.90)" +) +string(REPLACE ";" "," DEB_DEPENDS "${DEB_DEPENDS}") +set(CPACK_DEBIAN_PACKAGE_DEPENDS ${DEB_DEPENDS}) + +include(CPack) diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 0000000..bf4dfa8 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,2331 @@ +# Doxyfile 1.8.8 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "Uranium" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Application Framework" + +# With the PROJECT_LOGO tag one can specify an logo or icon that is included in +# the documentation. The maximum height of the logo should not exceed 55 pixels +# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo +# to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a +# new page for each member. If set to NO, the documentation of a member will be +# part of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = type{1}=\1 + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = YES + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO these classes will be included in the various overviews. This option has +# no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the +# todo list. This list is created by putting \todo commands in the +# documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the +# test list. This list is created by putting \test commands in the +# documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES the list +# will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = NO + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO doxygen will only warn about wrong or incomplete parameter +# documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. + +INPUT = UM docs + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = docs/images + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER ) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES, then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefor more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra stylesheet files is of importance (e.g. the last +# stylesheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the stylesheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler ( hhc.exe). If non-empty +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated ( +# YES) or that it should be included in the master .chm file ( NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated ( +# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = YES + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using prerendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /