diff --git a/openpyxl-usage-fix.patch b/openpyxl-usage-fix.patch deleted file mode 100644 index cf7f299..0000000 --- a/openpyxl-usage-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ac3cf67620c89f71b73bed891355e8dc0491a541 Mon Sep 17 00:00:00 2001 -From: Gregory Bataille -Date: Wed, 12 Sep 2018 13:34:55 +0200 -Subject: [PATCH] fix(): remove openpyxl warning by properly accessing cells - (#296) - ---- - tablib/formats/_xlsx.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tablib/formats/_xlsx.py b/tablib/formats/_xlsx.py -index 20f55df..eb921f9 100644 ---- a/tablib/formats/_xlsx.py -+++ b/tablib/formats/_xlsx.py -@@ -119,7 +119,7 @@ def dset_sheet(dataset, ws, freeze_panes=True): - row_number = i + 1 - for j, col in enumerate(row): - col_idx = get_column_letter(j + 1) -- cell = ws.cell('%s%s' % (col_idx, row_number)) -+ cell = ws['%s%s' % (col_idx, row_number)] - - # bold headers - if (row_number == 1) and dataset.headers: diff --git a/python-tablib.changes b/python-tablib.changes index 12c5868..c40811f 100644 --- a/python-tablib.changes +++ b/python-tablib.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 26 10:26:24 UTC 2019 - pgajdos@suse.com + +- version update to 0.13.0 + * no upstream changelog (HISTORY.rst outdated), see git log +- deleted patches + - openpyxl-usage-fix.patch (upstreamed) + ------------------------------------------------------------------- Thu Mar 7 06:40:43 UTC 2019 - John Vandenberg diff --git a/python-tablib.spec b/python-tablib.spec index cb3d2c4..8a9602c 100644 --- a/python-tablib.spec +++ b/python-tablib.spec @@ -1,7 +1,7 @@ # # spec file for package python-tablib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} %if 0%{?rhel} # I get syntax errors in the brp-python-bytecompile step... %define _python_bytecompile_errors_terminate_build 0 %endif - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-tablib -Version: 0.12.1 +Version: 0.13.0 Release: 0 Summary: Format agnostic tabular data library (XLS, JSON, YAML, CSV) License: MIT Group: Development/Languages/Python -Url: http://python-tablib.org +URL: http://python-tablib.org Source: https://files.pythonhosted.org/packages/source/t/tablib/tablib-%{version}.tar.gz -Patch0: openpyxl-usage-fix.patch BuildRequires: %{python_module PyYAML >= 3.12} BuildRequires: %{python_module odfpy >= 1.3.5} BuildRequires: %{python_module openpyxl >= 2.4.8} @@ -42,6 +40,7 @@ BuildRequires: %{python_module xlwt >= 1.3.0} BuildRequires: %{python_module xml} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: python2-backports.csv Requires: python-PyYAML >= 3.12 Requires: python-odfpy >= 1.3.5 Requires: python-openpyxl >= 2.4.8 @@ -51,7 +50,9 @@ Requires: python-xlwt >= 1.3.0 Requires: python-xml Suggests: python-pandas >= 0.20.3 BuildArch: noarch - +%ifpython2 +Requires: python2-backports.csv +%endif %python_subpackages %description @@ -68,7 +69,6 @@ Output formats supported: %prep %setup -q -n tablib-%{version} -%patch0 -p1 # Remove shebang lines from non-executable scripts: find tablib -name "*.py" | xargs sed -i '1 { /^#!/ d }' diff --git a/tablib-0.12.1.tar.gz b/tablib-0.12.1.tar.gz deleted file mode 100644 index 8a10424..0000000 --- a/tablib-0.12.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8cf50a61d66655229993f2ee29220553fb2c80403479f8e6de77c0c24649d87 -size 63420 diff --git a/tablib-0.13.0.tar.gz b/tablib-0.13.0.tar.gz new file mode 100644 index 0000000..3acc9c7 --- /dev/null +++ b/tablib-0.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f33c079b07eb10cf9c4b4696add2ecf32c89db7729240546ecdcd5c92f67e13 +size 65131