CVS commit: pkgsrc/misc/py-platformdirs

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue May 13 13:26:50 UTC 2025

Modified Files:
        pkgsrc/misc/py-platformdirs: Makefile distinfo
Added Files:
        pkgsrc/misc/py-platformdirs/patches: patch-tests_test__unix.py

Log Message:
misc/py-platformdirs: Fix tests on BSD.  Resolves:

FAILED tests/test_unix.py::test_xdg_variable_not_set[user_runtime_dir] - AssertionError: assert '/tmp/runtime-1234' == '/run/user/1234'
FAILED tests/test_unix.py::test_xdg_variable_not_set[site_runtime_dir] - AssertionError: assert '/var/run' == '/run'
FAILED tests/test_unix.py::test_xdg_variable_empty_value[user_runtime_dir] - AssertionError: assert '/tmp/runtime-1234' == '/run/user/1234'
FAILED tests/test_unix.py::test_xdg_variable_empty_value[site_runtime_dir] - AssertionError: assert '/var/run' == '/run'


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/misc/py-platformdirs/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/misc/py-platformdirs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/py-platformdirs/patches/patch-tests_test__unix.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/py-platformdirs/Makefile
diff -u pkgsrc/misc/py-platformdirs/Makefile:1.33 pkgsrc/misc/py-platformdirs/Makefile:1.34
--- pkgsrc/misc/py-platformdirs/Makefile:1.33   Sun May 11 10:32:02 2025
+++ pkgsrc/misc/py-platformdirs/Makefile        Tue May 13 13:26:50 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2025/05/11 10:32:02 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2025/05/13 13:26:50 riastradh Exp $
 
 DISTNAME=      platformdirs-4.3.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    misc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=p/platformdirs/}
 
@@ -19,8 +20,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-mock>
 
 USE_LANGUAGES= # none
 
-# as of 4.3.8
-# 4 failed, 442 passed, 36 skipped
+# as of 4.3.8nb1 on netbsd-9
+# 446 passed, 36 skipped
 
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/py-platformdirs/distinfo
diff -u pkgsrc/misc/py-platformdirs/distinfo:1.32 pkgsrc/misc/py-platformdirs/distinfo:1.33
--- pkgsrc/misc/py-platformdirs/distinfo:1.32   Sun May 11 10:32:02 2025
+++ pkgsrc/misc/py-platformdirs/distinfo        Tue May 13 13:26:50 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.32 2025/05/11 10:32:02 wiz Exp $
+$NetBSD: distinfo,v 1.33 2025/05/13 13:26:50 riastradh Exp $
 
 BLAKE2s (platformdirs-4.3.8.tar.gz) = a7a46a59a4cdbcfaf2060d4309972d60bc77281d7240213a9086879ca93eebeb
 SHA512 (platformdirs-4.3.8.tar.gz) = 131fc9f673313d0c8ea6bc36f6efed09eedc106a37194cb35c73980841b1314fc6f5e4362180d420c071d9c173dbb11f322baab0d264d1a3d9f02f4aa1e43169
 Size (platformdirs-4.3.8.tar.gz) = 21362 bytes
+SHA1 (patch-tests_test__unix.py) = 2b6587c2d8136875950b709cd80973467940f568

Added files:

Index: pkgsrc/misc/py-platformdirs/patches/patch-tests_test__unix.py
diff -u /dev/null pkgsrc/misc/py-platformdirs/patches/patch-tests_test__unix.py:1.1
--- /dev/null   Tue May 13 13:26:50 2025
+++ pkgsrc/misc/py-platformdirs/patches/patch-tests_test__unix.py       Tue May 13 13:26:50 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-tests_test__unix.py,v 1.1 2025/05/13 13:26:50 riastradh Exp $
+
+Fix tests on BSD.  Resolves:
+
+FAILED tests/test_unix.py::test_xdg_variable_not_set[user_runtime_dir] - AssertionError: assert '/tmp/runtime-1234' == '/run/user/1234'
+FAILED tests/test_unix.py::test_xdg_variable_not_set[site_runtime_dir] - AssertionError: assert '/var/run' == '/run'
+FAILED tests/test_unix.py::test_xdg_variable_empty_value[user_runtime_dir] - AssertionError: assert '/tmp/runtime-1234' == '/run/user/1234'
+FAILED tests/test_unix.py::test_xdg_variable_empty_value[site_runtime_dir] - AssertionError: assert '/var/run' == '/run'
+
+--- tests/test_unix.py.orig    2020-02-02 00:00:00.000000000 +0000
++++ tests/test_unix.py
+@@ -89,6 +89,12 @@ class XDGVariable(typing.NamedTuple):
+ 
+ 
+ def _func_to_path(func: str) -> XDGVariable | None:
++    if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
++        user_default = '/tmp/runtime-1234'
++        site_default = '/var/run'
++    else:
++        user_default = '/run/user/1234'
++        site_default = '/run'
+     mapping = {
+         "user_data_dir": XDGVariable("XDG_DATA_HOME", "~/.local/share"),
+         "site_data_dir": XDGVariable("XDG_DATA_DIRS", f"/usr/local/share{os.pathsep}/usr/share"),
+@@ -97,8 +103,8 @@ def _func_to_path(func: str) -> XDGVaria
+         "user_cache_dir": XDGVariable("XDG_CACHE_HOME", "~/.cache"),
+         "user_state_dir": XDGVariable("XDG_STATE_HOME", "~/.local/state"),
+         "user_log_dir": XDGVariable("XDG_STATE_HOME", "~/.local/state"),
+-        "user_runtime_dir": XDGVariable("XDG_RUNTIME_DIR", "/run/user/1234"),
+-        "site_runtime_dir": XDGVariable("XDG_RUNTIME_DIR", "/run"),
++        "user_runtime_dir": XDGVariable("XDG_RUNTIME_DIR", user_default),
++        "site_runtime_dir": XDGVariable("XDG_RUNTIME_DIR", site_default),
+     }
+     return mapping.get(func)
+