diff options
| author | Michał Pałubicki | 2019-03-16 21:16:58 +0100 |
|---|---|---|
| committer | Michał Pałubicki | 2019-03-16 21:18:42 +0100 |
| commit | 20070bb0f9570e4f8d4f152521a0c49929dbcf95 (patch) | |
| tree | 8e8f39138b677a39cd1d6acd0eab557966975e77 | |
| parent | c8dc771b1280c9ad953013d1cb4c7336d998c18b (diff) | |
| download | aur-20070bb0f9570e4f8d4f152521a0c49929dbcf95.tar.gz | |
Update version to 0.2.3
Patching is no longer needed
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | openpyxl-min_row.patch | 28 |
3 files changed, 7 insertions, 47 deletions
@@ -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 = 4 + pkgver = 0.2.3 + pkgrel = 1 url = http://agate-excel.readthedocs.org/ arch = any license = MIT @@ -12,10 +12,8 @@ pkgbase = python-agate-excel depends = python-xlrd>=0.9.4 depends = python-openpyxl>=2.3.0 depends = python-sphinx_rtd_theme>=0.1.6 - source = https://github.com/wireservice/agate-excel/archive/0.2.2.tar.gz - source = openpyxl-min_row.patch - sha256sums = 37acbc114c4c60aa37f908d93a9e9b597c3ba0ee42672f36f7a317f8af8fc581 - sha256sums = 56bba8744905429040cf8c2d4e343f654d0039c051fafff332fc1002e71ce278 + source = https://github.com/wireservice/agate-excel/archive/0.2.3.tar.gz + sha256sums = 83fc1e68b94704b7dae5f0880cb66facec43ecda08d5eafda3c0f2c27587cf53 pkgname = python-agate-excel @@ -3,8 +3,8 @@ _pkgname=agate-excel pkgname=python-$_pkgname -pkgver=0.2.2 -pkgrel=4 +pkgver=0.2.3 +pkgrel=1 pkgdesc="Adds read support for Excel files (xls and xlsx) to agate" arch=('any') url="http://agate-excel.readthedocs.org/" @@ -22,18 +22,8 @@ makedepends=( ) 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" -} +sha256sums=('83fc1e68b94704b7dae5f0880cb66facec43ecda08d5eafda3c0f2c27587cf53') package() { cd "$srcdir/$_pkgname-$pkgver" diff --git a/openpyxl-min_row.patch b/openpyxl-min_row.patch deleted file mode 100644 index 10a4200a8ab9..000000000000 --- a/openpyxl-min_row.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 |