From nobody Fri Jun 03 14:00:23 2022 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 E2F381B5B01C; Fri, 3 Jun 2022 14:00:25 +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 4LF4K41rxQz3F5Y; Fri, 3 Jun 2022 14:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654264824; 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=wqMkDZQeGUB0c6SHr1XiH1UCYqluKdz77iFpD28FL8w=; b=isRfG8A+CXzx9RFjc1wJdKVHX+26dr5Cno8Ae0bM0lJvGKrbA76UpuQ1LzWvEhzCnmJYSF znaR9JIh//ilsGXtAh3dtP2YNlbTgid55K8K1+0oAOlA0tiOZ1bhe7WSNOYHOwrbjwj0mN vk50i0G+4/Jb+GAaqo8t7/cve4mRSZGl8SS8SUfnqjgkHhlwjPlb7qwZI4AIj9MifHAdmB FpWBbyKeGeRxT/qimeJEZBqkEF+CcLmzGsHzNi7z/+V4u+/TbcDyzigPoge2J6AX9Soy6H G+Elt7iLp2aHs/SfAsXir+54KeWSXr5/9zSOn51/FCZtjRjCE/HPuuO1hiRgAw== 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 94CC125A8; Fri, 3 Jun 2022 14:00:23 +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 253E0Nvl098447; Fri, 3 Jun 2022 14:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253E0NXh098446; Fri, 3 Jun 2022 14:00:23 GMT (envelope-from git) Date: Fri, 3 Jun 2022 14:00:23 GMT Message-Id: <202206031400.253E0NXh098446@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: c630dbc48278 - main - benchmarks/py-zopkio: Fix build with setuptools 58.0.0+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c630dbc4827824a39d9f5872470e015be83e2d4c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654264824; 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=wqMkDZQeGUB0c6SHr1XiH1UCYqluKdz77iFpD28FL8w=; b=LwjvVyUps/jvDNCLqXDcw3FHn9eiMdn3q2hA1rsgQK4iRYASYn5DoPwt5i7QNc8uHrHUPv fNEwhJQh418fa22fy9CwHWqSRJEU7ovSnviEeKtUdz310tHKLFTykrE2ABC9bw7BVtYos7 u84zcfWcebm7Ep2ykUGSNKPCv1lIGfpxJL9XqyZYz33HlsIfXVr/vMgOYdCVz0ngs1gP5m lgaLttqJQ0f/LNgqjsi3nqJX99fTcuagK6f9vWNJVP8EX0mAu9chi39CoFCUhDNwtE4Sfa P9ARlrH0qspvZDZOW7c3KmPqDTrX/bAL339OGPOI0vc9hZfoLn9YadI2V11fYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654264824; a=rsa-sha256; cv=none; b=pXJnTYZfFCIXr8yZO0nB0oEBY5a4Rerxj47lErwhnHg+L26Eu5xRNMPP2j+RjUgDmV13TQ WnJbW3svaBIDNvnc0NROPeEjxScks/rS5fRvKocYnfdTSe73NRVS86W1TWUhP4PtLdDdAw 9g/LG/e1JY1V28BGl0YF9V1Nqu2A0uvaCfllIALnATDD5W7PbeaizDnaZZpfacnE1h2sPI k6295TjliTXErpMrkomSPx9o6yvqxMRu5uyCtLczin3b+HUESUJtx+2i60qfQNYp4K5lE5 kE3l+gL0agF6Bq7GLVQqO7IPQKz+ERJNVIDPbz/grvCcDTtqI7gTfxynHxI6QQ== 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=c630dbc4827824a39d9f5872470e015be83e2d4c commit c630dbc4827824a39d9f5872470e015be83e2d4c Author: Po-Chuan Hsieh AuthorDate: 2022-06-03 13:56:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-06-03 13:59:03 +0000 benchmarks/py-zopkio: Fix build with setuptools 58.0.0+ - Add USES=dos2unix - While I'm here, update GH_ACCOUNT With hat: python --- benchmarks/py-zopkio/Makefile | 4 +-- benchmarks/py-zopkio/distinfo | 5 +-- benchmarks/py-zopkio/files/patch-2to3 | 66 +++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/benchmarks/py-zopkio/Makefile b/benchmarks/py-zopkio/Makefile index 72670a1fdec9..16f8332e62af 100644 --- a/benchmarks/py-zopkio/Makefile +++ b/benchmarks/py-zopkio/Makefile @@ -16,9 +16,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}naarad>=1.0.15:benchmarks/py-naarad@${PY_FLA ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml@${PY_FLAVOR} \ -USES= python:3.6+ +USES= dos2unix python:3.6+ USE_PYTHON= autoplist concurrent distutils USE_GITHUB= yes -GH_ACCOUNT= linkedin +GH_ACCOUNT= LinkedInAttic .include diff --git a/benchmarks/py-zopkio/distinfo b/benchmarks/py-zopkio/distinfo index 95c1e3966fd5..54f2dce9859b 100644 --- a/benchmarks/py-zopkio/distinfo +++ b/benchmarks/py-zopkio/distinfo @@ -1,2 +1,3 @@ -SHA256 (linkedin-Zopkio-0.2.5_GH0.tar.gz) = e33009e558e6c8cc2c04d8bdacc3bec27a5c14346692146f7896fc0cb45233c4 -SIZE (linkedin-Zopkio-0.2.5_GH0.tar.gz) = 2422419 +TIMESTAMP = 1653164376 +SHA256 (LinkedInAttic-Zopkio-0.2.5_GH0.tar.gz) = e33009e558e6c8cc2c04d8bdacc3bec27a5c14346692146f7896fc0cb45233c4 +SIZE (LinkedInAttic-Zopkio-0.2.5_GH0.tar.gz) = 2422419 diff --git a/benchmarks/py-zopkio/files/patch-2to3 b/benchmarks/py-zopkio/files/patch-2to3 new file mode 100644 index 000000000000..c41a997d4208 --- /dev/null +++ b/benchmarks/py-zopkio/files/patch-2to3 @@ -0,0 +1,66 @@ +--- zopkio/__main__.py.orig 2022-05-21 20:20:16 UTC ++++ zopkio/__main__.py +@@ -110,7 +110,7 @@ def call_main(args): + if args.output_dir is not None: + runtime.set_output_dir(args.output_dir) + except ValueError as e: +- print str(e) ++ print(str(e)) + raise + + # Set up logging. +@@ -125,7 +125,7 @@ def call_main(args): + config_overrides = utils.parse_config_list(args.config_overrides) + except ValueError as e: + logger.error(str(e)) +- print("Error in processing command line arguments:\n {0}".format(traceback.format_exc())) ++ print(("Error in processing command line arguments:\n {0}".format(traceback.format_exc()))) + raise + + runtime.set_machines(machines) +@@ -149,7 +149,7 @@ def call_main(args): + else: + test_runner = TestRunner(args.testfile, args.test_list, config_overrides) + except BaseException as e: +- print("Error setting up testrunner:\n%s" % traceback.format_exc()) ++ print(("Error setting up testrunner:\n%s" % traceback.format_exc())) + raise ValueError(e.message) + + test_runner.run() +--- zopkio/deployer.py.orig 2022-05-21 20:20:16 UTC ++++ zopkio/deployer.py +@@ -31,13 +31,12 @@ import zopkio.runtime as runtime + + logger = logging.getLogger(__name__) + +-class Deployer(object): ++class Deployer(object, metaclass=ABCMeta): + """Abstract class specifying required contract for a Deployer + + A deployer implements both the basic contracts for deployment as well as keeping + track of the state of deployed applications + """ +- __metaclass__ = ABCMeta + _signalnames = {signal.SIGHUP : "HANGING UP ON", + signal.SIGTERM : "TERMINATING", + signal.SIGKILL : "KILLING", +@@ -261,7 +260,7 @@ class Deployer(object): + for f in logs: + try: + mode = ftp.stat(f).st_mode +- except IOError, e: ++ except IOError as e: + if e.errno == errno.ENOENT: + logger.error("Log file " + f + " does not exist on " + hostname) + pass +--- zopkio/remote_host_helper.py.orig 2022-05-21 20:20:16 UTC ++++ zopkio/remote_host_helper.py +@@ -147,7 +147,7 @@ def copy_dir(ftp, filename, outputdir, prefix, pattern + """ + try: + mode = ftp.stat(filename).st_mode +- except IOError, e: ++ except IOError as e: + if e.errno == errno.ENOENT: + logger.error("Log file " + filename + " does not exist") + pass