From cbdc527f1cc696c50363b840a7959f02f2e970e8 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl Date: Sun, 12 Dec 2021 16:42:16 -0600 Subject: [PATCH] prefer platformdirs if available --- codepy/jit.py | 11 +++++++---- setup.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/codepy/jit.py b/codepy/jit.py index 10048b6..048cae2 100644 --- a/codepy/jit.py +++ b/codepy/jit.py @@ -272,12 +272,15 @@ def compile_from_string(toolchain, name, source_string, DeprecationWarning) import os - from os.path import join if cache_dir is None: - import appdirs + try: + import platformdirs as appdirs + except ImportError: + import appdirs + import sys - cache_dir = join( + cache_dir = os.path.join( appdirs.user_cache_dir("codepy", "codepy"), "codepy-compiler-cache-v5-py%s" % ( ".".join(str(i) for i in sys.version_info),)) @@ -401,7 +404,7 @@ def check_source(source_path): suffix = toolchain.so_ext mod_cache_dir_m = ModuleCacheDirManager(cleanup_m, - join(cache_dir, hex_checksum)) + os.path.join(cache_dir, hex_checksum)) info_path = mod_cache_dir_m.sub("info") ext_file = mod_cache_dir_m.sub(name+suffix) diff --git a/setup.py b/setup.py index 117411d..24775ad 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ install_requires=[ "pytools>=2015.1.2", "numpy>=1.6", - "appdirs>=1.4.0", + "platformdirs>=2.2.0", "six", "cgen", ],