From 3f348f61a1616422fe6253fd69524f2623a2ad46 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Mon, 9 Sep 2024 21:11:22 +0200
Subject: [PATCH] upgpkg: python-pydicom 3.0.0-1

upstream release
---
 python-pydicom/.SRCINFO | 11 +++++------
 python-pydicom/PKGBUILD | 27 ++++++++++++---------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/python-pydicom/.SRCINFO b/python-pydicom/.SRCINFO
index 64ba51b..3d00d48 100644
--- a/python-pydicom/.SRCINFO
+++ b/python-pydicom/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-pydicom
 	pkgdesc = Pure python package for working with DICOM files
-	pkgver = 2.4.4
-	pkgrel = 2
+	pkgver = 3.0.0
+	pkgrel = 1
 	url = https://pydicom.github.io/pydicom/stable/index.html
 	arch = any
 	license = MIT
@@ -12,15 +12,14 @@ pkgbase = python-pydicom
 	makedepends = python-installer
 	makedepends = python-flit-core
 	depends = python
+	depends = python-setuptools
 	optdepends = python-numpy: for working with pixel data
 	optdepends = python-pillow: for working with compressed image data
 	optdepends = gdcm: for working with compressed JPEG, JPEG-LS and JPEG 2000 images
 	optdepends = python-pylibjpeg: for working with compressed JPEG images
 	optdepends = python-pylibjpeg-openjpeg: for working with compressed JPEG-LS or JPEG 2000 images
 	optdepends = python-pylibjpeg-rle: for working with compressed RLE images
-	source = python-pydicom-2.4.4.tar.gz::https://github.com/pydicom/pydicom/archive/v2.4.4.tar.gz
-	source = pillow-10.1.patch
-	sha256sums = 42c06ed74331174111dd42c89db774a13fc472abe18015f22c5aba80cddb7843
-	sha256sums = 72aa784588b8f8d07142d130e755f223827d9e143e8ba07bc2276b5b0cca7633
+	source = python-pydicom-3.0.0.tar.gz::https://github.com/pydicom/pydicom/archive/v3.0.0.tar.gz
+	sha256sums = 0d21b27ea0110190725ee7cf2ddc29de633e230518b6f859025c1bb063df1b21
 
 pkgname = python-pydicom
diff --git a/python-pydicom/PKGBUILD b/python-pydicom/PKGBUILD
index 145ba3c..c62dc00 100644
--- a/python-pydicom/PKGBUILD
+++ b/python-pydicom/PKGBUILD
@@ -2,13 +2,13 @@
 # Contributor: wedjat <wedjat@protonmail.com>
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 pkgname=python-pydicom
-pkgver=2.4.4
-pkgrel=2
+pkgver=3.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' 'LicenseRef-GDCM')
-depends=('python')
+depends=('python' 'python-setuptools')
 makedepends=('python-wheel' 'python-build' 'python-installer' 'python-flit-core')
 optdepends=('python-numpy: for working with pixel data'
             'python-pillow: for working with compressed image data'
@@ -18,16 +18,8 @@ optdepends=('python-numpy: for working with pixel data'
             'python-pylibjpeg-rle: for working with compressed RLE images'
             )
 checkdepends=('python-pytest')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz"
-        "pillow-10.1.patch")
-sha256sums=('42c06ed74331174111dd42c89db774a13fc472abe18015f22c5aba80cddb7843'
-            '72aa784588b8f8d07142d130e755f223827d9e143e8ba07bc2276b5b0cca7633')
-
-prepare()
-{
-	cd "$srcdir/pydicom-$pkgver"
-	patch --forward --strip=1 --input="$srcdir/pillow-10.1.patch"
-}
+source=("$pkgname-$pkgver.tar.gz::https://github.com/pydicom/pydicom/archive/v$pkgver.tar.gz")
+sha256sums=('0d21b27ea0110190725ee7cf2ddc29de633e230518b6f859025c1bb063df1b21')
 
 build()
 {
@@ -46,6 +38,11 @@ package()
 check()
 {
 	cd "$srcdir/pydicom-$pkgver"
-	# CLI tests are broken, skip those
-	pytest -k "not TestCLIcall"
+
+	# Create a venv because software needs to be installed to run tests
+	python -m venv --system-site-packages test-env
+	test-env/bin/python -m installer dist/*.whl
+
+	# Skipped tests: have almost correct assertions on exception message
+	test-env/bin/python -m pytest -v -k "not test_deepcopy_bufferedreader_raises and not test_no_decoders_raises"
 }