upgpkg: 0.9.3-4

4 files changed, 11 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1902d4fda00f..45fdcbde1d6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-picologging
 	pkgdesc = An optimized logging library for Python
 	pkgver = 0.9.3
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/microsoft/picologging
 	arch = x86_64
 	license = MIT
@@ -19,9 +19,7 @@ pkgbase = python-picologging
 	depends = gcc-libs
 	depends = glibc
 	depends = python
-	source = python-picologging-0.9.3.tar.gz::https://github.com/microsoft/picologging/archive/refs/tags/0.9.3.tar.gz
-	source = remove-build-dependencies-cmake-ninja.patch
+	source = python-picologging-0.9.3.tar.gz::https://github.com/microsoft/picologging/archive/0.9.3.tar.gz
 	sha256sums = ed5e9d31c2d06fd02d4304bfb98cb200acbf11e1f03d6a5b341263cf312a18b2
-	sha256sums = 7a74c72ad8fafa38116b5c717092024d607a426b2040b625267dadc190e90c4b
 
 pkgname = python-picologging
diff --git a/.gitignore b/.gitignore
index a8cd12a49d2b..0df2b70016b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 !.nvchecker.toml
 !.SRCINFO
 !PKGBUILD
-!remove-build-dependencies-cmake-ninja.patch
diff --git a/PKGBUILD b/PKGBUILD
index 96ce84b5802b..98caec924d17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
+# Maintainer: Carl Smedstad <carsme@archlinux.org>
 
 pkgname=python-picologging
-_name=${pkgname#python-}
+_pkgname=${pkgname#python-}
 pkgver=0.9.3
-pkgrel=3
+pkgrel=4
 pkgdesc="An optimized logging library for Python"
 arch=(x86_64)
 url="https://github.com/microsoft/picologging"
@@ -28,29 +28,16 @@ checkdepends=(
   python-pytest
   python-pytest-memray
 )
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+sha256sums=('ed5e9d31c2d06fd02d4304bfb98cb200acbf11e1f03d6a5b341263cf312a18b2')
 
-source=(
-  "$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-  "remove-build-dependencies-cmake-ninja.patch"
-)
-sha256sums=(
-  'ed5e9d31c2d06fd02d4304bfb98cb200acbf11e1f03d6a5b341263cf312a18b2'
-  '7a74c72ad8fafa38116b5c717092024d607a426b2040b625267dadc190e90c4b'
-)
-
-_archive="$_name-$pkgver"
-
-prepare() {
-  cd "$_archive"
-
-  patch --forward --strip=1 --input="$srcdir/remove-build-dependencies-cmake-ninja.patch"
-}
+_archive="$_pkgname-$pkgver"
 
 build() {
   cd "$_archive"
 
   export CMAKE_ARGS=-Wno-dev
-  python -m build --wheel --no-isolation
+  python -m build --wheel --no-isolation --skip-dependency-check
 }
 
 check() {
@@ -59,8 +46,8 @@ check() {
   rm -rf tmp_install
   python -m installer --destdir=tmp_install dist/*.whl
 
-  _site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
-  export PYTHONPATH="$PWD/tmp_install/$_site_packages:$PYTHONPATH"
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  export PYTHONPATH="$PWD/tmp_install/$site_packages"
   # Deselected test fails with MEMORY PROBLEMS in a chroot.
   pytest \
     --deselect tests/unit/test_logger.py::test_nested_frame_stack
diff --git a/remove-build-dependencies-cmake-ninja.patch b/remove-build-dependencies-cmake-ninja.patch
deleted file mode 100644
index a49d40cd9730..000000000000
--- a/remove-build-dependencies-cmake-ninja.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --unified --recursive --text picologging-0.9.3.orig/pyproject.toml picologging-0.9.3/pyproject.toml
---- picologging-0.9.3.orig/pyproject.toml	2023-12-31 14:08:25.680232814 +0100
-+++ picologging-0.9.3/pyproject.toml	2023-12-31 14:08:34.000266413 +0100
-@@ -2,8 +2,6 @@
- requires = [
-     "setuptools>=65.4.1",
-     "scikit-build>=0.17.0",
--    "cmake>=3.18",
--    "ninja",
- ]
- build-backend = "setuptools.build_meta"
-