Make use of unified cache directory

jic-dtool · Apr 25, 2019 · 73a1f27 · 73a1f27
1 parent b9851c7
commit 73a1f27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,9 @@ Added
 Changed
 ^^^^^^^
 
+- Cache environment variable changed from DTOOL_ECS_CACHE_DIRECTORY to DTOOL_CACHE_DIRECTORY
+- Default cache directory changed from ``~/.cache/dtool/ecs`` to ``~/.cache/dtool``
+
 
 Deprecated
 ^^^^^^^^^^

diff --git a/dtool_ecs/storagebroker.py b/dtool_ecs/storagebroker.py
@@ -1,6 +1,5 @@
 """ECSStorageBroker"""
 
-import os
 import copy
 
 try:
@@ -15,6 +14,7 @@
 from dtoolcore.utils import (
     get_config_value,
     generous_parse_uri,
+    DEFAULT_CACHE_PATH,
 )
 
 from dtool_ecs import __version__
@@ -63,9 +63,9 @@ def __init__(self, uri, config_path=None):
         self.http_manifest_key = self._generate_key("http_manifest_key")
 
         self._s3_cache_abspath = get_config_value(
-            "DTOOL_ECS_CACHE_DIRECTORY",
+            "DTOOL_CACHE_DIRECTORY",
             config_path=config_path,
-            default=os.path.expanduser("~/.cache/dtool/ecs")
+            default=DEFAULT_CACHE_PATH
         )
 
     @classmethod

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
     download_url="{}/tarball/{}".format(url, version),
     install_requires=[
         "click",
-        "dtoolcore>=3.4",
+        "dtoolcore>=3.10",
         "dtool_cli",
         "boto3",
         "dtool-s3",