summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2020-03-04 08:39:25 +0300
committerCaleb Maclennan2020-03-04 08:39:25 +0300
commit2d6eb3635f4fe5efb10c47a611617cc0b845d245 (patch)
tree09cc1643065132632533d3acbdf57dad5d591d99
parent1cae86bdfd931b0475ed23b027b12ed6f5cf31d6 (diff)
downloadaur-2d6eb3635f4fe5efb10c47a611617cc0b845d245.tar.gz
Update dependencies per upstream, sync with stable packaging
-rw-r--r--.SRCINFO29
-rw-r--r--PKGBUILD86
2 files changed, 56 insertions, 59 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fe8fdc713b9..a3560a455d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,28 @@
-# Generated by mksrcinfo v8
-# Thu Sep 27 18:43:36 UTC 2018
pkgbase = csvkit-git
- pkgdesc = A suite of utilities for converting to and working with CSV.
- pkgver = 1.0.3.r35.g6d280f5
+ pkgdesc = A suite of utilities for converting to and working with CSV
+ pkgver = 1.0.4.r29.g9b76055
pkgrel = 1
url = http://csvkit.readthedocs.org
arch = any
license = MIT
- makedepends = git
makedepends = python-setuptools
- makedepends = python-pip
+ makedepends = python-sphinx>=1.2.2
depends = python
- depends = python-agate
- depends = python-agate-dbf
- depends = python-agate-excel
- depends = python-agate-sql
+ depends = python-agate-dbf>=0.2.0
+ depends = python-agate-excel>=0.2.2
+ depends = python-agate-sql>=0.5.3
+ depends = python-agate>=1.6.1
+ depends = python-babel
depends = python-dateutil
- depends = python-six
+ depends = python-openpyxl
+ depends = python-six>=1.6.1
+ depends = python-sphinx_rtd_theme>=0.1.6
depends = python-sqlalchemy
- provides = csvkit=1.0.3
+ depends = python-xlrd
+ optdepends = ipython: nicer command-line for csvpy utility
+ provides = csvkit
conflicts = csvkit
- source = csvkit::git://github.com/wireservice/csvkit.git
- md5sums = SKIP
+ source = csvkit-git::git://github.com/wireservice/csvkit.git
sha256sums = SKIP
pkgname = csvkit-git
diff --git a/PKGBUILD b/PKGBUILD
index 1a4c4800e7f..8ce162357f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,65 +3,61 @@
# Contributor: Mariusz Szczepańczyk <mszczepanczyk@gmail.com>
# Contributor: Thor K. H. <thor alfakrøll roht dott no>
-set -u
-_pkgname='csvkit'
-pkgname="${_pkgname}-git"
-pkgver=1.0.3.r35.g6d280f5
+pkgname=csvkit-git
+pkgver=1.0.4.r29.g9b76055
pkgrel=1
-pkgdesc="A suite of utilities for converting to and working with CSV."
+pkgdesc='A suite of utilities for converting to and working with CSV'
arch=('any')
url='http://csvkit.readthedocs.org'
license=('MIT')
depends=(
- 'python'
- 'python-agate' # >= 1.2.2
- 'python-agate-dbf' # >= 0.1.0
- 'python-agate-excel' # >= 0.1.0
- 'python-agate-sql'
- 'python-dateutil' # >=2.2
- 'python-six' # >=1.6.1
- 'python-sqlalchemy' # >=0.9.3
-)
+ 'python'
+ 'python-agate-dbf>=0.2.0'
+ 'python-agate-excel>=0.2.2'
+ 'python-agate-sql>=0.5.3'
+ 'python-agate>=1.6.1'
+ 'python-babel'
+ 'python-dateutil'
+ 'python-openpyxl'
+ 'python-six>=1.6.1'
+ 'python-sphinx_rtd_theme>=0.1.6'
+ 'python-sqlalchemy'
+ 'python-xlrd'
+ )
+optdepends=(
+ 'ipython: nicer command-line for csvpy utility'
+ )
makedepends=(
- 'git'
- 'python-setuptools'
- 'python-pip'
-)
-provides=("${_pkgname}=${pkgver%%.r*}")
-conflicts=("${_pkgname}")
-_srcdir='csvkit'
-source=('csvkit::git://github.com/wireservice/csvkit.git')
-md5sums=('SKIP')
+ 'python-setuptools'
+ 'python-sphinx>=1.2.2'
+ )
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("$pkgname::git://github.com/wireservice/${pkgname/-/.}")
sha256sums=('SKIP')
pkgver() {
- set -u
- cd "${_srcdir}"
- git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
- set +u
+ cd "$pkgname"
+ git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
}
-prepare() {
- set -u
- cd "${_srcdir}"
- # Quick and dirty fix until the author officially supports dateutil>=2.2
- # (see https://github.com/onyxfish/csvkit/issues/370)
- #sed -i 's/python-dateutil==2.2/python-dateutil>=2.2/' setup.py
- #sed -i 's/openpyxl==2.2.0-b1/openpyxl>=2.2.0-b1/' setup.py
- set +u
+build() {
+ cd "$pkgname"
+ python setup.py build
+ python setup.py build_sphinx
+ _rtd_theme_path="$(python -c 'import sphinx_rtd_theme; print(sphinx_rtd_theme.get_html_theme_path())')"
+ rm -rvf "build/sphinx/html/_static"
+ ln -svf "$_rtd_theme_path/sphinx_rtd_theme/static" "build/sphinx/html/_static"
}
-build() {
- set -u
- cd "${_srcdir}"
- python setup.py build
- set +u
+check() {
+ cd "$pkgname"
+ python setup.py test
}
package() {
- set -u
- cd "${_srcdir}"
- python setup.py install --root="${pkgdir}" --optimize=1
- set +u
+ cd "$pkgname"
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ mkdir -p "$pkgdir/usr/share/doc"
+ cp -rv "build/sphinx/html" "$pkgdir/usr/share/doc/$pkgname"
}
-set +u