diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | python-pythonfinder-2.0.6-pydantic2.patch | 64 |
3 files changed, 7 insertions, 87 deletions
@@ -1,6 +1,6 @@ pkgbase = python-pythonfinder pkgdesc = Cross Platform Search Tool for Finding Pythons - pkgver = 2.0.6 + pkgver = 2.1.0 pkgrel = 1 url = https://github.com/sarugaku/pythonfinder arch = any @@ -13,15 +13,10 @@ pkgbase = python-pythonfinder makedepends = python-setuptools makedepends = python-wheel depends = python - depends = python-cached-property depends = python-packaging - depends = python-pydantic optdepends = python-click: for CLI - source = pythonfinder-2.0.6.tar.gz::https://github.com/sarugaku/pythonfinder/archive/refs/tags/2.0.6.tar.gz - source = python-pythonfinder-2.0.6-pydantic2.patch - sha512sums = 046fcf19f5d94841498a23ae5600aec48bc938f04a8c08b57e6e7e055b687220068d65e42a30a603586f112c2bd2306ae683be151af7a10763e76e22daab1b43 - sha512sums = 5b84a1eb6877370366b10839d175ea99c6cb806f8ec0df8df26f8794469529b7221deb7e91a0b7c66161a63ceb760c8c01026eab97541ef05f43cec1a75b86c1 - b2sums = 63589860ac1432a5c47f1124bf89349858e44960b0f53c0aa3c14b3d4a723bc558db46b8e27b186c1935ef9a590b4b9a352432030dfb6f659bcd76100744f56f - b2sums = 36fc245448097a1435f110b3d44c7de68647bda3ede15cc6965da581b966ebdcd0d5bcdc5aae409fe5af5ecd6b1ff8dd7b969f977bb1d7f90b0a80a686fcf7bb + source = pythonfinder-2.1.0.tar.gz::https://github.com/sarugaku/pythonfinder/archive/refs/tags/2.1.0.tar.gz + sha512sums = b2240eda4a44a9954f72f33039854f2aeec6dbb73ffa428a457380109b4b370ecd237bf0ee1e8ac9bc5ae6564bf1464f435eac3a3d0bd5dbe49a9fde4fb6e872 + b2sums = 47da26aac3e1b325dfc3656539c96e6137279f89590fa1f59ee9aa55873c3dc00779c87369e2edd31eba62fafbf27ce5e1faf96e1f7389dfb0d0c10d0fa133d5 pkgname = python-pythonfinder @@ -2,7 +2,7 @@ _name=pythonfinder pkgname=python-pythonfinder -pkgver=2.0.6 +pkgver=2.1.0 pkgrel=1 pkgdesc="Cross Platform Search Tool for Finding Pythons" arch=(any) @@ -10,9 +10,7 @@ url="https://github.com/sarugaku/pythonfinder" license=(MIT) depends=( python - python-cached-property python-packaging - python-pydantic ) makedepends=( python-build @@ -28,18 +26,9 @@ checkdepends=( optdepends=('python-click: for CLI') source=( $_name-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz - $pkgname-2.0.6-pydantic2.patch ) -sha512sums=('046fcf19f5d94841498a23ae5600aec48bc938f04a8c08b57e6e7e055b687220068d65e42a30a603586f112c2bd2306ae683be151af7a10763e76e22daab1b43' - '5b84a1eb6877370366b10839d175ea99c6cb806f8ec0df8df26f8794469529b7221deb7e91a0b7c66161a63ceb760c8c01026eab97541ef05f43cec1a75b86c1') -b2sums=('63589860ac1432a5c47f1124bf89349858e44960b0f53c0aa3c14b3d4a723bc558db46b8e27b186c1935ef9a590b4b9a352432030dfb6f659bcd76100744f56f' - '36fc245448097a1435f110b3d44c7de68647bda3ede15cc6965da581b966ebdcd0d5bcdc5aae409fe5af5ecd6b1ff8dd7b969f977bb1d7f90b0a80a686fcf7bb') - -prepare() { - # upstream wants to drop pydantic, so meanwhile stuff is broken... - # https://github.com/sarugaku/pythonfinder/issues/142 - patch -Np1 -d $_name-$pkgver -i ../$pkgname-2.0.6-pydantic2.patch -} +sha512sums=('b2240eda4a44a9954f72f33039854f2aeec6dbb73ffa428a457380109b4b370ecd237bf0ee1e8ac9bc5ae6564bf1464f435eac3a3d0bd5dbe49a9fde4fb6e872') +b2sums=('47da26aac3e1b325dfc3656539c96e6137279f89590fa1f59ee9aa55873c3dc00779c87369e2edd31eba62fafbf27ce5e1faf96e1f7389dfb0d0c10d0fa133d5') build() { cd $_name-$pkgver diff --git a/python-pythonfinder-2.0.6-pydantic2.patch b/python-pythonfinder-2.0.6-pydantic2.patch deleted file mode 100644 index 9657ad4134dc..000000000000 --- a/python-pythonfinder-2.0.6-pydantic2.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git i/pyproject.toml w/pyproject.toml -index 73a3c85..6cf3c2e 100644 ---- i/pyproject.toml -+++ w/pyproject.toml -@@ -36,7 +36,7 @@ requires-python = ">=3.7" - dependencies = [ - "cached-property; python_version < \"3.8\"", - "packaging>=22.0", -- "pydantic>=1.10.7,<2", -+ "pydantic>2", - ] - - [project.optional-dependencies] -diff --git i/src/pythonfinder/models/common.py w/src/pythonfinder/models/common.py -index 4c439c9..0ef3d77 100644 ---- i/src/pythonfinder/models/common.py -+++ w/src/pythonfinder/models/common.py -@@ -1,6 +1,6 @@ - from __future__ import annotations - --from pydantic import BaseModel, Extra -+from pydantic.v1 import BaseModel, Extra - - - class FinderBaseModel(BaseModel): -diff --git i/src/pythonfinder/models/mixins.py w/src/pythonfinder/models/mixins.py -index 58ce99a..e68020f 100644 ---- i/src/pythonfinder/models/mixins.py -+++ w/src/pythonfinder/models/mixins.py -@@ -12,7 +12,7 @@ from typing import ( - Optional, - ) - --from pydantic import BaseModel, Field, validator -+from pydantic.v1 import BaseModel, Field, validator - - from ..exceptions import InvalidPythonVersion - from ..utils import ( -diff --git i/src/pythonfinder/models/path.py w/src/pythonfinder/models/path.py -index fe98054..beb88be 100644 ---- i/src/pythonfinder/models/path.py -+++ w/src/pythonfinder/models/path.py -@@ -23,7 +23,7 @@ if sys.version_info >= (3, 8): - from functools import cached_property - else: - from cached_property import cached_property --from pydantic import Field, root_validator -+from pydantic.v1 import Field, root_validator - - from ..environment import ( - ASDF_DATA_DIR, -diff --git i/src/pythonfinder/models/python.py w/src/pythonfinder/models/python.py -index c5e0345..32c82a8 100644 ---- i/src/pythonfinder/models/python.py -+++ w/src/pythonfinder/models/python.py -@@ -19,7 +19,7 @@ from typing import ( - ) - - from packaging.version import Version --from pydantic import Field, validator -+from pydantic.v1 import Field, validator - - from ..environment import ASDF_DATA_DIR, PYENV_ROOT, SYSTEM_ARCH - from ..exceptions import InvalidPythonVersion |