From 2dcb7272b0ba6f0b752a61755229658e31212125 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Sat, 30 May 2020 10:33:38 +0200 Subject: [PATCH] Update to v2.0.0. This version dropped python 2 support and so does this package. --- .SRCINFO | 12 +++--------- PKGBUILD | 22 +++++----------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b7bae86..5fc3f8f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = python-pydicom pkgdesc = Pure python package for working with DICOM files - pkgver = 1.4.2 + pkgver = 2.0.0 pkgrel = 1 url = https://pydicom.github.io/pydicom/stable/index.html arch = any @@ -8,17 +8,11 @@ pkgbase = python-pydicom license = custom checkdepends = python-pytest makedepends = python-setuptools - makedepends = python2-setuptools depends = python optdepends = python-numpy: for working with pixel data optdepends = python-pillow: for working with compressed image data - source = python-pydicom-1.4.2.tar.gz::https://github.com/pydicom/pydicom/archive/v1.4.2.tar.gz - md5sums = dc5c3e61f6dd6db4b92f34c8026b6e8a + source = python-pydicom-2.0.0.tar.gz::https://github.com/pydicom/pydicom/archive/v2.0.0.tar.gz + md5sums = 57262b6846904fd14647430363c2319a pkgname = python-pydicom -pkgname = python2-pydicom - depends = python2 - optdepends = python2-numpy: for working with pixel data - optdepends = python2-pillow: for working with compressed image data - diff --git a/PKGBUILD b/PKGBUILD index 332cdfb..9766814 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,20 +1,20 @@ # Maintainer: Bert Peters # Maintainer: wedjat # Contributor: Andrzej Giniewicz -pkgname=('python-pydicom' 'python2-pydicom') -pkgver=1.4.2 +pkgname=python-pydicom +pkgver=2.0.0 pkgrel=1 pkgdesc="Pure python package for working with DICOM files" arch=("any") url="https://pydicom.github.io/pydicom/stable/index.html" license=('MIT' 'custom') depends=('python') -makedepends=('python-setuptools' 'python2-setuptools') +makedepends=('python-setuptools') optdepends=('python-numpy: for working with pixel data' 'python-pillow: for working with compressed image data') checkdepends=('python-pytest') source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz") -md5sums=('dc5c3e61f6dd6db4b92f34c8026b6e8a') +md5sums=('57262b6846904fd14647430363c2319a') build() { @@ -22,7 +22,7 @@ build() python setup.py build } -package_python-pydicom() +package() { cd "$srcdir/pydicom-$pkgver" python setup.py install --skip-build --root="$pkgdir"/ --optimize=1 @@ -30,18 +30,6 @@ package_python-pydicom() install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_python2-pydicom() -{ - depends=('python2') - optdepends=('python2-numpy: for working with pixel data' - 'python2-pillow: for working with compressed image data') - cd "$srcdir/pydicom-$pkgver" - python2 setup.py install --skip-build --root="$pkgdir"/ --optimize=1 - - install -D "$srcdir/pydicom-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - - check() { cd "$srcdir/pydicom-$pkgver"