From nobody Mon Nov 20 13:27:08 2023 X-Original-To: dev-commits-ports-all@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 4SYpFm6bWkz51JHB; Mon, 20 Nov 2023 13:27:08 +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 4SYpFm5gG6z3gbb; Mon, 20 Nov 2023 13:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700486828; 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=sv/OBNHksRvW6ckmsIqQiQQjsgvhMj0TiejcB2LjSzM=; b=olDjyYEmLRmZJXBkzf/E6/MFifWUS87cFctZkHxC1W28uvpRnrTnYM0WxWNyBsmNRXiF34 Q64uUbwClu5An8z9O1/nU3ajJfnBzqeN416qGzBNG71Lr75/X4AqC31HS3ng5o2+jrO26X 73/B3yvkMNnMJ2HH0GCSZ17cI6478wVWHsbMmShxAnVRy7g1NvfN0S5LwIWOW5nTiE3htG 1lqTvK4gWN9fD/a0sfc5+Hy3GgYg1ZyEDr/7YSwbL2uSFSCDu8hjUKBRZp9TWpGq6BPO09 DBflMu/QqJTycK8jkFF4GsRFAZ6Mrre8SZbrJISDAMaWqA5fSuIVIajQDCD0lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700486828; 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=sv/OBNHksRvW6ckmsIqQiQQjsgvhMj0TiejcB2LjSzM=; b=IJaa3YXrkWDWoipsd2zLsREoCLZQZyZ/MKqQpGvfuppDZsPvZOxX19cWqz/EuxzsSzA8t/ JUkVk86bQJ+qjlc7ybs2w4A+yi7i2rF6FEGHrPH2Mxg9h/W7lumeRlcZody2pSvX0anbPN x6zJJH4h91jP7vRgmHdwjYZIp/K+aGRAQtWg1dUVUyRQATKFS+4yBIdbIGmT4fzVmvhlSe HAZsh8CuAKbf0KKbwVjCZVcgoYDgZY/kthEa5ApYOF1tfpBZj7fN/boH/Z483BfPHPbC/n D/l8c0iqTwlVbqxBE7eLF7/aL5eew5e2EP3BmXQgqhVN3kc1UGsI9Mha22eFFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700486828; a=rsa-sha256; cv=none; b=NzmwAqagbWBdWOnK+rYFpqS8s7fm4FK3bfxiHqMnUjds+XBOkQIE7kDqX6/iLGK4Sywkif VrNTD3lvlHd6jnHSQUQ+uI43ZXQHVyHwk9n89SYhanKvJreLpYyV31OrH9ygrfQWhk+0U8 x/aDZhYIjdJkByr7dF5sZLo6HbWp8nYvy/dDHsR9jKgsk7qln8HsUSicojA3CYoRomr5R0 4YjF4rHF/iB79DWL7HEbIlgPcNfR5qISlowfVkLyNFT9eOCUP70d3CEGA4PB9i5zbLS09s 7LPL9RNyZW1BsoS9VotgmATZ+ms34cvKiScjTO+zHG2YWjIedXNXss+ljoeIFQ== 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 4SYpFm4dmgztgx; Mon, 20 Nov 2023 13:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AKDR8El023256; Mon, 20 Nov 2023 13:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKDR8fN023254; Mon, 20 Nov 2023 13:27:08 GMT (envelope-from git) Date: Mon, 20 Nov 2023 13:27:08 GMT Message-Id: <202311201327.3AKDR8fN023254@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 24104f31e4d4 - main - irc/py-sopel: Runtime fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24104f31e4d4d0ecadca630027d8fb28bef6ca6d Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=24104f31e4d4d0ecadca630027d8fb28bef6ca6d commit 24104f31e4d4d0ecadca630027d8fb28bef6ca6d Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2023-11-20 13:23:58 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-11-20 13:26:49 +0000 irc/py-sopel: Runtime fix Bump portrevision PR: 272629 Approved by: Submitter is maintainer --- irc/py-sopel/Makefile | 6 +++++ irc/py-sopel/files/patch-requirements.txt | 37 ------------------------------- irc/py-sopel/files/sopel-config.py | 6 +++++ irc/py-sopel/files/sopel-plugins.py | 6 +++++ irc/py-sopel/files/sopel.py | 6 +++++ 5 files changed, 24 insertions(+), 37 deletions(-) diff --git a/irc/py-sopel/Makefile b/irc/py-sopel/Makefile index d9d985da2f0c..c08e5ce849ea 100644 --- a/irc/py-sopel/Makefile +++ b/irc/py-sopel/Makefile @@ -1,5 +1,6 @@ PORTNAME= sopel DISTVERSION= 7.1.9 +PORTREVISION= 1 CATEGORIES= irc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -46,5 +47,10 @@ post-install: @${MKDIR} ${STAGEDIR}/var/${dir}/sopel .endfor @${MKDIR} ${STAGEDIR}/var/db/sopel/www +.for script in sopel sopel-config sopel-plugins + ${CP} ${FILESDIR}/${script}.py ${STAGEDIR}${PREFIX}/bin/${script} + @${REINPLACE_CMD} -e "s|%%PYTHON_SHEBANG%%|#!${PYTHON_CMD}|" ${STAGEDIR}${PREFIX}/bin/${script} + ${CHMOD} 555 ${STAGEDIR}${PREFIX}/bin/${script} +.endfor .include diff --git a/irc/py-sopel/files/patch-requirements.txt b/irc/py-sopel/files/patch-requirements.txt deleted file mode 100644 index b04c63825266..000000000000 --- a/irc/py-sopel/files/patch-requirements.txt +++ /dev/null @@ -1,37 +0,0 @@ ---- requirements.txt.orig 2023-02-26 10:45:58 UTC -+++ requirements.txt -@@ -1,27 +1,8 @@ --xmltodict<0.12.0; python_version == '3.3' --xmltodict==0.12; python_version != '3.3' -+xmltodict - pytz --praw>=4.0.0,<6.0.0 --# transitive dependency of praw; v0.18 introduced f-string syntax --update-checker<0.18; python_version < '3.6' --geoip2<3.0; python_version <= '3.5' and python_version != '2.7' --geoip2>=3.0,<4.0; python_version == '2.7' --geoip2>=4.0,<5.0; python_version >= '3.6' --# transitive dependency of geoip2; v2 dropped py2.7 & py3 < 3.6 --maxminddb<2.0; python_version < '3.6' --ipaddress<2.0; python_version < '3.3' --requests>=2.24.0,<3.0.0; python_version != '3.3' and python_version != '3.4' --# py3.3 doesn't work with the chardet/charset-normalizer detection added in 2.26 --requests>=2.24.0,<2.26; python_version == '3.3' --# py3.4 isn't supported after requests 2.21 --requests==2.21.0; python_version == '3.4' --# transitive dependency of requests --# 2.0 will drop EOL Python 2.7 & 3.5, just like Sopel 8 plans to --urllib3<1.27; python_version != '3.3' and python_version != '3.4' --urllib3<1.23; python_version == '3.3' --urllib3<1.25; python_version == '3.4' --dnspython<2.0; python_version == '2.7' --dnspython<1.16.0; python_version == '3.3' --dnspython<3.0; python_version >= '3.4' --sqlalchemy<1.3; python_version == '3.3' --sqlalchemy<1.4; python_version != '3.3' -+praw -+geoip2 -+requests -+urllib3 -+dnspython -+sqlalchemy diff --git a/irc/py-sopel/files/sopel-config.py b/irc/py-sopel/files/sopel-config.py new file mode 100755 index 000000000000..e42adc5dbe0a --- /dev/null +++ b/irc/py-sopel/files/sopel-config.py @@ -0,0 +1,6 @@ +%%PYTHON_SHEBANG%% + +import sopel.cli.config + +if __name__ == "__main__": + sopel.cli.config.main() diff --git a/irc/py-sopel/files/sopel-plugins.py b/irc/py-sopel/files/sopel-plugins.py new file mode 100755 index 000000000000..4285b2e17839 --- /dev/null +++ b/irc/py-sopel/files/sopel-plugins.py @@ -0,0 +1,6 @@ +%%PYTHON_SHEBANG%% + +import sopel.cli.plugins + +if __name__ == "__main__": + sopel.cli.plugins.main() diff --git a/irc/py-sopel/files/sopel.py b/irc/py-sopel/files/sopel.py new file mode 100755 index 000000000000..57ebbe0e77eb --- /dev/null +++ b/irc/py-sopel/files/sopel.py @@ -0,0 +1,6 @@ +%%PYTHON_SHEBANG%% + +import sopel.cli.run + +if __name__ == "__main__": + sopel.cli.run.main()