From 701fdfcf4df6c40a358536fb724b5b0970153752e7efc141014dc17496266de4 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 26 Nov 2021 01:05:34 +0000
Subject: [PATCH] Accepting request 933924 from
 home:bnavigator:branches:devel:languages:python:numeric

- Update to 0.1.31
 * Fix order of columns after undo
 * Fix pasting of data with existing column names
 * Avoid empty trailing row after pasting

OBS-URL: https://build.opensuse.org/request/show/933924
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-python-qdatamatrix?expand=0&rev=5
---
 example.py                        | 22 +++++++++++++++-------
 python-python-qdatamatrix.changes |  8 ++++++++
 python-python-qdatamatrix.spec    | 10 +++++-----
 python-qdatamatrix-0.1.29.tar.gz  |  3 ---
 python-qdatamatrix-0.1.31.tar.gz  |  3 +++
 5 files changed, 31 insertions(+), 15 deletions(-)
 delete mode 100644 python-qdatamatrix-0.1.29.tar.gz
 create mode 100644 python-qdatamatrix-0.1.31.tar.gz

diff --git a/example.py b/example.py
index d1dac00..4378a41 100644
--- a/example.py
+++ b/example.py
@@ -24,14 +24,22 @@ import sys
 from qtpy import QtWidgets
 import qtpy
 
-dm = DataMatrix(length=3)
-dm.col1 = 1, 2, 3
-dm.col2 = 'a', 'b', 'c'
-print(dm)
 
+def show():
+	print(qdm._dm)
+	for n, c in qdm._dm.columns:
+		print(n, repr(c._rowid))
+
+
+dm = DataMatrix(length=4)
+dm.sorted = False
+dm.col1 = range(4)
+dm.col3 = ['a', 'b', 'c', 'd']
+dm.col2 = ['e', 'f', 'g', 'h']
+print(dm)
 app = QtWidgets.QApplication(sys.argv)
-qdm = QDataMatrix(dm)
-qdm.resize(600,400)
-# qdm.refresh()
+qdm = QDataMatrix(dm, read_only=False)
+qdm.resize(600, 400)
+qdm.changed.connect(show)
 qdm.show()
 sys.exit(app.exec_())
diff --git a/python-python-qdatamatrix.changes b/python-python-qdatamatrix.changes
index a9b90a5..774dae9 100644
--- a/python-python-qdatamatrix.changes
+++ b/python-python-qdatamatrix.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 25 20:52:01 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to 0.1.31
+ * Fix order of columns after undo
+ * Fix pasting of data with existing column names
+ * Avoid empty trailing row after pasting
+
 -------------------------------------------------------------------
 Fri Feb 19 19:04:31 UTC 2021 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-python-qdatamatrix.spec b/python-python-qdatamatrix.spec
index 108bb28..fec2bcc 100644
--- a/python-python-qdatamatrix.spec
+++ b/python-python-qdatamatrix.spec
@@ -19,7 +19,7 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 Name:           python-python-qdatamatrix
-Version:        0.1.29
+Version:        0.1.31
 Release:        0
 Summary:        A PyQt4/PyQt5 widget for viewing and editing a DataMatrix object
 License:        GPL-3.0-or-later
@@ -28,20 +28,20 @@ URL:            https://github.com/open-cogsci/python-qdatamatrix
 Source:         https://files.pythonhosted.org/packages/source/p/python-qdatamatrix/python-qdatamatrix-%{version}.tar.gz
 Source1:        https://raw.githubusercontent.com/open-cogsci/python-qdatamatrix/master/copyright
 Source2:        https://raw.githubusercontent.com/open-cogsci/python-qdatamatrix/master/example.py
-BuildRequires:  %{python_module PrettyTable}
 BuildRequires:  %{python_module QtPy}
-BuildRequires:  %{python_module fastnumbers}
 BuildRequires:  %{python_module python-datamatrix}
 # QtPy has a number of possible backends, none of them mandatory, use PyQt5 for the build
 BuildRequires:  %{python_module qt5}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+# SECTION TEST REQUIREMENTS (recommendations by datamatrix)
 BuildRequires:  xvfb-run
-Requires:       python-PrettyTable
+BuildRequires:  %{python_module fastnumbers}
+BuildRequires:  %{python_module prettytable}
+#/SECTION
 Requires:       python-QtPy
 Requires:       python-python-datamatrix
-Recommends:     python-fastnumbers
 BuildArch:      noarch
 
 %python_subpackages
diff --git a/python-qdatamatrix-0.1.29.tar.gz b/python-qdatamatrix-0.1.29.tar.gz
deleted file mode 100644
index 162bdcd..0000000
--- a/python-qdatamatrix-0.1.29.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9724e52e75c53f65a49afa056c3a11222d8d7f42a85c20572d4df39407cf977d
-size 7585
diff --git a/python-qdatamatrix-0.1.31.tar.gz b/python-qdatamatrix-0.1.31.tar.gz
new file mode 100644
index 0000000..997d46f
--- /dev/null
+++ b/python-qdatamatrix-0.1.31.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:925d617a892dfdf6aecac077fb025dfe7c0e7bcb6751ea9a84d2654229c943bb
+size 8116