Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-traitsui for openSUSE:Factory checked in at 2022-01-17 22:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-traitsui (Old) and /work/SRC/openSUSE:Factory/.python-traitsui.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-traitsui" Mon Jan 17 22:34:09 2022 rev:8 rq:946884 version:7.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-traitsui/python-traitsui.changes 2021-03-30 21:07:07.281160970 +0200 +++ /work/SRC/openSUSE:Factory/.python-traitsui.new.1892/python-traitsui.changes 2022-01-17 22:34:52.318276553 +0100 @@ -1,0 +2,31 @@ +Sun Jan 16 15:11:23 UTC 2022 - Ben Greiner <c...@bnavigator.de> + +- Update to 7.2.1 + * Explicitly require traits 6.2 and pyface 7.3 (#1666, #1668) +- Release 7.2.0 + * TraitsUI 7.2.0 is a minor release which includes numerous bug + fixes, documentation improvements, code maintenance changes, + and enhancements. + * The migration from on_trait_change to observe is underway. As a + result, TraitsUI now requires Traits >= 6.2. + * New display-only VideoEditor (currently only on Qt backend). + Exapnsion of features for the new UITester including the + ability to inspect UI object visibility / enabledness. Also + documentation for testing has been updated. + * Notes on upgrading: This release of TraitsUI now depends on + Traits 6.2+ and pyface 7.2+. Also, deprecated code / modules + have been removed. Namely, the :mod:traitsui.image + <traitsui.image> module which was moved to pyface.image, + editors_gen modules, Editor and EditorFactory factory methods + on Toolkit objects, and more. For a complete list, see PRs in + the "Removals" section. These were all generally unused / + deprecated for sometime. Also, importing directly from + traitsui.editors has been deprecated. Please update imports to + import directly from :mod:traitsui.api or + :mod:traitsui.editors.api. +- Detailed changelog at + https://github.com/enthought/traitsui/releases/tag/7.2.0 +- Add traitsui-pr1689-deprecations.patch + * gh#enthought/traitsui#1689 + gh#enthought/traitsui#1681 + +------------------------------------------------------------------- Old: ---- traitsui-7.1.1.tar.gz New: ---- traitsui-7.2.1.tar.gz traitsui-pr1689-deprecations.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-traitsui.spec ++++++ --- /var/tmp/diff_new_pack.jIbffM/_old 2022-01-17 22:34:52.970276985 +0100 +++ /var/tmp/diff_new_pack.jIbffM/_new 2022-01-17 22:34:52.974276987 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-traitsui # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-traitsui -Version: 7.1.1 +Version: 7.2.1 Release: 0 Summary: Traits-capable windowing framework # Source code is under BSD but images are under different licenses @@ -28,26 +28,28 @@ Group: Development/Libraries/Python URL: https://github.com/enthought/traitsui Source: https://files.pythonhosted.org/packages/source/t/traitsui/traitsui-%{version}.tar.gz +# PATCH-FIX-UPSTREAM traitsui-pr1689-deprecations.patch -- gh#enthought/traitsui#1689 + gh#enthought/traitsui#1681 +Patch0: traitsui-pr1689-deprecations.patch BuildRequires: %{python_module configobj} -BuildRequires: %{python_module pyface >= 7.1.0} +BuildRequires: %{python_module pyface >= 7.3} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module traits >= 6} +BuildRequires: %{python_module traits >= 6.2} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-pyface >= 7.1.0 -Requires: python-traits >= 6 +Requires: python-pyface >= 7.3 +Requires: python-traits >= 6.2 Recommends: python-configobj Recommends: python-qt5 Recommends: python-wxWidgets BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module Pygments} +BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytest-xvfb} BuildRequires: %{python_module pytest} BuildRequires: %{python_module qt5} BuildRequires: %{python_module wxPython >= 4} BuildRequires: Mesa-dri -BuildRequires: %{python_module numpy if (%python-base without python36-base)} # /SECTION %python_subpackages @@ -61,7 +63,7 @@ Part of the Enthought Tool Suite (ETS). %prep -%setup -q -n traitsui-%{version} +%autosetup -p1 -n traitsui-%{version} %build %python_build @@ -75,8 +77,6 @@ export LANG=en_US.UTF-8 # different splitters? donttest="test_splitter_prefs_are_restored" -# segfault -donttest+=" or test_html_editor" %pytest traitsui/tests -k "not ($donttest)" %files %{python_files} @@ -85,6 +85,6 @@ %doc examples/ %license LICENSE.txt image_LICENSE*.txt %{python_sitelib}/traitsui/ -%{python_sitelib}/traitsui-%{version}-py*.egg-info +%{python_sitelib}/traitsui-%{version}*-info %changelog ++++++ traitsui-7.1.1.tar.gz -> traitsui-7.2.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-traitsui/traitsui-7.1.1.tar.gz /work/SRC/openSUSE:Factory/.python-traitsui.new.1892/traitsui-7.2.1.tar.gz differ: char 5, line 1 ++++++ traitsui-pr1689-deprecations.patch ++++++ >From 0499a1ad2c84e967f556c90de39bc8deda1d69c3 Mon Sep 17 00:00:00 2001 From: Aaron Ayres <aay...@enthought.com> Date: Fri, 18 Jun 2021 10:29:16 -0500 Subject: [PATCH 1/4] be explicit about int --- traitsui/qt4/ui_panel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traitsui/qt4/ui_panel.py b/traitsui/qt4/ui_panel.py index 683b0fbe4..b39f89b3d 100644 --- a/traitsui/qt4/ui_panel.py +++ b/traitsui/qt4/ui_panel.py @@ -352,9 +352,9 @@ def sizeHint(): size = f() if ui.view is not None: if ui.view.width > 0: - size.setWidth(ui.view.width) + size.setWidth(int(ui.view.width)) if ui.view.height > 0: - size.setHeight(ui.view.height) + size.setHeight(int(ui.view.height)) return size return sizeHint >From 32f671b28346b81624e0b6305b0dabaf8d37c095 Mon Sep 17 00:00:00 2001 From: Aaron Ayres <aay...@enthought.com> Date: Fri, 18 Jun 2021 11:09:00 -0500 Subject: [PATCH 2/4] a couple more explicitly passing int --- traitsui/qt4/helper.py | 2 +- traitsui/qt4/ui_base.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/traitsui/qt4/helper.py b/traitsui/qt4/helper.py index fd56ba599..0d2261f55 100644 --- a/traitsui/qt4/helper.py +++ b/traitsui/qt4/helper.py @@ -100,7 +100,7 @@ def position_window(window, width=None, height=None, parent=None): if parent is None: # Center the popup on the screen. - window.move((screen_dx - width) / 2, (screen_dy - height) / 2) + window.move(int((screen_dx - width) / 2), int((screen_dy - height) / 2)) return # Calculate the desired size of the popup control: diff --git a/traitsui/qt4/ui_base.py b/traitsui/qt4/ui_base.py index b3705933f..d5c15d741 100644 --- a/traitsui/qt4/ui_base.py +++ b/traitsui/qt4/ui_base.py @@ -202,9 +202,9 @@ def sizeHint(self): size = QtGui.QDialog.sizeHint(self) view = self._ui.view if view.width > 0: - size.setWidth(view.width) + size.setWidth(int(view.width)) if view.height > 0: - size.setHeight(view.height) + size.setHeight(int(view.height)) return size def done(self, r): >From de5a81e15d44070a6ae85251dc25ac8c769bd1c2 Mon Sep 17 00:00:00 2001 From: Aaron Ayres <aay...@enthought.com> Date: Fri, 18 Jun 2021 11:11:50 -0500 Subject: [PATCH 3/4] another occurence in test_splitter_prefs_restored.py --- traitsui/tests/test_splitter_prefs_restored.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traitsui/tests/test_splitter_prefs_restored.py b/traitsui/tests/test_splitter_prefs_restored.py index 0aec027e0..4c53f21ac 100644 --- a/traitsui/tests/test_splitter_prefs_restored.py +++ b/traitsui/tests/test_splitter_prefs_restored.py @@ -36,7 +36,7 @@ def reset_prefs(self, ui_info): """ control = getattr(ui_info, "h_split").control width = control.width() - control.moveSplitter(width / 2, 1) + control.moveSplitter(int(width / 2), 1) def restore_prefs(self, ui_info): """ Apply the last saved ui preferences. >From 6fe3cbb8a4d3b725a6cb50f4fbcf0cd51b70ba97 Mon Sep 17 00:00:00 2001 From: aaronayres35 <36972686+aaronayre...@users.noreply.github.com> Date: Mon, 21 Jun 2021 04:51:36 -0700 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Poruri Sai Rahul <rpor...@enthought.com> --- traitsui/qt4/helper.py | 2 +- traitsui/tests/test_splitter_prefs_restored.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/traitsui/qt4/helper.py b/traitsui/qt4/helper.py index 0d2261f55..e9d07c6a9 100644 --- a/traitsui/qt4/helper.py +++ b/traitsui/qt4/helper.py @@ -100,7 +100,7 @@ def position_window(window, width=None, height=None, parent=None): if parent is None: # Center the popup on the screen. - window.move(int((screen_dx - width) / 2), int((screen_dy - height) / 2)) + window.move((screen_dx - width) // 2, (screen_dy - height) // 2) return # Calculate the desired size of the popup control: diff --git a/traitsui/tests/test_splitter_prefs_restored.py b/traitsui/tests/test_splitter_prefs_restored.py index 4c53f21ac..9387e2bdf 100644 --- a/traitsui/tests/test_splitter_prefs_restored.py +++ b/traitsui/tests/test_splitter_prefs_restored.py @@ -36,7 +36,7 @@ def reset_prefs(self, ui_info): """ control = getattr(ui_info, "h_split").control width = control.width() - control.moveSplitter(int(width / 2), 1) + control.moveSplitter(width // 2, 1) def restore_prefs(self, ui_info): """ Apply the last saved ui preferences. diff -up traitsui-7.2.1/traitsui/qt4/image_enum_editor.py.int traitsui-7.2.1/traitsui/qt4/image_enum_editor.py --- traitsui-7.2.1/traitsui/qt4/image_enum_editor.py.int 2021-05-11 21:01:44.000000000 -0600 +++ traitsui-7.2.1/traitsui/qt4/image_enum_editor.py 2021-06-09 20:13:53.769750877 -0600 @@ -298,7 +298,7 @@ class ImageEnumModel(QtCore.QAbstractTab """ Reimplemented to return the number of rows. """ cols = self._editor.factory.cols - result = (len(self._editor.names) + cols - 1) / cols + result = (len(self._editor.names) + cols - 1) // cols return result def columnCount(self, mi): diff -up traitsui-7.2.1/traitsui/qt4/image_enum_editor.py.int traitsui-7.2.1/traitsui/qt4/image_enum_editor.py --- traitsui-7.2.1/traitsui/qt4/image_enum_editor.py.int 2021-06-09 20:34:06.018235076 -0600 +++ traitsui-7.2.1/traitsui/qt4/image_enum_editor.py 2021-06-09 20:50:00.101731826 -0600 @@ -94,7 +94,7 @@ class SimpleEditor(BaseEditor, SimpleEnu else: cols = self.factory.cols rows = (len(self.names) + cols - 1) / cols - row, col = index / cols, index % cols + row, col = index // cols, index % cols self.control.setModelColumn(col) self.control.setCurrentIndex(row) self._no_enum_update -= 1 (No newline at EOF)