summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD57
-rw-r--r--ebec469f4baa.diff36
3 files changed, 36 insertions, 89 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05d236a6bfe8..40dce4064982 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,20 @@
pkgbase = python-relatorio
pkgdesc = A templating library able to output odt and pdf files
- pkgver = 0.9.1
- pkgrel = 1
- url = http://relatorio.tryton.org/
+ pkgver = 0.10.1
+ pkgrel = 2
+ url = https://relatorio.tryton.org
arch = any
license = GPL
+ makedepends = python-build
+ makedepends = python-installer
makedepends = python-setuptools
- makedepends = python2-setuptools
- source = https://pypi.io/packages/source/r/relatorio/relatorio-0.9.1.tar.gz
- sha512sums = 1bbbf08f1003f94f18f35c0ed2d3ba9064d336c26997d96231f6523218941d926bc259caa8912f049fc6262649c0a1ebb38c8dbc3740be1d730abe69e5118964
-
-pkgname = python-relatorio
- depends = python-genshi>=0.5
- depends = python-lxml>=2.0
- optdepends = python-pycha>=0.4.0: chart support
- optdepends = python-yaml
+ makedepends = python-wheel
+ depends = python-genshi
+ depends = python-lxml
+ optdepends = python-pycha: chart support
+ optdepends = python-yaml: char support
optdepends = python-magic: fodt support
+ source = https://pypi.org/packages/source/r/relatorio/relatorio-0.10.1.tar.gz
+ sha512sums = 460f446944e6d8dc156f8d0ae287d9c2805e0843dcb304088cee92093e84be7b884ede6b3696af7a33527cc633e5de73269e6003f644f0d2a5b1ad0196a9f607
-pkgname = python2-relatorio
- depends = python2-genshi>=0.5
- depends = python2-lxml>=2.0
- optdepends = python2-pycha>=0.4.0: chart support
- optdepends = python2-yaml
- optdepends = python2-magic: fodt support
-
+pkgname = python-relatorio
diff --git a/PKGBUILD b/PKGBUILD
index fcf4a3a652b9..57cb9fde01a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,30 @@
-# Contributor: Richard PALO <richard.palo@free.fr>
+# Maintainer: Carlos Aznarán <caznaranl@uni.pe>
+# Maintainer: Richard PALO <richard.palo@free.fr>
# Contributor: Florian Walch <florian.walch@gmx.at>
-# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-pkgname=('python-relatorio' 'python2-relatorio')
-pkgver=0.9.1
-pkgrel=1
+# Contributor: Robin Baumgartner <robin@baumgartners.ch>
+_base=relatorio
+pkgname=python-${_base}
+pkgver=0.10.1
+pkgrel=2
pkgdesc="A templating library able to output odt and pdf files"
-arch=('any')
-url="http://relatorio.tryton.org/"
-license=('GPL')
-makedepends=('python-setuptools' 'python2-setuptools')
-source=("https://pypi.io/packages/source/r/relatorio/relatorio-$pkgver.tar.gz")
-sha512sums=('1bbbf08f1003f94f18f35c0ed2d3ba9064d336c26997d96231f6523218941d926bc259caa8912f049fc6262649c0a1ebb38c8dbc3740be1d730abe69e5118964')
-
-prepare() {
- cp -a relatorio-$pkgver{,-py2}
-}
+arch=(any)
+url="https://${_base}.tryton.org"
+license=(GPL)
+depends=(python-genshi python-lxml)
+makedepends=(python-build python-installer python-setuptools python-wheel)
+optdepends=('python-pycha: chart support'
+ 'python-yaml: char support'
+ 'python-magic: fodt support')
+source=(https://pypi.org/packages/source/${_base::1}/${_base}/${_base}-${pkgver}.tar.gz)
+sha512sums=('460f446944e6d8dc156f8d0ae287d9c2805e0843dcb304088cee92093e84be7b884ede6b3696af7a33527cc633e5de73269e6003f644f0d2a5b1ad0196a9f607')
build() {
- cd "$srcdir/relatorio-$pkgver"
- python setup.py build
-
- cd "$srcdir/relatorio-$pkgver-py2"
- python2 setup.py build
+ cd ${_base}-${pkgver}
+ python -m build --wheel --skip-dependency-check --no-isolation
}
-package_python-relatorio() {
- depends=('python-genshi>=0.5' 'python-lxml>=2.0')
- optdepends=('python-pycha>=0.4.0: chart support' 'python-yaml' 'python-magic: fodt support')
-
- cd "$srcdir/relatorio-$pkgver"
- python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
-}
-
-package_python2-relatorio() {
- depends=('python2-genshi>=0.5' 'python2-lxml>=2.0')
- optdepends=('python2-pycha>=0.4.0: chart support' 'python2-yaml' 'python2-magic: fodt support')
-
- cd "$srcdir/relatorio-$pkgver-py2"
- python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+package() {
+ cd ${_base}-${pkgver}
+ PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python -m installer --destdir="${pkgdir}" dist/*.whl
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
diff --git a/ebec469f4baa.diff b/ebec469f4baa.diff
deleted file mode 100644
index 1e228d5ac642..000000000000
--- a/ebec469f4baa.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Cédric Krier <ced@b2ck.com>
-# Date 1570791867 -7200
-# Node ID ebec469f4baa9523522bb5a81113bf9a381bfc87
-# Parent e1b70835bc9eaa1af25f390ead9dee50c8fbf8fe
-Support file-magic as fallback to python-magic
-
-bug53
-
-diff -r e1b70835bc9e -r ebec469f4baa CHANGES
---- a/CHANGES Mon Jul 29 16:12:32 2019 +0200
-+++ b/CHANGES Fri Oct 11 13:04:27 2019 +0200
-@@ -1,3 +1,5 @@
-+* Support file-magic as fallback to python-magic
-+
- 0.9.0 - 20190729
- * Support out parameter of render
- * Write opendocument stream directly to the ZipFile
-diff -r e1b70835bc9e -r ebec469f4baa relatorio/templates/opendocument.py
---- a/relatorio/templates/opendocument.py Mon Jul 29 16:12:32 2019 +0200
-+++ b/relatorio/templates/opendocument.py Fri Oct 11 13:04:27 2019 +0200
-@@ -950,7 +950,11 @@
- binary_data, = image.xpath(
- './office:binary-data', namespaces=namespaces)
- data = base64.b64decode(binary_data.text)
-- mime_type = magic.from_buffer(data, mime=True)
-+ if hasattr(magic, 'from_buffer'):
-+ mime_type = magic.from_buffer(data, mime=True)
-+ else:
-+ # Not python-magic but file-magic
-+ mime_type = magic.detect_from_content(data).mime_type
- name = 'Pictures/image%s%s' % (
- i, mimetypes.guess_extension(mime_type))
- image.remove(binary_data)
-