From nobody Thu Feb 20 08:15:23 2025 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 4Yz5fj0Hcwz5nSDB; Thu, 20 Feb 2025 08:15: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yz5fh0YXHz4MmW; Thu, 20 Feb 2025 08:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740039324; 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=23iIDCBIVmjnCCrfklLFQDA9adEqRbdAaK8WaB6rb+g=; b=JvyQ5TaRrAIYWTErDHVFsc4bHjOkESm0UxBZfpOU0EZt10DoOB631hHFt+v3FuGlDfFNVg 4iWU7uxwcmspT5TLLkamW/JKhL3G7LySTZMRzsPSCcLg4hJDHbjA/f6+r1IsjmDAATxwA3 /d5llssMyv23qkG20KOwYpd65AwQB/WvSG5Bls8g9rjn11vFIsU/fl7fOtdtEifQUW8XQX b+tBsc/wHaN/ZiSQLkWzldtLbr2yiZkI1WpWuNm9d3Hy/hXd+S6PheBOkCmcCfX3rFNZLk nnxeBxDWD8kqT9JCAda19MfLEmahcvCgR+X8fllI6N30ADwn9HrGW8ezzxL+nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740039324; a=rsa-sha256; cv=none; b=B7NopCu/Qno6aM3XsZA6rLdcnIB3tiXawhDDS+NaCsqBqRxDYFBWWdsWRaVu5Ir5v2VndD A5wTwf122Dmp3IqG8DlYNvLELDjuwnKX4N4x8lEmZyLSZBR3VauR9Tk/hTFCn5pIenF74k znUwRtySt6pnisz/32dLVdLk1SZXP28nbwhqDX+3o24aEvzur1uVquW85KtgJHfIVF1lop GVkaqwGHbYl+dbD+b8dlvQ7RxkpFjw16QZDz19roj6smUbjxNAVnEeZeZr2oQnQz4QIftY +urdAchKBcPcYYZsB2WQS70fXq0WGjFBXQjXXf3nQBO56beW4c2K0T3BhNQVkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740039324; 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=23iIDCBIVmjnCCrfklLFQDA9adEqRbdAaK8WaB6rb+g=; b=rvGrvGnbAWrBISLFAN6DVO7R5jvzjLb0YyPUlDd7s7ToK4zXBd5g1bUupJw9uBABwyasyN y6ctShQ6yp1VDwbZf2jG9a9hQ2QRAhTldcanDlzy8yCf7bL5CtwpseW/HGZvF/O2o7/VLI lySVPyfZ0YlViBJsV4zCzi1XLg+Xv+rr/j6NNpea2PhQ+CZP8tIszPsR/bhEoizOb9oYkO sM1fH41sDkwab1spn+cPqO8WLdm8UhPNHp7FLXgak7YWqaFXhP6Euv/lGXtyApXQMEiMG5 wmkXtErrrV4+Cd3aBPeq5TDXm0pFc8tgzsGkSYn+NcRMovIkWO5uB3tbvfeRRw== 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 4Yz5fh04SqzkdM; Thu, 20 Feb 2025 08:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51K8FNIL067450; Thu, 20 Feb 2025 08:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51K8FN83067447; Thu, 20 Feb 2025 08:15:23 GMT (envelope-from git) Date: Thu, 20 Feb 2025 08:15:23 GMT Message-Id: <202502200815.51K8FN83067447@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: 63b71d27df66 - main - deskutils/py-vdirsyncer: Remove deprecated py-atomicwrites from RUN_DEPENDS 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 63b71d27df66324fa2ad23bccb21ad97dd82726f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=63b71d27df66324fa2ad23bccb21ad97dd82726f commit 63b71d27df66324fa2ad23bccb21ad97dd82726f Author: Po-Chuan Hsieh AuthorDate: 2025-02-20 07:58:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2025-02-20 07:58:56 +0000 deskutils/py-vdirsyncer: Remove deprecated py-atomicwrites from RUN_DEPENDS - Bump PORTREVISION for dependency and package change Obtained from: https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac --- deskutils/py-vdirsyncer/Makefile | 2 +- deskutils/py-vdirsyncer/files/patch-atomicwrites | 111 +++++++++++++++++++++++ deskutils/py-vdirsyncer/files/patch-setup.py | 6 +- 3 files changed, 115 insertions(+), 4 deletions(-) diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile index cc30401ddcf9..a186d20a78e4 100644 --- a/deskutils/py-vdirsyncer/Makefile +++ b/deskutils/py-vdirsyncer/Makefile @@ -1,5 +1,6 @@ PORTNAME= vdirsyncer PORTVERSION= 0.19.3 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +18,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8.0<4.0.0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}aiostream>=0.4.3:www/py-aiostream@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=5.0<9.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click-log>=0.3.0<0.5.0:devel/py-click-log@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \ diff --git a/deskutils/py-vdirsyncer/files/patch-atomicwrites b/deskutils/py-vdirsyncer/files/patch-atomicwrites new file mode 100644 index 000000000000..3d0b9bb94616 --- /dev/null +++ b/deskutils/py-vdirsyncer/files/patch-atomicwrites @@ -0,0 +1,111 @@ +Obtained from: https://github.com/pimutils/vdirsyncer/commit/8b063c39cb3e26a2beef5b6beed7e99c9e9641ac + +--- setup.py.orig 2024-09-11 15:26:58 UTC ++++ setup.py +@@ -16,8 +16,6 @@ requirements = [ + "click>=5.0,<9.0", + "click-log>=0.3.0, <0.5.0", + "requests >=2.20.0", +- # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa +- "atomicwrites>=0.1.7", + "aiohttp>=3.8.0,<4.0.0", + "aiostream>=0.4.3,<0.5.0", + ] +--- vdirsyncer/cli/utils.py.orig 2024-09-11 15:26:58 UTC ++++ vdirsyncer/cli/utils.py +@@ -10,7 +10,6 @@ import click + + import aiohttp + import click +-from atomicwrites import atomic_write + + from .. import BUGTRACKER_HOME + from .. import DOCS_HOME +@@ -21,6 +20,7 @@ from ..sync.status import SqliteStatus + from ..sync.exceptions import StorageEmpty + from ..sync.exceptions import SyncConflict + from ..sync.status import SqliteStatus ++from ..utils import atomic_write + from ..utils import expand_path + from ..utils import get_storage_init_args + from . import cli_logger +--- vdirsyncer/storage/filesystem.py.orig 2024-09-11 15:26:58 UTC ++++ vdirsyncer/storage/filesystem.py +@@ -5,9 +5,8 @@ import subprocess + import os + import subprocess + +-from atomicwrites import atomic_write +- + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkdir + from ..utils import expand_path + from ..utils import generate_href +--- vdirsyncer/storage/google.py.orig 2024-09-11 15:26:58 UTC ++++ vdirsyncer/storage/google.py +@@ -11,9 +11,9 @@ import click + + import aiohttp + import click +-from atomicwrites import atomic_write + + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkdir + from ..utils import expand_path + from ..utils import open_graphical_browser +--- vdirsyncer/storage/singlefile.py.orig 2024-09-11 15:26:58 UTC ++++ vdirsyncer/storage/singlefile.py +@@ -8,9 +8,8 @@ from typing import Iterable + import os + from typing import Iterable + +-from atomicwrites import atomic_write +- + from .. import exceptions ++from ..utils import atomic_write + from ..utils import checkfile + from ..utils import expand_path + from ..utils import get_etag_from_file +--- vdirsyncer/utils.py.orig 2024-09-11 15:26:58 UTC ++++ vdirsyncer/utils.py +@@ -1,8 +1,10 @@ from __future__ import annotations + from __future__ import annotations + ++import contextlib + import functools + import os + import sys ++import tempfile + import uuid + from inspect import getfullargspec + from typing import Callable +@@ -220,3 +222,27 @@ def open_graphical_browser(url, new=0, autoraise=True) + return + + raise RuntimeError("No graphical browser found. Please open the URL " "manually.") ++ ++ ++@contextlib.contextmanager ++def atomic_write(dest, mode="wb", overwrite=False): ++ if "w" not in mode: ++ raise RuntimeError("`atomic_write` requires write access") ++ ++ fd, src = tempfile.mkstemp(prefix=os.path.basename(dest), dir=os.path.dirname(dest)) ++ file = os.fdopen(fd, mode=mode) ++ ++ try: ++ yield file ++ except Exception: ++ os.unlink(src) ++ raise ++ else: ++ file.flush() ++ file.close() ++ ++ if overwrite: ++ os.rename(src, dest) ++ else: ++ os.link(src, dest) ++ os.unlink(src) diff --git a/deskutils/py-vdirsyncer/files/patch-setup.py b/deskutils/py-vdirsyncer/files/patch-setup.py index 412c1e423470..b44e3361296f 100644 --- a/deskutils/py-vdirsyncer/files/patch-setup.py +++ b/deskutils/py-vdirsyncer/files/patch-setup.py @@ -1,8 +1,8 @@ --- setup.py.orig 2024-09-11 15:26:58 UTC +++ setup.py -@@ -19,7 +19,7 @@ requirements = [ - # https://github.com/untitaker/python-atomicwrites/commit/4d12f23227b6a944ab1d99c507a69fdbc7c9ed6d # noqa - "atomicwrites>=0.1.7", +@@ -17,7 +17,7 @@ requirements = [ + "click-log>=0.3.0, <0.5.0", + "requests >=2.20.0", "aiohttp>=3.8.0,<4.0.0", - "aiostream>=0.4.3,<0.5.0", + "aiostream>=0.4.3",