Chih-Hsuan Yen pushed to branch main at Arch Linux / Packaging / Packages / 
python-anyio


Commits:
1430edb3 by Chih-Hsuan Yen at 2025-01-01T07:49:01+08:00
Get rid of the local patch

Maintaining that patch has been annoying. Use the reinstated
python-exceptiongroup instead.

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- − no-exceptiongroup.diff


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = python-anyio
        pkgdesc = High level compatibility layer for multiple asynchronous 
event loop implementations
        pkgver = 4.7.0
-       pkgrel = 1
+       pkgrel = 2
        url = https://github.com/agronholm/anyio
        arch = any
        license = MIT
@@ -11,6 +11,7 @@ pkgbase = python-anyio
        checkdepends = python-pytest-mock
        checkdepends = python-psutil
        checkdepends = python-truststore
+       checkdepends = python-exceptiongroup
        makedepends = python-build
        makedepends = python-installer
        makedepends = python-setuptools
@@ -26,8 +27,6 @@ pkgbase = python-anyio
        optdepends = python-uvloop: use uvloop for asyncio backend
        optdepends = python-pytest: pytest plugin
        source = 
https://github.com/agronholm/anyio/archive/4.7.0/anyio-4.7.0.tar.gz
-       source = no-exceptiongroup.diff
        sha256sums = 
f60b4c7ba4281dafa34d90781bb270db0db3b7322a7334200925abddec61a44e
-       sha256sums = 
3f0b76ba8f7c8d79170701ab94746568b1cc121caa8f749a29568018ab88f036
 
 pkgname = python-anyio


=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
 pkgname=python-anyio
 # https://github.com/agronholm/anyio/blob/master/docs/versionhistory.rst
 pkgver=4.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='High level compatibility layer for multiple asynchronous event loop 
implementations'
 arch=(any)
 url='https://github.com/agronholm/anyio'
@@ -12,17 +12,15 @@ depends=(python python-idna python-sniffio)
 makedepends=(python-build python-installer python-setuptools 
python-setuptools-scm python-wheel
              python-uvloop python-trio)
 checkdepends=(python-pytest python-trustme python-hypothesis 
python-pytest-mock python-psutil
-              python-truststore)
+              python-truststore python-exceptiongroup)
 optdepends=(
   'python-trio: trio backend'
   'python-outcome: trio backend'
   'python-uvloop: use uvloop for asyncio backend'
   'python-pytest: pytest plugin'
 )
-source=(https://github.com/agronholm/anyio/archive/$pkgver/anyio-$pkgver.tar.gz
-        no-exceptiongroup.diff)
-sha256sums=('f60b4c7ba4281dafa34d90781bb270db0db3b7322a7334200925abddec61a44e'
-            '3f0b76ba8f7c8d79170701ab94746568b1cc121caa8f749a29568018ab88f036')
+source=(https://github.com/agronholm/anyio/archive/$pkgver/anyio-$pkgver.tar.gz)
+sha256sums=('f60b4c7ba4281dafa34d90781bb270db0db3b7322a7334200925abddec61a44e')
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
 
@@ -30,12 +28,6 @@ prepare() {
   cd anyio-$pkgver
   # Remove "error" from pytest filterwarnings
   sed -i '/"error"/d' pyproject.toml
-
-  # Avoid checkdepends on python-exceptiongroup, which was removed from Arch 
Linux [1].
-  # Specifically, I rewrite a test to use the new except* syntax, which is 
inspired by [2].
-  # [1] 
https://gitlab.archlinux.org/archlinux/packaging/state/-/commit/de33ab36729b786b80bf314f4e0296fc0cefec5b
-  # [2] 
https://github.com/agronholm/exceptiongroup?tab=readme-ov-file#catching-exceptions
-  patch -Np1 -i ../no-exceptiongroup.diff
 }
 
 build() {


=====================================
no-exceptiongroup.diff deleted
=====================================
@@ -1,24 +0,0 @@
-diff --git a/tests/test_taskgroups.py b/tests/test_taskgroups.py
-index 11329df..acef11f 100644
---- a/tests/test_taskgroups.py
-+++ b/tests/test_taskgroups.py
-@@ -8,7 +8,6 @@ from collections.abc import AsyncGenerator, Coroutine, 
Generator
- from typing import Any, NoReturn, cast
- 
- import pytest
--from exceptiongroup import catch
- from pytest import FixtureRequest
- from pytest_mock import MockerFixture
- 
-@@ -1330,8 +1329,10 @@ async def test_reraise_cancelled_in_excgroup() -> None:
- 
-     with CancelScope() as scope:
-         scope.cancel()
--        with catch({get_cancelled_exc_class(): handler}):
-+        try:
-             await anyio.sleep_forever()
-+        except* get_cancelled_exc_class() as excgrp:
-+            handler(excgrp)
- 
- 
- async def test_cancel_child_task_when_host_is_shielded() -> None:



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-anyio/-/commit/1430edb3f29c412be85ed51583cbb5c09bda03ab

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/python-anyio/-/commit/1430edb3f29c412be85ed51583cbb5c09bda03ab
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to