summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD24
-rw-r--r--resources.patch13
3 files changed, 39 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ced691e35fc..2d99c0c4ddc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
pkgbase = python-diagrams
pkgdesc = Diagram as Code for prototyping cloud system architectures
- pkgver = 0.18.0
+ pkgver = 0.23.4
pkgrel = 1
url = https://diagrams.mingrammer.com
arch = any
license = MIT
+ makedepends = python-build
+ makedepends = python-installer
+ makedepends = python-wheel
makedepends = python-setuptools
depends = python-graphviz
depends = python-jinja
- source = https://files.pythonhosted.org/packages/source/d/diagrams/diagrams-0.18.0.tar.gz
- sha256sums = 6f583c31cdbfec46ea12a0835ef1cc25a6d35d196a651a682f479dc53a04b12e
+ source = https://files.pythonhosted.org/packages/source/d/diagrams/diagrams-0.23.4.tar.gz
+ source = resources.patch
+ sha256sums = b7ada0b119b5189dd021b1dc1467fad3704737452bb18b1e06d05e4d1fa48ed7
+ sha256sums = a32edb9d779f786fd02632d95cdd0b22a45e3e845b3c63e8c9ab2491b6396732
pkgname = python-diagrams
-
diff --git a/PKGBUILD b/PKGBUILD
index 9202e54ac18e..b15a8b3ebad6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,36 @@
pkgname=python-diagrams
_name=${pkgname//python-}
-pkgver=0.18.0
+pkgver=0.23.4
pkgrel=1
pkgdesc="Diagram as Code for prototyping cloud system architectures"
arch=('any')
url="https://diagrams.mingrammer.com"
license=('MIT')
depends=('python-graphviz' 'python-jinja')
-makedepends=('python-setuptools')
-source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
-sha256sums=('6f583c31cdbfec46ea12a0835ef1cc25a6d35d196a651a682f479dc53a04b12e')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools')
+source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"
+ "resources.patch")
+sha256sums=('b7ada0b119b5189dd021b1dc1467fad3704737452bb18b1e06d05e4d1fa48ed7'
+ 'a32edb9d779f786fd02632d95cdd0b22a45e3e845b3c63e8c9ab2491b6396732')
+
+prepare() {
+ cd $_name-$pkgver
+ patch -p1 < ../resources.patch
+}
build() {
cd $_name-$pkgver
- python setup.py build
+ python -m build --wheel --no-isolation
}
package() {
cd $_name-$pkgver
- python setup.py install --root "$pkgdir" --skip-build --optimize=1
+ python -m installer --destdir="$pkgdir" dist/*.whl
+
+ local site_packages
+ site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+ find resources/ -type f -exec install -Dm644 "{}" "$pkgdir/$site_packages/$_name/{}" \;
+
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/resources.patch b/resources.patch
new file mode 100644
index 000000000000..996dcdf288cd
--- /dev/null
+++ b/resources.patch
@@ -0,0 +1,13 @@
+diff --git a/diagrams/__init__.py b/diagrams/__init__.py
+index 6968bc4..a67c33e 100644
+--- a/diagrams/__init__.py
++++ b/diagrams/__init__.py
+@@ -418,7 +418,7 @@ class Node:
+
+ def _load_icon(self):
+ basedir = Path(os.path.abspath(os.path.dirname(__file__)))
+- return os.path.join(basedir.parent, self._icon_dir, self._icon)
++ return os.path.join(basedir, self._icon_dir, self._icon)
+
+
+ class Edge: