From nobody Tue Jan 11 19:04:48 2022 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 7861F1957003; Tue, 11 Jan 2022 19:04:57 +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 4JYKrP155Qz4nKk; Tue, 11 Jan 2022 19:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E41F11EC3D; Tue, 11 Jan 2022 19:04:48 +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 20BJ4m2V089822; Tue, 11 Jan 2022 19:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BJ4mZd089821; Tue, 11 Jan 2022 19:04:48 GMT (envelope-from git) Date: Tue, 11 Jan 2022 19:04:48 GMT Message-Id: <202201111904.20BJ4mZd089821@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 029f12637419 - main - devel/py-pip: Clean up Makefile after 6c401020d1946446ed7f46742d7dca78c201408f (python36 removal) 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 029f12637419af3acdc2ba2dc73541ab29db73c7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641927895; 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=tJOjTSRvYXfRYIH5AgcOpcfocQvbVvOdZNkLl30KKWs=; b=EWCTIeFiZuhiPwgWkyGiHX9wC0RUGDO3G8ipy9jCaHz0XurlhF0XPQ/TxuDo6P2A89q9FU iMp+mkYFAugRhEkCQK0qelmT0ckXDtz7HNrvu+29QrXifF+ySUNf+7AeGwIF+C59Rt5nQD PEaUuE/6LsaoGOoPVdteXxetDCD0n3Z1nFAJDOz2kw53cKf9JO3ngHfGVabHaS9LF57AMl oLqPnfg7ural3WuSYqplGDDI7GgpDgyterwDCuKPMpL+iB+pa/ZZ7qVFKOO6x2Zsb+1zn3 Q+HPIhWYBcMdw5p7Wuu5rdJcVIJOPyOIM4btJcqSXvDrEJIEnmXSXB/XDuXxTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641927895; a=rsa-sha256; cv=none; b=m3YNL+EX98uARW6WvGOd/vxCNerx2GGeAJyJuFbeMpIFE4S7A2UNfNr2s6WYDzQ4gfvS8M 79+culZKPZsY2Kp1TiPFn3kO4QoO802Dhg5gdm/PoZKalsx7ciXww+lvbozohDWv3qwcS3 UmW+FNh/qkHqx6CofVCtLVH8TNiitujxt3+4O+dT5bFUYkL4oD/4RzBcyoEnx5GwiO8y4O D0v/JdH9Rf22H7VwAAMVOKB2XkupJXaOpa8huIvH9xDyr4bxshBIO/v404QJNEZfWyHBmp qQYpklpN+oUtQJ/KvrICCr3k+35ekPVlMxiwlapD2tRoQSpEwyftYWHuuQrPCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=029f12637419af3acdc2ba2dc73541ab29db73c7 commit 029f12637419af3acdc2ba2dc73541ab29db73c7 Author: Po-Chuan Hsieh AuthorDate: 2022-01-11 17:37:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-11 18:47:26 +0000 devel/py-pip: Clean up Makefile after 6c401020d1946446ed7f46742d7dca78c201408f (python36 removal) --- devel/py-pip/Makefile | 9 +-------- devel/py-pip/files/extra-patch-python36 | 11 ----------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 494563f86c74..cb0c4a8855a7 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -60,13 +60,6 @@ DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" -.include - -.if ${PYTHON_REL} < 30700 && ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}future-annotations>=0:devel/py-future-annotations@${PY_FLAVOR} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-python36 -.endif - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && \ @@ -80,4 +73,4 @@ do-test: ${LN} -sf ${LOCALBASE}/bin/pip ${LOCALBASE}/bin/pip3 cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -.include +.include diff --git a/devel/py-pip/files/extra-patch-python36 b/devel/py-pip/files/extra-patch-python36 deleted file mode 100644 index 2e8a97bca88b..000000000000 --- a/devel/py-pip/files/extra-patch-python36 +++ /dev/null @@ -1,11 +0,0 @@ ---- docs/docs_feedback_sphinxext.py.orig 2021-01-23 11:51:53 UTC -+++ docs/docs_feedback_sphinxext.py -@@ -1,6 +1,7 @@ -+# -*- coding: future_annotations -*- - """A sphinx extension for collecting per doc feedback.""" - --from __future__ import annotations -+import future_annotations - - from itertools import chain - from typing import TYPE_CHECKING