From 75836b2000d6d3beec3df14c2081f3d3496436a9 Mon Sep 17 00:00:00 2001 From: Peter Shkenev Date: Thu, 13 Jun 2024 00:26:09 +0000 Subject: [PATCH] main/py3-setuptools_scm: upgrade to 8.1.0 --- main/py3-setuptools_scm/APKBUILD | 12 ++--- main/py3-setuptools_scm/typing-ext.patch | 67 ------------------------ 2 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 main/py3-setuptools_scm/typing-ext.patch diff --git a/main/py3-setuptools_scm/APKBUILD b/main/py3-setuptools_scm/APKBUILD index 3b6ff8c0c72..ecf4edcae82 100644 --- a/main/py3-setuptools_scm/APKBUILD +++ b/main/py3-setuptools_scm/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Peter Shkenev pkgname=py3-setuptools_scm _pkgname=setuptools-scm -pkgver=8.0.4 -pkgrel=2 +pkgver=8.1.0 +pkgrel=0 pkgdesc="The blessed package to manage your versions by scm tags" url="https://github.com/pypa/setuptools_scm" arch="noarch" @@ -12,10 +12,9 @@ depends="py3-setuptools py3-packaging" makedepends="py3-gpep517 py3-wheel" checkdepends="py3-pytest" subpackages="$pkgname-pyc" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - typing-ext.patch +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/${_pkgname/-/_}-$pkgver.tar.gz " -builddir="$srcdir"/$_pkgname-$pkgver +builddir="$srcdir/${_pkgname/-/_}-$pkgver" options="!check" # here -> pytest -> pluggin -> here replaces="py-setuptools_scm" # Backwards compatibility @@ -39,6 +38,5 @@ package() { } sha512sums=" -1b584f20dfad115f379a97de9e96bb3b36ab00986381748c2f395facd26ce01a6556ccfbabeb8f0cf9ce8720b26ce3a00040dba02cc689701ccf1d31f13277da setuptools-scm-8.0.4.tar.gz -152457a9d480ebf6e48bc1b7546c95df3aebd540991348f95202ddaa162d765f71bbf1e9cd4ce4afa20532d0016a3ed138d4626a4a45de6d3069558a0e691c2e typing-ext.patch +205f1c122539d107a61a7ef01ff9ec225f7b2e6d92fc33a9f2a0c616051cbf32163ac4e6878d898e51cc1ff81fce6c6521a18fc5e09bdbc9d7d2467ba013c57f setuptools_scm-8.1.0.tar.gz " diff --git a/main/py3-setuptools_scm/typing-ext.patch b/main/py3-setuptools_scm/typing-ext.patch deleted file mode 100644 index e137e62582d..00000000000 --- a/main/py3-setuptools_scm/typing-ext.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/src/setuptools_scm/_file_finders/__init__.py -+++ b/src/setuptools_scm/_file_finders/__init__.py -@@ -10,7 +10,7 @@ - from .._entrypoints import iter_entry_points - - if TYPE_CHECKING: -- from typing_extensions import TypeGuard -+ from typing import TypeGuard - - - log = _log.log.getChild("file_finder") ---- a/src/setuptools_scm/_integration/toml.py -+++ b/src/setuptools_scm/_integration/toml.py -@@ -15,7 +15,7 @@ - from tomli import loads as load_toml - - if TYPE_CHECKING: -- from typing_extensions import TypeAlias -+ from typing import TypeAlias - - from .. import _log - ---- a/src/setuptools_scm/_types.py -+++ b/src/setuptools_scm/_types.py -@@ -10,7 +10,7 @@ - - - if TYPE_CHECKING: -- from typing_extensions import TypeAlias -+ from typing import TypeAlias - from . import version - - PathT: TypeAlias = Union["os.PathLike[str]", str] ---- a/src/setuptools_scm/version.py -+++ b/src/setuptools_scm/version.py -@@ -17,8 +17,8 @@ - from . import _modify_version - - if TYPE_CHECKING: -- from typing_extensions import Concatenate -- from typing_extensions import ParamSpec -+ from typing import Concatenate -+ from typing import ParamSpec - - _P = ParamSpec("_P") - ---- a/testing/conftest.py -+++ b/testing/conftest.py -@@ -8,7 +8,7 @@ - from typing import Iterator - - import pytest --from typing_extensions import Self -+from typing import Self - - from .wd_wrapper import WorkDir - from setuptools_scm._run_cmd import run ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -42,7 +42,6 @@ - "packaging>=20", - "setuptools", - 'tomli>=1; python_version < "3.11"', -- "typing-extensions", - ] - [project.optional-dependencies] - docs = [