summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD65
-rw-r--r--install.patch13
3 files changed, 43 insertions, 50 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac439627a7c7..0d408080c47b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
pkgbase = python-booleanoperations
- pkgdesc = Boolean operations on paths.
+ pkgdesc = Boolean operations on paths
pkgver = 0.9.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/typemytype/booleanOperations
arch = any
license = MIT
- makedepends = python-setuptools
+ checkdepends = python-defcon
+ checkdepends = python-fontpens
+ checkdepends = python-pytest
+ makedepends = python-setuptools-scm
+ depends = python
depends = python-pyclipper
depends = python-fonttools
- options = !emptydirs
- source = https://pypi.org/packages/source/b/booleanOperations/booleanOperations-0.9.0.zip
- source = install.patch
+ source = https://files.pythonhosted.org/packages/source/b/booleanOperations/booleanOperations-0.9.0.zip
sha256sums = 8cfa821c32ad374fa120d6b2e0b444ebeac57c91e6631528645fa19ac2a281b8
- sha256sums = db49ee64cf2799da96c600570c3557ef2fee2998223d2ff5c0ad4ce62bfd4be6
pkgname = python-booleanoperations
diff --git a/PKGBUILD b/PKGBUILD
index aaad5895a455..7b0641aa2f81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,46 @@
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
# Maintainer: Guillaume Horel <guillaume.horel@gmail.com>
-# Ex-Maintainer: William Turner <willtur.will@gmail.com>
-pkgname='python-booleanoperations'
-_pkgname=booleanOperations
+# Contributor: William Turner <willtur.will@gmail.com>
+
+_pyname=booleanOperations
+pkgname=python-${_pyname,,}
pkgver=0.9.0
-pkgrel=1
-pkgdesc='Boolean operations on paths.'
-arch=('any')
-url='https://github.com/typemytype/booleanOperations'
-license=('MIT')
-#checkdepends=('python-pytest' 'python-defcon' 'python-fontpens')
-checkdepends=()
-depends=('python-pyclipper' 'python-fonttools')
-makedepends=('python-setuptools')
-options=(!emptydirs)
-source=("https://pypi.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.zip"
- 'install.patch')
-sha256sums=('8cfa821c32ad374fa120d6b2e0b444ebeac57c91e6631528645fa19ac2a281b8'
- 'db49ee64cf2799da96c600570c3557ef2fee2998223d2ff5c0ad4ce62bfd4be6')
+pkgrel=2
+pkgdesc='Boolean operations on paths'
+arch=(any)
+url="https://github.com/typemytype/$_pyname"
+license=(MIT)
+_pydeps=(pyclipper
+ fonttools)
+depends=(python
+ "${_pydeps[@]/#/python-}")
+checkdepends=(python-defcon
+ python-fontpens
+ python-pytest)
+makedepends=(python-setuptools-scm)
+_archive="$_pyname-$pkgver"
+source=("https://files.pythonhosted.org/packages/source/${_pyname::1}/$_pyname/$_archive.zip")
+sha256sums=('8cfa821c32ad374fa120d6b2e0b444ebeac57c91e6631528645fa19ac2a281b8')
prepare() {
- cd "$_pkgname-$pkgver"
- patch -p1 -i ../install.patch
+ cd "$_archive"
+ # Upstream PR: https://github.com/typemytype/booleanOperations/pull/63
+ sed -i -e '/wheel$/d' setup.cfg
}
build() {
- cd "$_pkgname-$pkgver"
- python setup.py build
+ cd "$_archive"
+ export PYTHONHASHSEED=0
+ python setup.py build
}
-package() {
- cd "$_pkgname-$pkgver"
- python setup.py install --root=$pkgdir --optimize=1 --skip-build
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+check() {
+ cd "$_archive"
+ PYTHONPATH=Lib pytest tests
}
-# tests disabled to break circular dependency
-#check() {
- #cd "${_pkgname}-${pkgver}"
- #pytest
-#}
+package() {
+ cd "$_archive"
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+ install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE
+}
diff --git a/install.patch b/install.patch
deleted file mode 100644
index 2bfbdbb52bd5..000000000000
--- a/install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN booleanOperations-0.9.0-orig/setup.cfg booleanOperations-0.9.0/setup.cfg
---- booleanOperations-0.9.0-orig/setup.cfg 2021-07-23 08:19:06.148410072 -0400
-+++ booleanOperations-0.9.0/setup.cfg 2021-07-23 08:19:20.288411176 -0400
-@@ -23,9 +23,6 @@
- package_dir = =Lib
- packages = find:
- python_requires = >=3.6
--setup_requires =
-- setuptools_scm
-- wheel
- install_requires =
- pyclipper >= 1.1.0.post1
- fonttools >= 4.0.2