Support changes added in openpyxl 2.6

See: https://github.com/wireservice/agate-excel/issues/26

3 files changed, 51 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f9bd43356f1..78c1c8959354 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-agate-excel
 	pkgdesc = Adds read support for Excel files (xls and xlsx) to agate
 	pkgver = 0.2.2
-	pkgrel = 3
+	pkgrel = 4
 	url = http://agate-excel.readthedocs.org/
 	arch = any
 	license = MIT
@@ -13,7 +13,9 @@ pkgbase = python-agate-excel
 	depends = python-xlrd>=0.9.4
 	depends = python-openpyxl>=2.3.0
 	source = https://github.com/wireservice/agate-excel/archive/0.2.2.tar.gz
+	source = openpyxl-min_row.patch
 	sha256sums = 37acbc114c4c60aa37f908d93a9e9b597c3ba0ee42672f36f7a317f8af8fc581
+	sha256sums = 56bba8744905429040cf8c2d4e343f654d0039c051fafff332fc1002e71ce278
 
 pkgname = python-agate-excel
 
diff --git a/PKGBUILD b/PKGBUILD
index fa4c9eb09e7a..dd8bfeb4c497 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=agate-excel
 pkgname=python-$_pkgname
 pkgver=0.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Adds read support for Excel files (xls and xlsx) to agate"
 arch=('any')
 url="http://agate-excel.readthedocs.org/"
@@ -20,8 +20,20 @@ makedepends=(
     'python-sphinx>=1.2.2'
     'python-sphinx_rtd_theme>=0.1.6'
   )
-source=("https://github.com/wireservice/agate-excel/archive/${pkgver}.tar.gz")
-sha256sums=('37acbc114c4c60aa37f908d93a9e9b597c3ba0ee42672f36f7a317f8af8fc581')
+source=(
+    "https://github.com/wireservice/agate-excel/archive/${pkgver}.tar.gz"
+    "openpyxl-min_row.patch"
+  )
+sha256sums=(
+    '37acbc114c4c60aa37f908d93a9e9b597c3ba0ee42672f36f7a317f8af8fc581'
+    '56bba8744905429040cf8c2d4e343f654d0039c051fafff332fc1002e71ce278'
+  )
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  # See: https://github.com/wireservice/agate-excel/issues/26
+  patch -p1 -i "$srcdir/openpyxl-min_row.patch"
+}
 
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
@@ -32,4 +44,9 @@ package() {
   cp -rv "$srcdir/$_pkgname-$pkgver/build/sphinx/html" "$pkgdir/usr/share/doc/$_pkgname"
 }
 
+check() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python setup.py test --test-suite=tests
+}
+
 # vim:set ts=2 sw=2 et:
diff --git a/openpyxl-min_row.patch b/openpyxl-min_row.patch
new file mode 100644
index 000000000000..10a4200a8ab9
--- /dev/null
+++ b/openpyxl-min_row.patch
@@ -0,0 +1,28 @@
+From d1007ec796624be62c44a5e4aded36d5a510d19b Mon Sep 17 00:00:00 2001
+From: Tim Freund <tim@freunds.net>
+Date: Tue, 19 Feb 2019 15:43:29 -0500
+Subject: [PATCH] Update iter_rows row_offset to min_row
+
+This fixes issue #26.  Openpyxl removed row_offset in favor of min_row
+and max_row parameters.  The rows are indexed starting at 1 rather than
+0, so passing min_row=1 will retrieve all rows.
+---
+ agateexcel/table_xlsx.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 100755 agateexcel/table_xlsx.py
+
+diff --git a/agateexcel/table_xlsx.py b/agateexcel/table_xlsx.py
+old mode 100644
+new mode 100755
+index 87619e9..f1e1df8
+--- a/agateexcel/table_xlsx.py
++++ b/agateexcel/table_xlsx.py
+@@ -57,7 +57,7 @@ def from_xlsx(cls, path, sheet=None, skip_lines=0, header=True, read_only=True,
+         column_names = None
+         rows = []
+ 
+-        for i, row in enumerate(sheet.iter_rows(row_offset=skip_lines)):
++        for i, row in enumerate(sheet.iter_rows(min_row=skip_lines+1)):
+             if i == 0 and header:
+                 column_names = [None if c.value is None else six.text_type(c.value) for c in row]
+                 continue