From nobody Sun Dec 04 06:48:31 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 4NPy1q4gtCz4jYWY; Sun, 4 Dec 2022 06:48:31 +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 4NPy1q47jYz3Bmg; Sun, 4 Dec 2022 06:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670136511; 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=mUF9RF6o5bXmGeJ/eARqkrjYe885gamS62/NboxWPL4=; b=bNdqhYaAriOqQYZ1xLh2X792axun7/EQZFsKbuC/qz82IaWdhOu1N6iUFVFTUTSiefYb4i QPGuOG9ZY3amS6pFtXeH/2AC/PlCwTxcWqhwRwy3TyXh0tU367a3KamWtpakvVcYAlje80 GGdzyOWP8AumuA1zUJQX3l75FJSG3M1SkwUP5//e2K6PMQqCEM5wu8PUKnDrzh3k9NXgKI C/402Zhm66EAzp6zQzGlAeM9SY+NlcRE8ezDx1fBAIDeRSKs536sGfw08LSJaB+69+jUzr kWVwe6ZcmMCATOeucZ+bLD4vEnkWUsrK2qFWaYoyXlSqrDwJX69P0IdZVa0b2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670136511; 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=mUF9RF6o5bXmGeJ/eARqkrjYe885gamS62/NboxWPL4=; b=BCgW8ENZTOHx5TI92bwC/QO0PTb6SStBm1jWxCy0JrPEiWuuoXUq1jHpDVORAXJh/OyBgl yWpu8rN8BgJ13kQqBFFVusUtIL4HcAhtg5fBf+oSV03/l/EYDA1thtrhN8QFnIqVs3nhx+ D16Gd7AJe+fT/ooF7jKpTeFhiaYVwGQPwZI8osqg6cL8mb1bHDp5MzJW4fELwobT9n5blx lPwEfKmhzlN5Tu+VuAhNk9NrF9M1a+51olpRvJlq4PNW23pF+DKV1BoPTgTha+0kHssS4g FMYARu2pLyoCjAlpkVilKzS2xO9xTpmpFVvcfI6KOK+0Aqh3hA9ygOqXccdGig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670136511; a=rsa-sha256; cv=none; b=ohEbOLJA0AecKlrE0r9PcjT1cwLG18LZ7xeHr/m/D+QJlej66jlP5bgb2nAerOvHJSidEI cTv0FyhldjrG1YtiFdWJPxWSLAlS4XzbHtsJZnOx73MPkGGxq7DW1KuOXrY7/mnznYTRM3 xpru21yHGcZxJ98i1KaXAFlkUbNbAsYVZP2UvLq2CYCSVN+EzpcOEtGbC9ERqdc4RwMPUm nEwgfXKP1YzVyF4m5GaGcCsn8iQa2kp9WgD++WNyxvWCb2y1P0CMux1sJPcbtMt1LIq+VW RACFnvZkDKnXGZrcwDaD+SYYWpn//e6NAWOybx8gmvZaJO/oDP0ACfSZe8kFkQ== 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 4NPy1q3Flfz1NxL; Sun, 4 Dec 2022 06:48:31 +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 2B46mVCo058095; Sun, 4 Dec 2022 06:48:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B46mV86058094; Sun, 4 Dec 2022 06:48:31 GMT (envelope-from git) Date: Sun, 4 Dec 2022 06:48:31 GMT Message-Id: <202212040648.2B46mV86058094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4f870b7bbc6a - main - devel/py-ubelt: Update 1.2.2 -> 1.2.3 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f870b7bbc6a9dcb2d57bd1094551b281eed46c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f870b7bbc6a9dcb2d57bd1094551b281eed46c7 commit 4f870b7bbc6a9dcb2d57bd1094551b281eed46c7 Author: Yuri Victorovich AuthorDate: 2022-12-04 03:40:57 +0000 Commit: Yuri Victorovich CommitDate: 2022-12-04 06:48:23 +0000 devel/py-ubelt: Update 1.2.2 -> 1.2.3 Reported by: portscout --- devel/py-ubelt/Makefile | 4 +-- devel/py-ubelt/distinfo | 6 ++-- devel/py-ubelt/files/patch-ubelt_util__platform.py | 33 ++++++---------------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/devel/py-ubelt/Makefile b/devel/py-ubelt/Makefile index 67426965b085..64ea03e7c85b 100644 --- a/devel/py-ubelt/Makefile +++ b/devel/py-ubelt/Makefile @@ -1,6 +1,6 @@ PORTNAME= ubelt DISTVERSIONPREFIX= v -DISTVERSION= 1.2.2 +DISTVERSION= 1.2.3 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,7 +21,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}codecov>=2.0.15:devel/py-codecov@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} USES= python:3.6+ -USE_PYTHON= distutils autoplist pytest # 1 test fails, see https://github.com/Erotemic/ubelt/issues/127#issuecomment-1238953686 +USE_PYTHON= distutils autoplist pytest # 1 test fails, see https://github.com/Erotemic/ubelt/issues/135 USE_GITHUB= yes GH_ACCOUNT= Erotemic diff --git a/devel/py-ubelt/distinfo b/devel/py-ubelt/distinfo index 595d7a469e12..665571747a36 100644 --- a/devel/py-ubelt/distinfo +++ b/devel/py-ubelt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662531079 -SHA256 (Erotemic-ubelt-v1.2.2_GH0.tar.gz) = c456fef8cd9eb41297b09f54e338fa1b447307f228afe3f568f0bb96704e742b -SIZE (Erotemic-ubelt-v1.2.2_GH0.tar.gz) = 303629 +TIMESTAMP = 1670124649 +SHA256 (Erotemic-ubelt-v1.2.3_GH0.tar.gz) = 1eb441dbbf6c8f2bc9426dcd1c740f98ec0cf9ed5ce9ca1311b2d9f56c97bacb +SIZE (Erotemic-ubelt-v1.2.3_GH0.tar.gz) = 324632 diff --git a/devel/py-ubelt/files/patch-ubelt_util__platform.py b/devel/py-ubelt/files/patch-ubelt_util__platform.py index 23f3cecb0861..c783ff1fdedf 100644 --- a/devel/py-ubelt/files/patch-ubelt_util__platform.py +++ b/devel/py-ubelt/files/patch-ubelt_util__platform.py @@ -1,4 +1,4 @@ ---- ubelt/util_platform.py.orig 2022-08-10 01:18:14 UTC +--- ubelt/util_platform.py.orig 2022-12-03 05:15:05 UTC +++ ubelt/util_platform.py @@ -42,7 +42,7 @@ from os.path import exists, join, isdir, expanduser, n @@ -9,38 +9,21 @@ 'find_exe', 'find_path', 'ensure_app_cache_dir', 'ensure_app_config_dir', 'ensure_app_data_dir', 'get_app_cache_dir', 'get_app_config_dir', 'get_app_data_dir', -@@ -52,6 +52,7 @@ __all__ = [ - # References: - # https://stackoverflow.com/questions/446209/possible-values-from-sys-platform - WIN32 = sys.platform == 'win32' # type: bool -+FREEBSD = sys.platform.startswith('freebsd') # type: bool - LINUX = sys.platform.startswith('linux') # type: bool - DARWIN = sys.platform == 'darwin' # type: bool - POSIX = 'posix' in sys.builtin_module_names # type: bool -@@ -66,6 +67,8 @@ def platform_data_dir(): +@@ -67,6 +67,8 @@ def platform_data_dir(): """ - if LINUX: # nocover + if POSIX: # nocover dpath_ = os.environ.get('XDG_DATA_HOME', '~/.local/share') + elif FREEBSD: # nocover + dpath_ = os.environ.get('XDG_DATA_HOME', '~/.local/share') elif DARWIN: # nocover dpath_ = '~/Library/Application Support' elif WIN32: # nocover -@@ -86,6 +89,8 @@ def platform_config_dir(): - """ - if LINUX: # nocover - dpath_ = os.environ.get('XDG_CONFIG_HOME', '~/.config') -+ elif FREEBSD: # nocover -+ dpath_ = os.environ.get('XDG_CONFIG_HOME', '~/.config') - elif DARWIN: # nocover - dpath_ = '~/Library/Application Support' - elif WIN32: # nocover -@@ -105,6 +110,8 @@ def platform_cache_dir(): +@@ -86,6 +88,8 @@ def platform_config_dir(): str : path to the cache dir used by the current operating system """ - if LINUX: # nocover -+ dpath_ = os.environ.get('XDG_CACHE_HOME', '~/.cache') + if POSIX: # nocover ++ dpath_ = os.environ.get('XDG_CONFIG_HOME', '~/.config') + elif FREEBSD: # nocover - dpath_ = os.environ.get('XDG_CACHE_HOME', '~/.cache') + dpath_ = os.environ.get('XDG_CONFIG_HOME', '~/.config') elif DARWIN: # nocover - dpath_ = '~/Library/Caches' + dpath_ = '~/Library/Application Support'