From nobody Sun Aug 13 21:13:12 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 4RP9HD6WNsz4qCp7; Sun, 13 Aug 2023 21:13:12 +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 4RP9HD5g2Kz4LmD; Sun, 13 Aug 2023 21:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691961192; 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=sasQnEkmjCDsHXcU6WvhXCe5D9/K033mCxNobC4aDBs=; b=F4tHRDzYUcA+rK0V1jiKr8GFDlJm0I9rYZ+Ky/JcnyOvcEBJ+v/HJIdcHnft6W1fz3J6B9 zoKxclwqrcbKKlRxzq6XwuGNgQwW18VLWXDNrG41a6p3vjMH40XjA+2kKZwucCfNla9E/I wlOzBntAuzMsKNgwWVV6dJ0C5bHnvlep5LKiCu5Xdx/bkrZp0/PRcbxEI6J030yaNttjGX Ljoh/zae+CW3eOdgZ44bOgpindJbvqOMpm6D1AiosKi1QGpEMjzspxeoclNlQRZJ2A7eJ6 wEpspXupm5f9TdBPbi7RooCeCswuID2P3B10ec1FU7DGU7ayYZr2hF3bvlda7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691961192; 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=sasQnEkmjCDsHXcU6WvhXCe5D9/K033mCxNobC4aDBs=; b=KWsp6a2IIUU14yMoDJvgrZOhDjLKUka+iEOW0LGLKRvLFd9uh50SyZThdPUhsBsUtEUJPv nIrsbCbxcX/k2AvVyQdxLk9W+Efbo4oPGl/1dZ7xdpM99kDLIrMht5RAJNSJwzQYCWKxf3 Pb0GZx2WRSw1roPgUZLrIC8fZvbgSTTky35tomyz/52eKXA+z/iH+LQMkCe5NAtoyJkohx r46pC/1blMRIKubtsWgghpuw78LvLKzXW3yBZjZtJAnW/ZhKtmQRhFh6fifqfaGGPHdF59 hhu2808zw82xqUWT+8ttEJ6qQeyxSZzHTM0zda+Q7GKx6QZVkkBcST9Ytfwl/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691961192; a=rsa-sha256; cv=none; b=dho7nDPAn2ZZDrIZsoZYdQXQ7XLosOb+ltzWlT0kzIcEiWXU3P8xGdKad8Kw0gN/1fabnA tGD4BWo+2eryZbvjXksryhekvntjFI2247wbThhwap1gMANslkm2K28Bknwl4tK2HJRtcs nfmK2PtfxGw8VbkMn2mnE66thWvgf9wwQrrbjORMmgjqFXl8TdXg7vHhwqSDA7/rxQtzhV 3+RB9Je3Mz9nFts7zl5J5ijLCYOfh1nPNsMBPIZrSozuSDkZicxB2gLCnwt7rIZzNKaqYt vNrC4bzuzENWLB5eG29YegmOwIx9HRIrTZ0k7rqPwQIjoii7jThhv25aNmn+Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RP9HD4jknz1Gyx; Sun, 13 Aug 2023 21:13:12 +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 37DLDCWo099686; Sun, 13 Aug 2023 21:13:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37DLDCv3099683; Sun, 13 Aug 2023 21:13:12 GMT (envelope-from git) Date: Sun, 13 Aug 2023 21:13:12 GMT Message-Id: <202308132113.37DLDCv3099683@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bcb41521efba - main - devel/py-apscheduler: unbreak with python < 3.10 after b7427cd82ccf 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcb41521efba89cd609ef4806169398b9741431c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcb41521efba89cd609ef4806169398b9741431c commit bcb41521efba89cd609ef4806169398b9741431c Author: Jan Beich AuthorDate: 2023-08-13 21:11:35 +0000 Commit: Jan Beich CommitDate: 2023-08-13 21:12:39 +0000 devel/py-apscheduler: unbreak with python < 3.10 after b7427cd82ccf $ make test [...] ImportError while loading conftest 'APScheduler-3.10.2/tests/conftest.py'. tests/conftest.py:8: in from apscheduler.schedulers.base import BaseScheduler apscheduler/schedulers/base.py:46: in class BaseScheduler(six.with_metaclass(ABCMeta)): apscheduler/schedulers/base.py:75: in BaseScheduler _trigger_plugins = {ep.name: ep for ep in entry_points(group='apscheduler.triggers')} E TypeError: entry_points() got an unexpected keyword argument 'group' --- devel/py-apscheduler/Makefile | 1 + devel/py-apscheduler/files/patch-python39 | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile index 0c693ba492bd..ae63020dc173 100644 --- a/devel/py-apscheduler/Makefile +++ b/devel/py-apscheduler/Makefile @@ -1,5 +1,6 @@ PORTNAME= apscheduler PORTVERSION= 3.10.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-apscheduler/files/patch-python39 b/devel/py-apscheduler/files/patch-python39 new file mode 100644 index 000000000000..6bf7cfb04d81 --- /dev/null +++ b/devel/py-apscheduler/files/patch-python39 @@ -0,0 +1,13 @@ +https://github.com/agronholm/apscheduler/issues/770 + +--- apscheduler/schedulers/base.py.orig 2023-08-12 22:35:56 UTC ++++ apscheduler/schedulers/base.py +@@ -67,7 +67,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)): + .. seealso:: :ref:`scheduler-config` + """ + # The `group=...` API is only available in the backport, used in <=3.7, and in std>=3.10. +- if (3, 8) <= sys.version_info <= (3, 9): ++ if (3, 8) <= sys.version_info[:2] <= (3, 9): + _trigger_plugins = {ep.name: ep for ep in entry_points()['apscheduler.triggers']} + _executor_plugins = {ep.name: ep for ep in entry_points()['apscheduler.executors']} + _jobstore_plugins = {ep.name: ep for ep in entry_points()['apscheduler.jobstores']}