14
0
forked from pool/python-tablib

Accepting request 688770 from home:pgajdos

- version update to 0.13.0
  * no upstream changelog (HISTORY.rst outdated), see git log
- deleted patches
  - openpyxl-usage-fix.patch (upstreamed)

OBS-URL: https://build.opensuse.org/request/show/688770
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tablib?expand=0&rev=3
This commit is contained in:
Tomáš Chvátal
2019-03-26 14:56:08 +00:00
committed by Git OBS Bridge
parent da5ebca95b
commit f9efd3b15e
5 changed files with 20 additions and 31 deletions

View File

@@ -1,23 +0,0 @@
From ac3cf67620c89f71b73bed891355e8dc0491a541 Mon Sep 17 00:00:00 2001
From: Gregory Bataille <gregory.bataille@gmail.com>
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:

View File

@@ -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 <jayvdb@gmail.com> Thu Mar 7 06:40:43 UTC 2019 - John Vandenberg <jayvdb@gmail.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package python-tablib # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
@@ -23,15 +23,17 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-tablib Name: python-tablib
Version: 0.12.1 Version: 0.13.0
Release: 0 Release: 0
Summary: Format agnostic tabular data library (XLS, JSON, YAML, CSV) Summary: Format agnostic tabular data library (XLS, JSON, YAML, CSV)
License: MIT License: MIT
Group: Development/Languages/Python 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 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 PyYAML >= 3.12}
%ifpython2
BuildRequires: python2-backports.csv
%endif
BuildRequires: %{python_module odfpy >= 1.3.5} BuildRequires: %{python_module odfpy >= 1.3.5}
BuildRequires: %{python_module openpyxl >= 2.4.8} BuildRequires: %{python_module openpyxl >= 2.4.8}
BuildRequires: %{python_module pandas >= 0.20.3} BuildRequires: %{python_module pandas >= 0.20.3}
@@ -49,6 +51,9 @@ Requires: python-unicodecsv >= 0.14.1
Requires: python-xlrd >= 1.1.0 Requires: python-xlrd >= 1.1.0
Requires: python-xlwt >= 1.3.0 Requires: python-xlwt >= 1.3.0
Requires: python-xml Requires: python-xml
%ifpython2
Requires: python2-backports.csv
%endif
Suggests: python-pandas >= 0.20.3 Suggests: python-pandas >= 0.20.3
BuildArch: noarch BuildArch: noarch
@@ -68,7 +73,6 @@ Output formats supported:
%prep %prep
%setup -q -n tablib-%{version} %setup -q -n tablib-%{version}
%patch0 -p1
# Remove shebang lines from non-executable scripts: # Remove shebang lines from non-executable scripts:
find tablib -name "*.py" | xargs sed -i '1 { /^#!/ d }' find tablib -name "*.py" | xargs sed -i '1 { /^#!/ d }'

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8cf50a61d66655229993f2ee29220553fb2c80403479f8e6de77c0c24649d87
size 63420

3
tablib-0.13.0.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f33c079b07eb10cf9c4b4696add2ecf32c89db7729240546ecdcd5c92f67e13
size 65131