From nobody Sat Mar 11 08:39:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PYbv31nj2z3xMxD; Sat, 11 Mar 2023 08:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PYbv30r3wz412k; Sat, 11 Mar 2023 08:39:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678523967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rz4INGKwFuNgOPHwymzCYlf2qcPY3AbKsZ5BAshHIpA=; b=q38AlEL98LIaojzzASZ2cJFHg9WzSBHyie5Rzd6VfxiHu8KZ8NP1gTsRYTVBcWWfOI4N8t Fqr4+0HD+5XioK9PFR7PkKEpvJMCuE46eiV+BJUy1+6YO4XCZ3qHobtMrDiyvG7eO0p0WO PgV+qBprJgc2wQTYfS5lEfSvYTcMswRi9d8hRnA0r5KybvM/PTlvA4brQdl3P8hJDVTA0C +nF4MkURPVE800uQ3TY/c4F5EG8vQJUOriuP7UMa+wKjNghaswHynyroMqi6HFVNvez0og JZOKXb7K49Og3CDu6PP68oCvuGnOc9GkqTLymGZz2vLdM2XUWlUCyiyYyWbHDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678523967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rz4INGKwFuNgOPHwymzCYlf2qcPY3AbKsZ5BAshHIpA=; b=L2otvfs/Ryo5ocrUxkxQGuP2MurJYPXwEvc3/foC3eVqzHwxEFXDco3g4pGNMNRPY2A9ZH +3p7/bFkBs25PHJy/wz+jqWtCl3MtGjiAz/hqUZUs/pCf+FbIvsjE4pZ9YAR/e7GpIaFEV lyfoX2JrcNuF4X48yp2n6FijWkDoPZ0jl2q0g3n3zPPA/dXO1x5cRDwMhy1Ka3xv5kcVl6 jKM9hK9PVmC5X5s1+MNWepHMSsOgnWxkhfqYXYBucNZbnLkE97RyoLlJlswWwv4n/rifBm hpDOKeQO1w6CgypgFeLW71DmvFpgCgp9WD4EHEGnAFSEOTrRkg1d35/6EDqNXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678523967; a=rsa-sha256; cv=none; b=TQ8d2qEj3tuoOXcyLoVAbmMzt9a4N0/PluPuUTK1YkjSl8a8IeDgAczN8VMi7duZB11kXy lt1voD7TE2PhtNulK0qGTLja1wM4iArtUZTHtXes1IRy5eR4vergvAxqIXomWKCYb1MRwA sF1hWyQO/ACPLsJcWHcvVhsohNpR24fYepbPtJ2UWj9oQINiVDE1JmT7GlGkDm+ugynWh8 1hGHjO+xiA4g6LYpmT/VZQTzT741wjdQYMzoIPXIlmjieD0xwMd6KXyHvRPBPGWnZFVySa HLKZK4ITN12/R2Jg23YmedHlJKE7aKB9oCblzOEE4GlZCHYstCYmwOh0XVU5Ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PYbv26hJfzNxP; Sat, 11 Mar 2023 08:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32B8dQ47081475; Sat, 11 Mar 2023 08:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32B8dQCB081474; Sat, 11 Mar 2023 08:39:26 GMT (envelope-from git) Date: Sat, 11 Mar 2023 08:39:26 GMT Message-Id: <202303110839.32B8dQCB081474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: c1f83d71134e - main - textproc/py-sphinx-autodoc-typehints: fix building in non isolated mode List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1f83d71134e6cf4a5142c3cb917f25c265bbad3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1f83d71134e6cf4a5142c3cb917f25c265bbad3 commit c1f83d71134e6cf4a5142c3cb917f25c265bbad3 Author: Andreas Bilke AuthorDate: 2023-03-09 00:07:21 +0000 Commit: Robert Clausecker CommitDate: 2023-03-11 08:38:57 +0000 textproc/py-sphinx-autodoc-typehints: fix building in non isolated mode Since upsteam does not see any problem with the current behaviour we can only patch this issue on our side. Also remove some redundant build dependencies. PR: 269686 --- textproc/py-sphinx-autodoc-typehints/Makefile | 5 +---- ...atch-src_sphinx__autodoc__typehints_____init____.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/textproc/py-sphinx-autodoc-typehints/Makefile b/textproc/py-sphinx-autodoc-typehints/Makefile index 568c0c07207e..d5990144bfcb 100644 --- a/textproc/py-sphinx-autodoc-typehints/Makefile +++ b/textproc/py-sphinx-autodoc-typehints/Makefile @@ -1,4 +1,5 @@ PORTNAME= sphinx-autodoc-typehints +PORTREVISION= 1 DISTVERSION= 1.22 CATEGORIES= textproc python MASTER_SITES= PYPI @@ -15,10 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>=0.21.1:devel/py-hatchling@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatch-vcs>0:devel/py-hatch-vcs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pip>=22.2:devel/py-pip@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=40.0.4:devel/py-setuptools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=2.0.0:devel/py-setuptools_scm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=5.3:textproc/py-sphinx@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=5.3:textproc/py-sphinx@${PY_FLAVOR} diff --git a/textproc/py-sphinx-autodoc-typehints/files/patch-src_sphinx__autodoc__typehints_____init____.py b/textproc/py-sphinx-autodoc-typehints/files/patch-src_sphinx__autodoc__typehints_____init____.py new file mode 100644 index 000000000000..d7a79eb23fd7 --- /dev/null +++ b/textproc/py-sphinx-autodoc-typehints/files/patch-src_sphinx__autodoc__typehints_____init____.py @@ -0,0 +1,18 @@ +--- src/sphinx_autodoc_typehints/__init__.py.orig 2023-03-03 19:01:28.608152000 +0100 ++++ src/sphinx_autodoc_typehints/__init__.py 2023-03-03 19:03:03.209005000 +0100 +@@ -23,7 +23,14 @@ + from sphinx.util.inspect import stringify_signature + + from .patches import install_patches +-from .version import __version__ ++ ++# see https://github.com/tox-dev/sphinx-autodoc-typehints/pull/328/files for the original patch ++try: ++ from .version import __version__ ++except ImportError: ++ # The format of this file was changed, so lets fall back to the older style. ++ # See https://github.com/tox-dev/sphinx-autodoc-typehints/issues/327 ++ from .version import version as __version__ + + _LOGGER = logging.getLogger(__name__) + _PYDATA_ANNOTATIONS = {"Any", "AnyStr", "Callable", "ClassVar", "Literal", "NoReturn", "Optional", "Tuple", "Union"}